diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ca9ecf01f..1a8ea567b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -603,7 +603,7 @@ class ApplicationController < ActionController::Base
 	end
 
 	def paginate(relation)
-		limit  = params[:limit].to_i.zero? ? 20 : params[:limit].to_i
+		limit  = (params[:limit].to_i.zero? || params[:limit].to_i > 20) ? 20 : params[:limit].to_i
 		page   = params[:page].to_i.zero? ? 1 : params[:page].to_i
 		offset = (page - 1) * limit
 
diff --git a/app/decorators/tiding_decorator.rb b/app/decorators/tiding_decorator.rb
index 318167d92..58345b601 100644
--- a/app/decorators/tiding_decorator.rb
+++ b/app/decorators/tiding_decorator.rb
@@ -226,7 +226,8 @@ module TidingDecorator
   end
 
   def discuss_content
-    I18n.t(locale_format(parent_container_type, container.parent_id.present?)) % message_content_helper(container.content)
+    I18n.t(locale_format(parent_container_type, container.parent_id.present?)) %
+        (parent_container_type == 'Hack' ? container.content : message_content_helper(container.content))
   end
 
   def grade_content