diff --git a/app/browse.rb b/app/browse.rb
index 3a749203..54113d5b 100644
--- a/app/browse.rb
+++ b/app/browse.rb
@@ -62,9 +62,8 @@ def browse_sites_dataset
     when 'followers'
       ds = ds.order :follow_count.desc, :updated_at.desc
     when 'supporters'
-      ds = ds.exclude plan_type: nil
-      ds = ds.exclude plan_type: 'free'
-      ds = ds.order :views.desc, :site_updated_at.desc
+      ds = ds.where id: Site.supporter_ids
+      ds = ds.order :follow_count.desc, :views.desc, :site_updated_at.desc
     when 'featured'
       ds = ds.exclude featured_at: nil
       ds = ds.order :featured_at.desc
diff --git a/models/site.rb b/models/site.rb
index d4232d72..b933ada5 100644
--- a/models/site.rb
+++ b/models/site.rb
@@ -717,7 +717,12 @@ class Site < Sequel::Model
       expected_outcodes: [0, 1]
     )
 
-    output = line.run path: uploaded_file[:tempfile].path
+    begin
+      output = line.run path: uploaded_file[:tempfile].path
+    rescue Terrapin::ExitStatusError => e
+      puts "WARNING: CLAMAV FAILED #{username} #{uploaded_file[:tempfile].path} #{e.message}"
+      return true
+    end
 
     return true if output == ''