diff --git a/app/views/artist_versions/index.html.erb b/app/views/artist_versions/index.html.erb
index 17857ebbe..948621dac 100644
--- a/app/views/artist_versions/index.html.erb
+++ b/app/views/artist_versions/index.html.erb
@@ -41,7 +41,7 @@
       </table>
     </div>
 
-    <%= numbered_paginator(@artist_versions, :count => (params[:search].present? ? nil : 1_000_000)) %>
+    <%= numbered_paginator(@artist_versions, :search_count => params[:search]) %>
   </div>
 </div>
 
diff --git a/script/fixes/008.rb b/script/fixes/008.rb
new file mode 100644
index 000000000..6cabc0ad2
--- /dev/null
+++ b/script/fixes/008.rb
@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'config', 'environment'))
+
+ActiveRecord::Base.connection.execute("set statement_timeout = 0")
+Tag.find_each do |tag|
+  tag.fix_post_count
+end