diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index bdb9059e..f93dea0b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -230,7 +230,6 @@ class ApplicationController < ActionController::Base
   end
 
   def get_sorted_and_filtered(object_class, query = nil, objects = nil)  
-    object_class = object_class.classify.constantize
     if params[:filter] || params[:sort] || params[:new_filter]
       @filter = params[:filter]
       new_filter = params[:new_filter]
@@ -249,6 +248,7 @@ class ApplicationController < ActionController::Base
         @filter = {new_filter[:type] => [new_filter[:id].to_s]}
       end
 
+      object_class = object_class.classify.constantize
       objects ||= get_objects(object_class, query)
       unless params[:sort].blank?
         options = params[:sort_options]
@@ -390,6 +390,7 @@ class ApplicationController < ActionController::Base
 
 
   def get_viewable(object_class, query=nil)
+    object_class = object_class.classify.constantize
     get_objects(object_class,query).order_by(:created_at, :desc)
   end