diff --git a/app/helpers/orbit_backend_helper.rb b/app/helpers/orbit_backend_helper.rb
index 2aba815..9ed8578 100644
--- a/app/helpers/orbit_backend_helper.rb
+++ b/app/helpers/orbit_backend_helper.rb
@@ -92,8 +92,8 @@ module OrbitBackendHelper
     render :partial => '/admin/tags/tag_form', :locals => {:f=> f, :module_app=>module_app, :tags=>module_app.tags }
   end
   
-  def render_filter(fields)
-    render :partial => "shared/filter", :locals =>{:fields => fields}
+  def render_filter(fields, search_dom_id=nil)
+    render :partial => "shared/filter", :locals =>{:fields => fields, :search_dom_id=>search_dom_id}
   end
 
   def display_visitors(options={})
diff --git a/app/views/shared/_filter.html.erb b/app/views/shared/_filter.html.erb
index 203382a..7359b80 100644
--- a/app/views/shared/_filter.html.erb
+++ b/app/views/shared/_filter.html.erb
@@ -1,40 +1,125 @@
 <% content_for :right_nav do %>
-	<ul class="nav nav-pills filter-nav pull-right">
-		<% fields.keys.each do |field| %>
-			<li class="accordion-group">
-				<div class="accordion-heading">
-					<a href="#collapse-<%= field %>" data-toggle="collapse" data-parent="#filter" class="accordion-toggle"><%= t(field) %></a>
-				</div>
-			</li>
-		<% end %>
-	</ul>
-	<div class="filter-group accordion-group">
-		<% fields.keys.each do |field| %>
-			<div class="accordion-body collapse" id="collapse-<%= field %>">
-				<div class="accordion-inner pagination-right" data-toggle="buttons-checkbox">
-					<% fields[field].each do |val| %>
-						<%= link_to (val[:title].blank? ? "" : t(val[:title])), "#", :onclick => "filter.addFilter('filters[#{field}][]=#{val[:id]}')", :class => "btn btn-small #{is_filter_active?(field, val[:id])}", :id => "filter_#{val[:id]}" %>
-					<% end %>
-				</div>
-				<div class="filter-clear">
-					<a href="#" onclick="filter.clearFilter();" class="btn btn-link btn-small"><i class="icons-cycle"></i> <%= t(:clear) %></a>
-				</div>
-			</div>
-		<% end %>
-	</div>
+  <% if !search_dom_id.nil?%>
+  <div class="searchClear pull-left" style="clear: left;">
+    <form id="module-search-form">
+      <input type="text" id="filter-input" class="search-query input-medium" placeholder="<%= t(:search_) %>" value="<%=params[:keywords]%>">
+    </form>
+    <img id="search-preloader" src="/assets/preloader.gif" style="height: 40px; position: absolute; left: 220px; top: -5px; display:none;">
+  </div>
+  <% end %>
+  
+  <ul class="nav nav-pills filter-nav pull-right">
+    <% fields.keys.each do |field| %>
+      <li class="accordion-group">
+        <div class="accordion-heading">
+          <a href="#collapse-<%= field %>" data-toggle="collapse" data-parent="#filter" class="accordion-toggle"><%= t(field) %></a>
+        </div>
+      </li>
+    <% end %>
+  </ul>
+  <div class="filter-group accordion-group">
+    <% fields.keys.each do |field| %>
+      <div class="accordion-body collapse" id="collapse-<%= field %>">
+        <div class="accordion-inner pagination-right" data-toggle="buttons-checkbox">
+          <% fields[field].each do |val| %>
+            <%= link_to (val[:title].blank? ? "" : t(val[:title])), "#", :onclick => "filter.addFilter('filters[#{field}][]=#{val[:id]}')", :class => "btn btn-small #{is_filter_active?(field, val[:id])}", :id => "filter_#{val[:id]}" %>
+          <% end %>
+        </div>
+        <div class="filter-clear">
+          <a href="#" onclick="filter.clearFilter();" class="btn btn-link btn-small"><i class="icons-cycle"></i> <%= t(:clear) %></a>
+        </div>
+      </div>
+    <% end %>
+  </div>
 <% end %>
 <script type="text/javascript">
+  <% if !search_dom_id.nil?%>
+  var interval = 0;
+  var keyword;
+  var searchLock=false;
 
