diff --git a/app/views/shared/_filter.html.erb b/app/views/shared/_filter.html.erb
index 1c24faf..203382a 100644
--- a/app/views/shared/_filter.html.erb
+++ b/app/views/shared/_filter.html.erb
@@ -13,11 +13,11 @@
 			<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])}" %>
+						<%= 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="" class="btn btn-link btn-small"><i class="icons-cycle"></i> <%= t(:clear) %></a>
+					<a href="#" onclick="filter.clearFilter();" class="btn btn-link btn-small"><i class="icons-cycle"></i> <%= t(:clear) %></a>
 				</div>
 			</div>
 		<% end %>
@@ -25,33 +25,32 @@
 <% end %>
 <script type="text/javascript">
 
-	var Filter = function(){
+	var Filter = function(dom){
 		var makeFilters = function(){
 			return (window.location.search ? window.location.search.replace('?','').split('&') : []);
 		}
 		var filters = makeFilters(),
-			dom = null,
-			mainUrl = window.location.pathname;
-
-		this.init = function(d){
-			dom = $(d);
-		}
-
-		var updateTable = function(url){
-			xurl = (url == null ? ( filters.length ?  mainUrl + "?" + filters.join('&') : mainUrl ) : null);
-			$.ajax({
-				url : xurl,
-				type : "get",
-				dataType : "html" 
-			}).done(function(data){
-				history.pushState(null, null, decodeURIComponent(xurl));
-				filters = makeFilters();
-				dom.html(data);
-				$(".pagination a").click(function(){
-					updateTable($(this).attr('href'));
-					return false;
-				});
-			})
+				dom = $(dom),
+				mainUrl = window.location.pathname;
+		var updateTable = function(url, goback){
+			update = true;
+			xurl = (url == null ? ( filters.length ?  mainUrl + "?" + filters.join('&') : mainUrl ) : url);
+      $.ajax({
+        url : xurl,
+        type : "get",
+        dataType : "html" 
+      }).done(function(data){
+        if(!goback){
+          history.replaceState(null, null, decodeURIComponent(xurl));  
+        }
+        
+        filters = makeFilters();
+        dom.html(data);
+        $(".pagination a").click(function(){
+          updateTable($(this).attr('href'));
+          return false;
+        });
+      })
 		}
 		this.addFilter = function(filter){
 			$.each(filters,function(idx,data){
@@ -68,6 +67,25 @@
 			updateTable();
 			return false;
 		};
+
+		this.clearFilter = function(){
+      $(".filter-group a.active").removeClass("active");
+      filters = [];
+      updateTable();
+      return false;
+    }
+
+    window.onpopstate = function(event){
+      if(!update){
+        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');
+        });
+      }
+      update = false;
+    }
 	}
-	var	filter = new Filter();
+
+	var update = false;
 </script>