diff --git a/app/components/paginator_component.rb b/app/components/paginator_component.rb
index b82f654fb..697666391 100644
--- a/app/components/paginator_component.rb
+++ b/app/components/paginator_component.rb
@@ -41,6 +41,6 @@ class PaginatorComponent < ApplicationComponent
   end
 
   def url_for_page(page)
-    url_for(**params.merge(page: page).permit!)
+    url_for(**params.merge(page: page).except(:z).permit!)
   end
 end
diff --git a/app/components/tag_list_component/tag_list_component.html+categorized.erb b/app/components/tag_list_component/tag_list_component.html+categorized.erb
index a47aad530..57be84ed3 100644
--- a/app/components/tag_list_component/tag_list_component.html+categorized.erb
+++ b/app/components/tag_list_component/tag_list_component.html+categorized.erb
@@ -8,19 +8,19 @@
       <% tags.each do |t| %>
         <li class="tag-type-<%= t.category %>" data-tag-name="<%= t.name %>">
           <% if t.artist? %>
-            <%= link_to "?", show_or_new_artists_path(name: t.name), class: "wiki-link" %>
+            <%= link_to "?", show_or_new_artists_path(name: t.name, z: 1), class: "wiki-link" %>
           <% elsif t.name =~ /\A\d+\z/ %>
-            <%= link_to "?", wiki_page_path("~#{t.name}"), class: "wiki-link" %>
+            <%= link_to "?", wiki_page_path("~#{t.name}", z: 1), class: "wiki-link" %>
           <% else %>
-            <%= link_to "?", wiki_page_path(t.name), class: "wiki-link" %>
+            <%= link_to "?", wiki_page_path(t.name, z: 1), class: "wiki-link" %>
           <% end %>
 
           <% if show_extra_links && current_query.present? %>
-            <%= link_to "+", posts_path(tags: "#{current_query} #{t.name}"), class: "search-inc-tag" %>
-            <%= link_to "-", posts_path(tags: "#{current_query} -#{t.name}"), class: "search-exl-tag" %>
+            <%= link_to "+", posts_path(tags: "#{current_query} #{t.name}", z: 3), class: "search-inc-tag" %>
+            <%= link_to "-", posts_path(tags: "#{current_query} -#{t.name}", z: 3), class: "search-exl-tag" %>
           <% end %>
 
-          <%= link_to t.pretty_name, posts_path(tags: t.name), class: "search-tag" %>
+          <%= link_to t.pretty_name, posts_path(tags: t.name, z: 1), class: "search-tag" %>
 
           <%= tag.span humanized_number(t.post_count), class: ["post-count", ("low-post-count" if is_underused_tag?(t))], title: t.post_count %>
         </li>
diff --git a/app/components/tag_list_component/tag_list_component.html+search.erb b/app/components/tag_list_component/tag_list_component.html+search.erb
index 1f648db46..b92e18279 100644
--- a/app/components/tag_list_component/tag_list_component.html+search.erb
+++ b/app/components/tag_list_component/tag_list_component.html+search.erb
@@ -3,19 +3,19 @@
     <li class="tag-type-<%= t.category %>" data-tag-name="<%= t.name %>">
       <%# ignore search:foo metatags %>
       <% if t.artist? %>
-        <%= link_to "?", show_or_new_artists_path(name: t.name), class: "wiki-link" %>
+        <%= link_to "?", show_or_new_artists_path(name: t.name, z: 2), class: "wiki-link" %>
       <% elsif t.name =~ /\A\d+\z/ %>
-        <%= link_to "?", wiki_page_path("~#{t.name}"), class: "wiki-link" %>
+        <%= link_to "?", wiki_page_path("~#{t.name}", z: 2), class: "wiki-link" %>
       <% else %>
-        <%= link_to "?", wiki_page_path(t.name), class: "wiki-link" %>
+        <%= link_to "?", wiki_page_path(t.name, z: 2), class: "wiki-link" %>
       <% end %>
 
       <% if show_extra_links && current_query.present? %>
-        <%= link_to "+", posts_path(tags: "#{current_query} #{t.name}", **search_params), class: "search-inc-tag" %>
-        <%= link_to "-", posts_path(tags: "#{current_query} -#{t.name}", **search_params), class: "search-exl-tag" %>
+        <%= link_to "+", posts_path(tags: "#{current_query} #{t.name}", z: 4, **search_params), class: "search-inc-tag" %>
+        <%= link_to "-", posts_path(tags: "#{current_query} -#{t.name}", z: 4, **search_params), class: "search-exl-tag" %>
       <% end %>
 
-      <%= link_to t.pretty_name, posts_path(tags: t.name, **search_params), class: "search-tag" %>
+      <%= link_to t.pretty_name, posts_path(tags: t.name, **search_params, z: 2), class: "search-tag" %>
       <%= tag.span humanized_number(t.post_count), class: "post-count", title: t.post_count %>
     </li>
   <% end %>
diff --git a/app/views/posts/partials/common/_search.html.erb b/app/views/posts/partials/common/_search.html.erb
index 65a27af67..955d86271 100644
--- a/app/views/posts/partials/common/_search.html.erb
+++ b/app/views/posts/partials/common/_search.html.erb
@@ -13,6 +13,7 @@
       <%= hidden_field_tag :size, params[:size] %>
     <% end %>
     <%= text_field_tag("tags", tags, :id => tags_dom_id, :class => "flex-auto", :"data-shortcut" => "q", :"data-autocomplete" => "tag-query") %>
+    <%= hidden_field_tag :z, 5 %>
     <button id="search-box-submit" type="submit"><%= search_icon %></button>
   <% end %>
 </section>