-	var Filter = function(dom){
-		var makeFilters = function(){
-			return (window.location.search ? window.location.search.replace('?','').split('&') : []);
-		}
-		var filters = makeFilters(),
-				dom = $(dom),
-				mainUrl = window.location.pathname;
-		var updateTable = function(url, goback){
-			update = true;
-			xurl = (url == null ? ( filters.length ?  mainUrl + "?" + filters.join('&') : mainUrl ) : url);
+  $("#filter-input").bind("input", function() {queueSearch();});
+  $("#module-search-form").submit(function(){queueSearch(); return false; });
+
+  var params = function(key){
+    var result = {};
+    var datas = window.location.search ? window.location.search.replace('?','').split('&') : []
+    datas.map(function(data){
+      tmp = data.split("=");
+      if(key){
+        if(tmp[0]==key){
+          if(tmp[0].indexOf('[]')>=0){
+            if(!Array.isArray(result)) result = [];
+            result.push(tmp[1]);
+          }else{
+            result = tmp[1];
+          }
+        }
+      }else{
+        if(tmp[0].indexOf('[]')>=0){
+          if(typeof(result[tmp[0]]) == "undefined") result[tmp[0]] = [];
+          result[tmp[0]].push(tmp[1]);
+        }else{
+          result[tmp[0]] = tmp[1];
+        }
+      }
+    });
+    return result;
+  }
+
+  var queueSearch = function(){
+    if($("#filter-input").val()!=keyword){
+      keyword = $("#filter-input").val();
+      interval=500;
+      if(!searchLock) moduleSearch();
+    }
+  }
+
+  var moduleSearch = function(){
+    $("#search-preloader").fadeIn();
+    searchLock = true;
+    if(interval==0){
+      url = document.URL;
+      if(url.indexOf("keywords=")>=0){
+        console.log("keywords="+params("keywords"));
+        url = url.replace("keywords="+params("keywords"),"keywords="+keyword)
+      }else{
+        url = (url.indexOf("?")>=0) ? url+'&'+"&keywords="+keyword : url+"?keywords="+keyword
+      }
+
+      history.replaceState(null, null, decodeURIComponent(url));
+      $.get(url,function(data){
+        searchLock = false;
+        $("#<%= search_dom_id %>").html(data);
+        bindPagination();
+        $("#search-preloader").fadeOut();
+      });
+    }else{
+      interval -= 100;
+      setTimeout(moduleSearch,100);
+    }
+  }
+  <% end %>
+
+  var bindPagination = function(){
+    $(".pagination a").click(function(){
+      filter.updateTable($(this).attr('href'));
+      return false;
+    });
+  }
+
+
+  var Filter = function(dom){
+    var self = this;
+    var makeFilters = function(){
+      return (window.location.search ? window.location.search.replace('?','').split('&') : []);
+    }
+    var filters = makeFilters(),
+          dom = $(dom),
+          mainUrl = window.location.pathname;
+    this.updateTable = function(url, goback){
+      update = true;
+      xurl = (url == null ? ( filters.length ?  mainUrl + "?" + filters.join('&') : mainUrl ) : url);
       $.ajax({
         url : xurl,
         type : "get",
@@ -46,38 +131,36 @@
         
         filters = makeFilters();
         dom.html(data);
-        $(".pagination a").click(function(){
-          updateTable($(this).attr('href'));
-          return false;
-        });
+        bindPagination();
       })
-		}
-		this.addFilter = function(filter){
-			$.each(filters,function(idx,data){
-				if(data.indexOf("page=")>-1) filters.splice(idx,1);
-			});
+    }
+    this.addFilter = function(filter){
+      filters = makeFilters();
+      $.each(filters,function(idx,data){
+        if(data.indexOf("page=")>-1) filters.splice(idx,1);
+      });
 
-			if( (index = filters.indexOf(filter) ) > -1){
-				mainUrl = mainUrl.replace(filter,'');
-				filters.splice(index,1);
-			}else{
-				filters.push(filter);
-			}
+      if( (index = filters.indexOf(filter) ) > -1){
+        mainUrl = mainUrl.replace(filter,'');
+        filters.splice(index,1);
+      }else{
+        filters.push(filter);
+      }
 
-			updateTable();
-			return false;
-		};
+      self.updateTable();
+      return false;
+    };
 
-		this.clearFilter = function(){
+    this.clearFilter = function(){
       $(".filter-group a.active").removeClass("active");
       filters = [];
-      updateTable();
+      self.updateTable();
       return false;
     }
 
     window.onpopstate = function(event){
       if(!update){
-        updateTable(document.location.href, true);
+        self.updateTable(document.location.href, true);
         $(".filter-group .btn-small").removeClass('active');
         $.each(document.location.search.split('&'),function(key,filter){
           $('#filter_'+filter.split('=')[1]).addClass('active');
@@ -85,7 +168,7 @@
       }
       update = false;
     }
-	}
+  }
 
-	var update = false;
+  var update = false;
 </script>