diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 5fca85ba8..f921c70e6 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -36,9 +36,9 @@ class PostsController < ApplicationController
   def show_seq
     context = PostSearchContext.new(params)
     if context.post_id
-      redirect_to(post_path(context.post_id, :tags => params[:tags]))
+      redirect_to(post_path(context.post_id, q: params[:q]))
     else
-      redirect_to(post_path(params[:id], :tags => params[:tags]))
+      redirect_to(post_path(params[:id], q: params[:q]))
     end
   end
 
@@ -106,7 +106,7 @@ private
           @error_message = post.errors.full_messages.join("; ")
           render :template => "static/error", :status => 500
         else
-          response_params = {:tags => params[:tags_query], :pool_id => params[:pool_id], :favgroup_id => params[:favgroup_id]}
+          response_params = {:q => params[:tags_query], :pool_id => params[:pool_id], :favgroup_id => params[:favgroup_id]}
           response_params.reject!{|key, value| value.blank?}
           redirect_to post_path(post, response_params)
         end
diff --git a/app/logical/post_search_context.rb b/app/logical/post_search_context.rb
index 729dc490a..cadf4e747 100644
--- a/app/logical/post_search_context.rb
+++ b/app/logical/post_search_context.rb
@@ -5,7 +5,7 @@ class PostSearchContext
   def initialize(params)
     @id = params[:id].to_i
     @seq = params[:seq]
-    @tags = params[:tags].presence || "status:any"
+    @tags = params[:q].presence || "status:any"
   end
 
   def post_id
diff --git a/app/presenters/post_presenter.rb b/app/presenters/post_presenter.rb
index bf24991e5..9f76f3433 100644
--- a/app/presenters/post_presenter.rb
+++ b/app/presenters/post_presenter.rb
@@ -187,7 +187,7 @@ class PostPresenter < Presenter
   end
 
   def has_sequential_navigation?(params)
-    return false if Tag.has_metatag?(params[:tags], :order, :ordfav, :ordpool)
+    return false if Tag.has_metatag?(params[:q], :order, :ordfav, :ordpool)
     return false if params[:pool_id].present? || params[:favgroup_id].present?
     return CurrentUser.user.enable_sequential_post_navigation 
   end
@@ -219,7 +219,7 @@ class PostPresenter < Presenter
       first = true
       pools = @post.pools.undeleted
       pools.each do |pool|
-        if first && template.params[:tags].blank? && template.params[:favgroup_id].blank?
+        if first && template.params[:q].blank? && template.params[:favgroup_id].blank?
           html += pool_link_html(template, pool, :include_rel => true)
           first = false
         else
diff --git a/app/views/posts/partials/show/_edit.html.erb b/app/views/posts/partials/show/_edit.html.erb
index c2123c752..dc5837ccd 100644
--- a/app/views/posts/partials/show/_edit.html.erb
+++ b/app/views/posts/partials/show/_edit.html.erb
@@ -7,7 +7,7 @@
 <%= render "sources/info" %>
 
 <%= form_for(post, :html => {:class => "simple_form", :id => "form"}) do |f| %>
-  <%= hidden_field_tag :tags_query, params[:tags] %>
+  <%= hidden_field_tag :tags_query, params[:q] %>
   <%= hidden_field_tag :pool_id, params[:pool_id] %>
   <%= hidden_field_tag :favgroup_id, params[:favgroup_id] %>
   <%= f.hidden_field :old_tag_string, :value => post.tag_string %>
diff --git a/app/views/posts/partials/show/_search_seq.html.erb b/app/views/posts/partials/show/_search_seq.html.erb
index 4e76e78a9..9a4ebcb46 100644
--- a/app/views/posts/partials/show/_search_seq.html.erb
+++ b/app/views/posts/partials/show/_search_seq.html.erb
@@ -1,9 +1,9 @@
 <div id="search-seq-nav">
   <ul>
     <li class="active">
-      <%= link_to "&lsaquo;&thinsp;prev".html_safe, show_seq_post_path(post, :tags => params[:q], :seq => "prev"), :rel => "prev nofollow", :class => "prev" %>
+      <%= link_to "&lsaquo;&thinsp;prev".html_safe, show_seq_post_path(post, :q => params[:q], :seq => "prev"), :rel => "prev nofollow", :class => "prev" %>
       <span class="search-name">Search: <%= params[:q].presence || "status:any" %></span>
-      <%= link_to "next&thinsp;&rsaquo;".html_safe, show_seq_post_path(post, :tags => params[:q], :seq => "next"), :rel => "next nofollow", :class => "next" %>
+      <%= link_to "next&thinsp;&rsaquo;".html_safe, show_seq_post_path(post, :q => params[:q], :seq => "next"), :rel => "next nofollow", :class => "next" %>
     </li>
   </ul>
 </div>
diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb
index d142adb20..4e64bc8d0 100644
--- a/app/views/posts/show.html.erb
+++ b/app/views/posts/show.html.erb
@@ -1,12 +1,12 @@
 <div id="c-posts">
   <div id="a-show">
     <aside id="sidebar">
-      <%= render "posts/partials/common/search", :path => posts_path, :tags => params[:tags], :tags_dom_id => "tags" %>
+      <%= render "posts/partials/common/search", :path => posts_path, :tags => params[:q], :tags_dom_id => "tags" %>
 
       <%= render "posts/partials/index/blacklist" %>
 
       <section id="tag-list">
-        <%= @post.presenter.split_tag_list_html(current_query: params[:tags], show_extra_links: CurrentUser.user.is_gold?) %>
+        <%= @post.presenter.split_tag_list_html(current_query: params[:q], show_extra_links: CurrentUser.user.is_gold?) %>
       </section>
 
       <section id="post-information">
@@ -67,7 +67,7 @@
 
       <section id="mark-as-translated-section" style="display: none;">
         <%= form_tag(mark_as_translated_post_path(@post), :class => "simple_form", :method => :put) do |f| %>
-          <%= hidden_field_tag :tags_query, params[:tags] %>
+          <%= hidden_field_tag :tags_query, params[:q] %>
           <%= hidden_field_tag :pool_id, params[:pool_id] %>
 
           <fieldset>