diff --git a/app/controllers/public/search_controller.rb b/app/controllers/public/search_controller.rb
index 7b8c9b5..bab756f 100644
--- a/app/controllers/public/search_controller.rb
+++ b/app/controllers/public/search_controller.rb
@@ -108,7 +108,7 @@ class SearchController < PublicController
 
     if asset_class(asset).methods.include?('facets')
       result.merge!(:facets => {:zeros => false, :sort => :count, :fields => asset_class(asset).facets.keys,
-                    :browse => params[:facet] ? params[:facet].map{ |k,v| k.to_s+':'+v.to_s} : ''})
+                    :browse => params[:facet] ? params[:facet].map{ |k,v| k.to_s+':"'+v.to_s+'"'} : ''})
     end
 
     result[:order_by] = solr_order
diff --git a/app/views/search/_facets_menu.rhtml b/app/views/search/_facets_menu.rhtml
index 584e822..467e057 100644
--- a/app/views/search/_facets_menu.rhtml
+++ b/app/views/search/_facets_menu.rhtml
@@ -8,9 +8,9 @@
       <% facet = @asset_class.facets[facet_id] %>
       <% solr_facet = @asset_class.to_solr_facet_fields[facet_id] %>
       <% facets_all = @facets["facet_fields"][solr_facet] %>
-      <% facets_found = params[:facet] ? facets_all.reject {|id,c| params[:facet][facet_id.to_s].to_s == id.to_s } : facets_all %>
+      <% facets_found = params[:facet] ? facets_all.reject {|name, count| params[:facet][facet_id.to_s].to_s == name.to_s } : facets_all %>
 
-      <% if facets_found.count > 0 %>
+      <% if facets_found and facets_found.count > 0 %>
         <div id="facet-menu-<%= index.to_s %>" class="facet-menu">
           <div class="facet-menu-label">
             <%= facet[:label] %>
@@ -19,8 +19,8 @@
           <% if facets_found.count > less_options_limit %>
             <div class="facet-menu-options facet-menu-more-options" style="display: none">
               <% array = [] %>
-              <% @asset_class.each_facet_obj(solr_facet, facets_found, :sort => :alphabetically) do |obj, count| %>
-                <% array << {:id => id, :name => link_to(obj.send(facet[:display_field].to_s), params.merge({"facet[#{facet_id.to_s}]" => obj.id})) + " (#{count})"} %>
+              <% @asset_class.each_facet_name(solr_facet, facets_found, :sort => :alphabetically) do |name, count| %>
+                <% array << {:id => name, :name => link_to(name, params.merge({"facet[#{facet_id.to_s}]" => name})) + " (#{count})"} %>
               <% end %>
 
               <%= text_field :facet, facet_id %>
@@ -31,8 +31,8 @@
           <% end %>
 
           <div class="facet-menu-options facet-menu-less-options">
-            <% c = 0; @asset_class.each_facet_obj(solr_facet, facets_found, :sort => :count) do |obj, count| %>
-              <%= link_to(obj.send(facet[:display_field].to_s), params.merge({"facet[#{facet_id.to_s}]" => obj.id})) + " (#{count})" %><br />
+            <% c = 0; @asset_class.each_facet_name(solr_facet, facets_found, :sort => :count) do |name, count| %>
+              <%= link_to(name, params.merge({"facet[#{facet_id.to_s}]" => name})) + " (#{count})" %><br />
               <% break if (c += 1) > less_options_limit %>
             <% end %>
           </div> <br />
diff --git a/app/views/search/_facets_unselect_menu.rhtml b/app/views/search/_facets_unselect_menu.rhtml
index ee497cd..ad6057c 100644
--- a/app/views/search/_facets_unselect_menu.rhtml
+++ b/app/views/search/_facets_unselect_menu.rhtml
@@ -1,8 +1,9 @@
 
-<% if params[:facet] %>
-  <% params[:facet].each do |facet_id, obj_id| %>
-    <% facet = @asset_class.facets[facet_id.to_sym] %>
-    <% obj = facet[:class].find_by_id(obj_id.to_i) %>
-    <%= link_to(obj.send(facet[:display_field]), params.merge(:facet => params[:facet].reject {|k,v| k == facet_id}), :class => 'facet-selected') if obj %>
+<div class="facets-applied">
+  <% if params[:facet] and params[:facet].count > 0 %>
+    <span class="appliedFilters"><%= _("Applied filters") %> </span>
+    <% params[:facet].each do |facet_id, name| %>
+      <%= link_to(name, params.merge(:facet => params[:facet].reject {|k,v| k == facet_id}), :class => 'facet-selected') %>
+    <% end %>
   <% end %>
-<% end %>
+</div>
--
libgit2 0.21.2