diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index 6601f07bd..70beb3a6c 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -19,9 +19,8 @@ class NotificationsController < ApplicationController
   private
 
   def cached_activities
-    return feed_activities unless Rails.env.production?
     Rails.cache.fetch("notifications-fetch-#{@user.id}-#{@user.last_notification_activity}",
-      expires_in: 5.hours) do
+                      expires_in: 5.hours) do
       feed_activities
     end
   end
@@ -41,29 +40,45 @@ end
 module StreamRails
   class Enrich
     def retrieve_objects(references)
-      Hash[references.
-        map { |model, ids| [model, Hash[construct_query(model, ids).map { |i| [i.id.to_s, i] }]] }]
+      Hash[
+        references.map do |model, ids|
+          [model, Hash[construct_query(model, ids).map { |i| [i.id.to_s, i] }]]
+        end
+      ]
     end
 
     def construct_query(model, ids)
-      case model
-      when "User"
-        model.classify.constantize.where(id: ids.keys).select(:id, :name, :username, :profile_image)
-      when "Comment"
-        model.classify.constantize.where(id: ids.keys).
-          select(:id, :id_code, :user_id, :processed_html,
-          :commentable_id, :commentable_type,
-          :updated_at, :ancestry).
-          includes(:user, :commentable)
-      when "Reaction"
-        model.classify.constantize.where(id: ids.keys).
-          includes(:reactable, :user)
-      when "Article"
-        model.classify.constantize.where(id: ids.keys).
-          select(:id, :title, :path, :user_id, :updated_at, :cached_tag_list)
-      else
-        model.classify.constantize.where(id: ids.keys)
-      end
+      send("get_#{model.downcase}", ids)
+    rescue NoMethodError
+      logger.warn "There was attempt to query for #{model}"
+      model.classify.constantize.where(id: ids.keys).to_a
+    end
+
+    private
+
+    def get_user(ids)
+      User.where(id: ids.keys).select(:id, :name, :username, :profile_image).to_a
+    end
+
+    def get_comment(ids)
+      Comment.where(id: ids.keys).
+        select(:id, :id_code, :user_id, :processed_html,
+               :commentable_id, :commentable_type,
+               :updated_at, :ancestry).
+        includes(:user, :commentable).to_a
+    end
+
+    def get_reaction(ids)
+      Reaction.where(id: ids.keys).includes(:reactable, :user).to_a
+    end
+
+    def get_article(ids)
+      Article.where(id: ids.keys).
+        select(:id, :title, :path, :user_id, :updated_at, :cached_tag_list).to_a
+    end
+
+    def get_broadcast(ids)
+      Broadcast.where(id: ids.keys).to_a
     end
   end
 end