diff --git a/app/controllers/my_profile/cms_controller.rb b/app/controllers/my_profile/cms_controller.rb
index bb192e4..9748164 100644
--- a/app/controllers/my_profile/cms_controller.rb
+++ b/app/controllers/my_profile/cms_controller.rb
@@ -7,7 +7,7 @@ class CmsController < MyProfileController
   def search_tags
     arg = params[:term].downcase
     result = ActsAsTaggableOn::Tag.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"])
-    render :text => prepare_to_token_input2(result).to_json
+    render :text => prepare_to_token_input_by_label(result).to_json, :content_type => 'application/json'
   end
 
   def self.protect_if(*args)
diff --git a/app/helpers/article_helper.rb b/app/helpers/article_helper.rb
index afcc572..567de43 100644
--- a/app/helpers/article_helper.rb
+++ b/app/helpers/article_helper.rb
@@ -83,7 +83,7 @@ module ArticleHelper
     array.map { |object| {:id => object.id, :name => object.name} }
   end
 
-  def prepare_to_token_input2(array)
+  def prepare_to_token_input_by_label(array)
     array.map { |object| {:label => object.name, :value => object.name} }
   end
 
diff --git a/app/helpers/layout_helper.rb b/app/helpers/layout_helper.rb
index 64d0541..e2db756 100644
--- a/app/helpers/layout_helper.rb
+++ b/app/helpers/layout_helper.rb
@@ -27,6 +27,7 @@ module LayoutHelper
       'thickbox',
       'lightbox',
       'colorbox',
+      'inputosaurus',
       pngfix_stylesheet_path,
     ] + tokeninput_stylesheets
     plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin| plugin.class.public_path('style.css') }
diff --git a/app/views/cms/edit.html.erb b/app/views/cms/edit.html.erb
index ba4ed80..2508a60 100644
--- a/app/views/cms/edit.html.erb
+++ b/app/views/cms/edit.html.erb
@@ -33,9 +33,8 @@
 
   <br />
 
-  <%= stylesheet_link_tag('inputosaurus') %>
-
   <%= f.text_field('tag_list', :size => 64) %>
+  <%= content_tag( 'small', _('Separate tags with commas') ) %>
 
   <script>
     jQuery('#article_tag_list').inputosaurus({
diff --git a/test/functional/cms_controller_test.rb b/test/functional/cms_controller_test.rb
index 2ebe5f8..fa7b79b 100644
--- a/test/functional/cms_controller_test.rb
+++ b/test/functional/cms_controller_test.rb
@@ -1807,6 +1807,23 @@ class CmsControllerTest < ActionController::TestCase
     assert_template 'cms/publish'
   end
 
+  should 'response of search_tags be json' do
+    get :search_tags, :profile => profile.identifier, :term => 'linux'
+    assert_equal 'application/json', @response.content_type
+  end
+
+  should 'return empty json if does not find tag' do
+    get :search_tags, :profile => profile.identifier, :term => 'linux'
+    assert_equal "[]", @response.body
+  end
+
+  should 'return tags found' do
+    tag = mock; tag.stubs(:name).returns('linux')
+    ActsAsTaggableOn::Tag.stubs(:find).returns([tag])
+    get :search_tags, :profile => profile.identifier, :term => 'linux'
+    assert_equal '[{"label":"linux","value":"linux"}]', @response.body
+  end
+
   protected
 
   # FIXME this is to avoid adding an extra dependency for a proper JSON parser.
--
libgit2 0.21.2