diff --git a/app/controllers/moderator/post/queues_controller.rb b/app/controllers/moderator/post/queues_controller.rb
index a24ffbf44..205677d10 100644
--- a/app/controllers/moderator/post/queues_controller.rb
+++ b/app/controllers/moderator/post/queues_controller.rb
@@ -18,7 +18,7 @@ module Moderator
           @posts = ::Post.includes(:disapprovals, :uploader).order("posts.id asc").pending_or_flagged.available_for_moderation(search_params[:hidden]).tag_match(search_params[:tags]).paginate(params[:page], :limit => per_page)
           @posts.each # hack to force rails to eager load
         end
-        #respond_with(@posts)
+        respond_with(@posts)
       end
 
       def random
diff --git a/app/controllers/related_tags_controller.rb b/app/controllers/related_tags_controller.rb
index b356bee69..af329c0f7 100644
--- a/app/controllers/related_tags_controller.rb
+++ b/app/controllers/related_tags_controller.rb
@@ -6,6 +6,6 @@ class RelatedTagsController < ApplicationController
     category = params[:category] || search_params[:category]
 
     @query = RelatedTagQuery.new(query: query, category: category, user: CurrentUser.user)
-    #respond_with(@query)
+    respond_with(@query)
   end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 81b9df449..c7cd7d9d2 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -217,7 +217,7 @@ module ApplicationHelper
   def body_attributes(user, params, current_item = nil)
     current_user_data_attributes = data_attributes_for(user, "current-user", current_user_attributes)
 
-    if params[:action] == "show" && current_item.present?
+    if current_item.present? && current_item.respond_to?(:html_data_attributes) && current_item.respond_to?(:model_name)
       model_name = current_item.model_name.singular.dasherize
       model_attributes = current_item.html_data_attributes
       current_item_data_attributes = data_attributes_for(current_item, model_name, model_attributes)