diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index b1f623d34..637d09a1c 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -74,7 +74,10 @@ private
 
   def index_by_post
     @posts = Post.where("last_comment_bumped_at IS NOT NULL").tag_match(params[:tags]).reorder("last_comment_bumped_at DESC NULLS LAST").paginate(params[:page], :limit => 5, :search_count => params[:search])
-    @posts.each # hack to force rails to eager load
+
+    @posts = @posts.includes(comments: [:creator])
+    @posts = @posts.includes(comments: [:votes]) if CurrentUser.is_member?
+
     respond_with(@posts) do |format|
       format.xml do
         render :xml => @posts.to_xml(:root => "posts")
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index fd57fb78d..5a7dea927 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -23,6 +23,10 @@ class PostsController < ApplicationController
   def show
     @post = Post.find(params[:id])
 
+    @comments = @post.last_commented_at.present? ? @post.comments : Comment.none
+    @comments = @comments.includes(:creator)
+    @comments = @comments.includes(:votes) if CurrentUser.is_member?
+
     include_deleted = @post.is_deleted? || (@post.parent_id.present? && @post.parent.is_deleted?) || CurrentUser.user.show_deleted_children?
     @parent_post_set = PostSets::PostRelationship.new(@post.parent_id, :include_deleted => include_deleted)
     @children_post_set = PostSets::PostRelationship.new(@post.id, :include_deleted => include_deleted)
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 0f30aed63..68f66365c 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -22,26 +22,6 @@ class Comment < ApplicationRecord
   )
 
   module SearchMethods
-    def recent
-      reorder("comments.id desc").limit(6)
-    end
-
-    def hidden(user)
-      if user.is_moderator?
-        where("(score < ? and is_sticky = false) or is_deleted = true", user.comment_threshold)
-      else
-        where("score < ? and is_sticky = false", user.comment_threshold)
-      end
-    end
-
-    def visible(user)
-      if user.is_moderator?
-        where("(score >= ? or is_sticky = true) and is_deleted = false", user.comment_threshold)
-      else
-        where("score >= ? or is_sticky = true", user.comment_threshold)
-      end
-    end
-
     def deleted
       where("comments.is_deleted = true")
     end
@@ -172,9 +152,16 @@ class Comment < ApplicationRecord
   end
 
   def voted_by?(user)
+    return false if user.is_anonymous?
     user.id.in?(votes.map(&:user_id))
   end
 
+  def visible_by?(user, show_thresholded: false, show_deleted: false)
+    return false if is_deleted? && !show_deleted && !user.is_moderator?
+    return false if score < user.comment_threshold && !is_sticky? && !show_thresholded
+    true
+  end
+
   def hidden_attributes
     super + [:body_index]
   end
diff --git a/app/models/post.rb b/app/models/post.rb
index 38264e126..507a13374 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -51,7 +51,7 @@ class Post < ApplicationRecord
   has_many :appeals, :class_name => "PostAppeal", :dependent => :destroy
   has_many :votes, :class_name => "PostVote", :dependent => :destroy
   has_many :notes, :dependent => :destroy
-  has_many :comments, -> {includes(:creator, :updater).order("comments.id")}, :dependent => :destroy
+  has_many :comments, -> {order("comments.id")}, :dependent => :destroy
   has_many :children, -> {order("posts.id")}, :class_name => "Post", :foreign_key => "parent_id"
   has_many :approvals, :class_name => "PostApproval", :dependent => :destroy
   has_many :disapprovals, :class_name => "PostDisapproval", :dependent => :destroy
diff --git a/app/views/application/_update_notice.html.erb b/app/views/application/_update_notice.html.erb
index 2f8e0a056..dcb6d474b 100644
--- a/app/views/application/_update_notice.html.erb
+++ b/app/views/application/_update_notice.html.erb
@@ -1,6 +1,6 @@
 <%# record, interval %>
 
-<% if record.respond_to?(:updater) && record.updater != record.creator  %>
+<% if record.respond_to?(:updater) && record.updater_id != record.creator_id  %>
   <p class="info">Updated by <%= link_to_user record.updater %> <%= time_ago_in_words_tagged(record.updated_at) %></p>
 <% elsif record.updated_at - record.created_at > (local_assigns[:interval] || 5.minutes) %>
   <p class="info">Updated <%= time_ago_in_words_tagged(record.updated_at) %></p>
diff --git a/app/views/comments/_index_by_post.html.erb b/app/views/comments/_index_by_post.html.erb
index 640d3ef23..08faa93af 100644
--- a/app/views/comments/_index_by_post.html.erb
+++ b/app/views/comments/_index_by_post.html.erb
@@ -5,19 +5,17 @@
     </div>
   <% end %>
 
-  <% if @posts.empty? %>
+  <% if @posts.blank? %>
     <%= render "post_sets/blank" %>
   <% end %>
 
