diff --git a/models/tag.rb b/models/tag.rb
index 58ffdb06..d06e9190 100644
--- a/models/tag.rb
+++ b/models/tag.rb
@@ -19,7 +19,7 @@ class Tag < Sequel::Model
   end
 
   def self.autocomplete(name, limit=3)
-    DB["select tags.name,count(*) as c from sites_tags inner join tags on tags.id=sites_tags.tag_id where tags.name != '' and tags.name LIKE ? group by tags.name having count(*) > 1 order by c desc LIMIT ?", name+'%', limit].all
+    DB["select tags.name,count(*) as c from sites_tags inner join tags on tags.id=sites_tags.tag_id inner join sites on sites.id=sites_tags.site_id where is_deleted='f' and is_banned='f' and is_crashing='f' and site_changed='t' and tags.name != '' and tags.name LIKE ? group by tags.name having count(*) > 1 order by c desc LIMIT ?", name+'%', limit].all
   end
 
   def self.popular_names(limit=10)
diff --git a/views/browse.erb b/views/browse.erb
index 1e5960c2..564ad1ad 100644
--- a/views/browse.erb
+++ b/views/browse.erb
@@ -70,7 +70,7 @@
           </span>
         </a>
         <div class="title">
-          <a href="//<%= site.host %>" title="<%= site.title %>"><%= site.title.shorten(35) %></a>
+          <a href="//<%= site.host %>" title="<%= site.title %>"><%= site.title.shorten(30) %></a>
         </div>
         <div class="site-info">
           <div style="float: left">
@@ -117,9 +117,9 @@
 <% end %>
 
 <div class="row website-Gallery content int-Gall tags">
-    <h3>Tags</h3>
+    <h3>Popular Tags</h3>
     <p>
-    <% Tag.popular_names.each do |tag| %>
+    <% Tag.popular_names(100).each do |tag| %>
       <a href="/browse?tag=<%= Rack::Utils.escape tag[:name] %>"><%= tag[:name] %></a>&nbsp;&nbsp;
     <% end %>
     </p>