diff --git a/app/models/tag_subscription.rb b/app/models/tag_subscription.rb
index cc049ca56..d745ff9aa 100644
--- a/app/models/tag_subscription.rb
+++ b/app/models/tag_subscription.rb
@@ -6,7 +6,7 @@ class TagSubscription < ActiveRecord::Base
   before_save :limit_tag_count
   attr_accessible :name, :tag_query, :post_ids, :is_public, :is_visible_on_profile
   validates_presence_of :name, :tag_query, :creator_id
-  validates_format_of :tag_query, :with => /^(?:\S+\s*){1,20}$/m, :message => "can have up to 20 tags"
+  validates_format_of :tag_query, :with => /\A(?:\S*\s*){1,20}\Z/, :message => "can have up to 20 tags"
   validate :creator_can_create_subscriptions, :on => :create
 
   def normalize_name
diff --git a/app/views/tag_subscriptions/_form.html.erb b/app/views/tag_subscriptions/_form.html.erb
index a14f89477..e5775b574 100644
--- a/app/views/tag_subscriptions/_form.html.erb
+++ b/app/views/tag_subscriptions/_form.html.erb
@@ -1,6 +1,6 @@
 <%= simple_form_for(@tag_subscription) do |f| %>
   <%= f.input :name %>
-  <%= f.input :tag_query, :as => :string %>
+  <%= f.input :tag_query %>
   <div class="input">
     <label for="tag_subscription_is_public">
       <%= check_box "tag_subscription", "is_public" %>