diff --git a/app/controllers/manage_tags_controller.rb b/app/controllers/manage_tags_controller.rb
index 9e5cad4..8de2049 100644
--- a/app/controllers/manage_tags_controller.rb
+++ b/app/controllers/manage_tags_controller.rb
@@ -5,7 +5,6 @@ class ManageTagsController < ApplicationController
 
   uses_flexible_template :owner => 'owner'
 
-
   # Index redirects to list action without modifing the url
   def index
     redirect_to :action => 'list'
diff --git a/app/views/manage_tags/list.rhtml b/app/views/manage_tags/list.rhtml
index 3abad85..0235e0e 100644
--- a/app/views/manage_tags/list.rhtml
+++ b/app/views/manage_tags/list.rhtml
@@ -1,8 +1,4 @@
-<br/>
-<% form_tag :action => 'search' do %>
-  <%= text_field 'query', 'term'%>
-  <%= submit_tag _('Search') %>
-<% end %>
+<%= render :partial => 'search_box'  %>
 
 <h2> <%= _("Listing tags") %> </h2>
 
diff --git a/app/views/manage_tags/search.rhtml b/app/views/manage_tags/search.rhtml
index a9a05da..1ef7950 100644
--- a/app/views/manage_tags/search.rhtml
+++ b/app/views/manage_tags/search.rhtml
@@ -1,3 +1,5 @@
+<%= render :partial => 'search_box' %>
+
 <h2> <%= _('Matching tags') %></h2>
 
 <% if not @tags_found.empty? %>
diff --git a/lib/extended_tag.rb b/lib/extended_tag.rb
index c15b0ab..8078135 100644
--- a/lib/extended_tag.rb
+++ b/lib/extended_tag.rb
@@ -13,7 +13,7 @@ class Tag
     end
   end
 
-#  acts_as_ferret :fields => [:name]
+  acts_as_ferret :fields => [:name]
 
 
   # Return all the tags that were suggested but not yet approved
--
libgit2 0.21.2