-  <% @posts.select {|x| x.visible?}.each do |post| %>
-    <% if CurrentUser.is_moderator? || post.comments.undeleted.exists? %>
+  <% @posts.select(&:visible?).each do |post| %>
+    <% if post.comments.any? { |c| c.visible_by?(CurrentUser.user, show_thresholded: true) } %>
       <%= content_tag(:div, { id: "post_#{post.id}", class: ["post", *PostPresenter.preview_class(post)].join(" ") }.merge(PostPresenter.data_attributes(post))) do %>
         <div class="preview">
-          <% if post.visible? %>
-            <%= link_to(image_tag(post.preview_file_url), post_path(post)) %>
-          <% end %>
+          <%= link_to(image_tag(post.preview_file_url), post_path(post)) %>
         </div>
-        <%= render "comments/partials/index/list", :post => post, :comments => post.comments.visible(CurrentUser.user).recent.reverse, :show_header => true %>
+        <%= render "comments/partials/index/list", post: post, comments: post.comments.select { |c| c.visible_by?(CurrentUser.user) }.last(6), page: :comments %>
         <div class="clearfix"></div>
       <% end %>
     <% end %>
diff --git a/app/views/comments/partials/index/_list.html.erb b/app/views/comments/partials/index/_list.html.erb
index 20d1d299e..a5d7810dc 100644
--- a/app/views/comments/partials/index/_list.html.erb
+++ b/app/views/comments/partials/index/_list.html.erb
@@ -1,10 +1,10 @@
 <div class="comments-for-post" data-post-id="<%= post.id %>">
-  <% if show_header %>
+  <% if page == :comments %>
     <%= render "comments/partials/index/header", :post => post %>
   <% end %>
 
   <div class="row notices">
-    <% if post.comments.hidden(CurrentUser.user).count > 0 || (params[:controller] == "comments" && post.comments.count > 6) %>
+    <% if (post.last_commented_at.present? && post.comments.any? { |c| !c.visible_by?(CurrentUser.user) }) || (page == :comments && post.comments.size > 6) %>
       <span class="info" id="threshold-comments-notice-for-<%= post.id %>">
         <%= link_to "Show all comments", comments_path(:post_id => post.id), :remote => true %>
       </span>
@@ -12,14 +12,12 @@
   </div>
 
   <div class="list-of-comments">
-    <% if comments.empty? %>
-      <% if post.last_commented_at.present? %>
-        <p>There are no visible comments.</p>
-      <% else %>
-        <p>There are no comments.</p>
-      <% end %>
+    <% if comments.present? %>
+      <%= render partial: "comments/partials/show/comment", collection: comments %>
+    <% elsif post.last_commented_at.present? %>
+      <p>There are no visible comments.</p>
     <% else %>
-      <%= render :partial => "comments/partials/show/comment", :collection => comments %>
+      <p>There are no comments.</p>
     <% end %>
   </div>
 
diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb
index cfc6350c9..a2c139ad6 100644
--- a/app/views/posts/show.html.erb
+++ b/app/views/posts/show.html.erb
@@ -120,7 +120,7 @@
         <% if !CurrentUser.user.is_builder? %>
           <h2>Before commenting, read the <%= link_to "how to comment guide", wiki_pages_path(:search => {:title => "howto:comment"}) %>.</h2>
         <% end %>
-        <%= render "comments/partials/index/list", :comments => @post.comments.visible(CurrentUser.user).includes(:creator), :post => @post, :show_header => false %>
+        <%= render "comments/partials/index/list", comments: @comments, post: @post, page: :post %>
       </section>
 
       <section id="notes" style="display: none;">
diff --git a/test/unit/comment_test.rb b/test/unit/comment_test.rb
index 748893002..ec58c0d29 100644
--- a/test/unit/comment_test.rb
+++ b/test/unit/comment_test.rb
@@ -252,26 +252,6 @@ class CommentTest < ActiveSupport::TestCase
         end
       end
 
-      context "that is below the score threshold" do
-        should "be hidden if not stickied" do
-          user = FactoryBot.create(:user, :comment_threshold => 0)
-          post = FactoryBot.create(:post)
-          comment = FactoryBot.create(:comment, :post => post, :score => -5)
-
-          assert_equal([comment], post.comments.hidden(user))
-          assert_equal([], post.comments.visible(user))
-        end
-
-        should "be visible if stickied" do
-          user = FactoryBot.create(:user, :comment_threshold => 0)
-          post = FactoryBot.create(:post)
-          comment = FactoryBot.create(:comment, :post => post, :score => -5, :is_sticky => true)
-
-          assert_equal([], post.comments.hidden(user))
-          assert_equal([comment], post.comments.visible(user))
-        end
-      end
-
       context "that is quoted" do
         should "strip [quote] tags correctly" do
           comment = FactoryBot.create(:comment, body: <<-EOS.strip_heredoc)