diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb
index f6ac3dd9..d6ece1f6 100644
--- a/app/models/dmsf_file.rb
+++ b/app/models/dmsf_file.rb
@@ -320,11 +320,11 @@ class DmsfFile < ActiveRecord::Base
     results = []
     results_count = 0        
     
-    includes(:project, :revisions).
+    joins(:project, :revisions).
     where(project_conditions.join(' AND ') + " AND #{DmsfFile.table_name}.deleted = :false", {:false => false}).scoping do
       where(find_options[:conditions]).order(find_options[:order]).scoping do
-        results_count = count(:all)
-        results = find(:all, limit_options)
+        results_count = count(:all)        
+        results = where(limit_options)
       end
     end
 
diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb
index f87d38c8..3093699e 100644
--- a/app/models/dmsf_folder.rb
+++ b/app/models/dmsf_folder.rb
@@ -309,13 +309,13 @@ class DmsfFolder < ActiveRecord::Base
     results = []
     results_count = 0
     
-    includes(:project).
+    joins(:project).
     where(project_conditions.join(' AND ')).scoping do
       where(find_options[:conditions]).order(find_options[:order]).scoping do
         results_count = count(:all)
-        results = find(:all, limit_options)
+        results = where(limit_options)
       end
-    end
+    end   
 
     [results, results_count]
   end