diff --git a/app/helpers/posts_helper.rb b/app/helpers/posts_helper.rb
index 31da14cbc..57a2a9c61 100644
--- a/app/helpers/posts_helper.rb
+++ b/app/helpers/posts_helper.rb
@@ -13,19 +13,14 @@ module PostsHelper
     params[:tags] =~ /order:rank/ || params[:action] =~ /searches|viewed/
   end
 
-  def missed_post_search_count_js
-    return unless post_search_counts_enabled?
-    return unless params[:ms] == "1" && @post_set.post_count == 0 && @post_set.query.is_single_term?
-
-    sig = generate_reportbooru_signature(params[:tags])
+  def missed_post_search_count_js(post_set)
+    tags = post_set.query.normalize_query
+    sig = generate_reportbooru_signature(tags)
     render "posts/partials/index/missed_search_count", sig: sig
   end
 
-  def post_search_count_js
-    return unless post_search_counts_enabled?
-    return unless params[:action] == "index" && params[:page].nil? && params[:tags].present?
-
-    tags = PostQueryBuilder.new(params[:tags]).normalize_query
+  def post_search_count_js(post_set)
+    tags = post_set.query.normalize_query
     sig = generate_reportbooru_signature("ps-#{tags}")
     render "posts/partials/index/search_count", sig: sig
   end
diff --git a/app/views/posts/index.html.erb b/app/views/posts/index.html.erb
index cfc458951..b96eafa13 100644
--- a/app/views/posts/index.html.erb
+++ b/app/views/posts/index.html.erb
@@ -39,8 +39,6 @@
   <%= render "posts/partials/index/posts", :post_set => @post_set %>
 <% end %>
 
-<%= post_search_count_js %>
-
 <div id="saved-searches-nav">
   <%= render "saved_searches/interface" %>
 </div>
@@ -51,6 +49,14 @@
   <%= render "posts/partials/common/secondary_links" %>
 <% end %>
 
+<% if post_search_counts_enabled? && @post_set.query.is_simple_tag? && @post_set.current_page == 1 %>
+  <% if @post_set.post_count == 0 %>
+    <%= missed_post_search_count_js %>
+  <% else %>
+    <%= post_search_count_js %>
+  <% end %>
+<% end %>
+
 <% content_for(:html_header) do %>
   <%= render "posts/partials/index/seo_meta_tags" %>
 <% end %>
diff --git a/app/views/posts/partials/common/_search.html.erb b/app/views/posts/partials/common/_search.html.erb
index f385ff0ed..078d17f0a 100644
--- a/app/views/posts/partials/common/_search.html.erb
+++ b/app/views/posts/partials/common/_search.html.erb
@@ -11,6 +11,5 @@
     <% end %>
     <%= text_field_tag("tags", tags, :id => tags_dom_id, :"data-shortcut" => "q", :"data-autocomplete" => "tag-query") %>
     <button id="search-box-submit" type="submit"><i class="fas fa-search"></i></button>
-    <%= hidden_field_tag "ms", "1" %>
   <% end %>
 </section>
diff --git a/app/views/posts/partials/index/_seo_meta_tags.html.erb b/app/views/posts/partials/index/_seo_meta_tags.html.erb
index 4431ae472..8fbfe0a8c 100644
--- a/app/views/posts/partials/index/_seo_meta_tags.html.erb
+++ b/app/views/posts/partials/index/_seo_meta_tags.html.erb
@@ -10,8 +10,6 @@
   <% atom_feed_tag "Posts: #{@post_set.tag_string}", posts_url(tags: @post_set.tag_string, format: :atom) %>
 <% end %>
 
-<%= missed_post_search_count_js %>
-
 <% if @post_set.hide_from_crawler? %>
   <meta name="robots" content="nofollow,noindex">
 <% end %>