diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 4c25d5a8a..67dac1829 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -111,10 +111,6 @@ dt:first-of-type{
 .filter .active {
   font-weight: bold;
 }
-.filter .active:after {
-   content: '✔';
-   margin-left: 0.5em; margin-right: .100em;
-}
 
 .navbar{
   background: #222;
diff --git a/app/views/search/_facet.html.erb b/app/views/search/_facet.html.erb
index c409e2d53..b7f4fe385 100644
--- a/app/views/search/_facet.html.erb
+++ b/app/views/search/_facet.html.erb
@@ -3,16 +3,23 @@
     <h5><%= format_facet_name(name) %></h5>
   </div>
   <div class="panel-body">
-	<ul class='filter'>
-	  <% facet.buckets.each do |term| %>
-	    <% next if term['key'].blank? %>
-	    <%= render 'search/term', term: term, name: name %>
-	  <% end %>
-	  <% if params[name.to_sym].present? && !facet.buckets.map{|t| t['key']}.include?(params[name.to_sym]) %>
-	    <li class='active'>
-	      <%= link_to platform_name(params[name.to_sym]), url_for(params.except(:host).merge(name.to_sym => nil, page: nil).permit!) %>
-	    </li>
-	  <% end %>
-	</ul>
+  <ul class='filter'>
+    <% facet.buckets.each do |term| %>
+        <% next if term['key'].blank? %>
+        <%= render 'search/term', term: term, name: name %>
+      <% end %>
+      <% if params[name.to_sym].present? %>
+        <% params[name.to_sym].split(',').each do |term| %>
+          <% if !facet.buckets.map{|t| t['key']}.include?(term) %>
+            <li class='active'>
+              <%= link_to url_for(params.except(:host).merge(name.to_sym => params[name.to_sym].split(',').reject{ |x| x == term }.join(','), page: nil).permit!) do %>
+              <input type='checkbox' checked>
+              <%= format_term(term) %>
+              <% end %>
+            </li>
+        <% end %>
+      <% end %>
+    <% end %>
+  </ul>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/views/search/_term.html.erb b/app/views/search/_term.html.erb
index 0b99480e1..c2e4d877a 100644
--- a/app/views/search/_term.html.erb
+++ b/app/views/search/_term.html.erb
@@ -1,10 +1,17 @@
 <% term['key'] = term['key'].downcase if name == 'host_type' %>
-<% active = term['key'] == params[name.to_sym] %>
+<% current_param = params[name.to_sym].try(:split,',') || [] %>
+<% active = current_param.include?(term['key']) %>
 <li class='<%= 'active' if active %>'>
   <% if active %>
-    <%= link_to format_term(term['key']), url_for(params.except(:host).merge(name.to_sym => nil, page: nil).permit!) %>
+    <%= link_to url_for(params.except(:host).merge(name.to_sym => current_param.reject{ |x| x == term['key'] }.join(','), page: nil).permit!) do %>
+    	<input type='checkbox' checked>
+    	<%= format_term(term['key']) %>
+    <% end %>
   <% else %>
-    <%= link_to format_term(term['key']), url_for(params.except(:host).merge(name.to_sym => term['key'], page: nil).permit!) %>
+    <%= link_to url_for(params.except(:host).merge(name.to_sym => current_param.push(term['key']).join(','), page: nil).permit!) do %>
+    	<input type='checkbox'>
+    	<%= format_term(term['key']) %>
+    <% end %>
     <small><%= number_to_human term['doc_count'] %> projects</small>
   <% end %>
 </li>