diff --git a/app/views/comments/partials/index/_list.html.erb b/app/views/comments/partials/index/_list.html.erb
index 172c0e1d7..7c35dd74b 100644
--- a/app/views/comments/partials/index/_list.html.erb
+++ b/app/views/comments/partials/index/_list.html.erb
@@ -4,7 +4,7 @@
   <% end %>
 
   <div class="row notices">
-    <% if post.comments.hidden(CurrentUser.user).count > 0 || post.comments.count > 6 %>
+    <% if post.comments.hidden(CurrentUser.user).count > 0 || (params[:controller] == "comments" && post.comments.count > 6) %>
       <span class="info" id="threshold-comments-notice-for-<%= post.id %>"%>
         <%= link_to "Show all comments", comments_path(:post_id => post.id, :include_below_threshold => true), :remote => true %>
       </span>
diff --git a/config/schedule.rb b/config/schedule.rb
index 18ca2b31c..e99297cda 100644
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -1,6 +1,6 @@
 set :output, "/var/log/whenever.log"
 
-every 1.day do
+every 1.hour do
   runner "TagSubscription.process_all"
 end