diff --git a/app/browse.rb b/app/browse.rb
index ba0c2704..c6b78fd1 100644
--- a/app/browse.rb
+++ b/app/browse.rb
@@ -28,9 +28,12 @@ def education_sites_dataset
 end
 
 def browse_sites_dataset
-  site_dataset = Site.filter(is_deleted: false, is_banned: false, is_crashing: false).filter(site_changed: true)
+
+  site_dataset = Site.where(is_deleted: false, is_banned: false, is_crashing: false, site_changed: true)
 
   if current_site
+    site_dataset.or! sites__id: current_site.id
+
     if !current_site.blocking_site_ids.empty?
       site_dataset.where!(Sequel.~(Sequel.qualify(:sites, :id) => current_site.blocking_site_ids))
     end
diff --git a/views/browse.erb b/views/browse.erb
index 95c3fa3b..0fcc9b85 100644
--- a/views/browse.erb
+++ b/views/browse.erb
@@ -37,8 +37,6 @@
               </select>
             </div>
 
-            <input name="tag" type="hidden" value="<%= params[:tag] %>">
-
             <!--
               <div>
                 <input name="is_nsfw" type="checkbox" value="true" <%= params[:is_nsfw].to_s == 'true' ? 'checked' : '' %>> Show 18+ content
@@ -51,10 +49,14 @@
       <div class="col col-50 filter">
         <form method="GET" action="browse">
         <fieldset class="grouping">
-        <% unless is_education? || params[:sort_by] == 'followers' %>
+        <% unless is_education? %>
           <label class="text-Label" for="tag"><span class="hide-on-mobile">Filter by </span>Tag:</label>
           <input class="input-Area typeahead" id="tag" name="tag" type="text" placeholder="pokemon" value="<%= params[:tag] %>" autocapitalize="off" autocorrect="off" autocomplete="off" spellcheck="false" dir="auto">
           <input style="vertical-align: -4px;margin-left: 4px;" type="submit" class="btn-Action" value="Filter">
+        <% else %>
+          <% if params[:tag] %>
+            <input name="tag" type="hidden" value="<%= params[:tag] %>">
+          <% end %>
         <% end %>
         </fieldset>
       </div>