diff --git a/app/controllers/manage_tags_controller.rb b/app/controllers/manage_tags_controller.rb
index 8de2049..83659bf 100644
--- a/app/controllers/manage_tags_controller.rb
+++ b/app/controllers/manage_tags_controller.rb
@@ -73,6 +73,6 @@ class ManageTagsController < ApplicationController
 
   # Full-text search for tags that have the query terms
   def search
-    @tags_found = Tag.find_by_contents(params[:query][:term])
+    @tags_found = Tag.find_by_contents(params[:query])
   end
 end
diff --git a/app/views/manage_tags/_search_box.rhtml b/app/views/manage_tags/_search_box.rhtml
index 53f4f2e..895590d 100644
--- a/app/views/manage_tags/_search_box.rhtml
+++ b/app/views/manage_tags/_search_box.rhtml
@@ -1,6 +1,6 @@
 <div class="search_box">
 <% form_tag :action => 'search' do %>
-  <%= text_field 'query', 'term'%>
+  <%= text_field_tag 'query' %>
   <%= submit_tag _('Search') %>
 <% end %>
 </div>
diff --git a/test/functional/manage_tags_controller_test.rb b/test/functional/manage_tags_controller_test.rb
index db2d021..3c9d53e 100644
--- a/test/functional/manage_tags_controller_test.rb
+++ b/test/functional/manage_tags_controller_test.rb
@@ -100,10 +100,18 @@ class ManageTagsControllerTest < Test::Unit::TestCase
 
   def test_approve
     pending_tag = Tag.create(:name => 'pending_tag', :pending => true)
-    assert pending_tag.pending?
     post :approve, :id => pending_tag.id
     assert_response :redirect
     assert_redirected_to :action => 'list'
     assert ( not Tag.find_with_pendings(pending_tag.id).pending? )
   end
+
+  def test_search
+    found_tag = Tag.create(:name => 'found_tag')
+    lost_tag = Tag.create(:name => 'lost_tag')
+    post :search, :query => 'found*'
+    assert_not_nil assigns(:tags_found)
+    assert assigns(:tags_found).include?(found_tag)
+    assert (not assigns(:tags_found).include?(lost_tag))
+  end
 end
--
libgit2 0.21.2