diff --git a/app/models/dmsf_file_revision_access.rb b/app/models/dmsf_file_revision_access.rb
index 15fcb5b0..1a64a367 100644
--- a/app/models/dmsf_file_revision_access.rb
+++ b/app/models/dmsf_file_revision_access.rb
@@ -41,6 +41,7 @@ class DmsfFileRevisionAccess < ActiveRecord::Base
     :author_key => "#{DmsfFileRevisionAccess.table_name}.user_id",
     :permission => :view_dmsf_file_revision_accesses,
     :scope => select("#{DmsfFileRevisionAccess.table_name}.*").
-      joins(:dmsf_file_revision).joins(:dmsf_file).
+      joins(:dmsf_file_revision).joins("JOIN #{DmsfFile.table_name} ON dmsf_files.id = dmsf_file_revisions.dmsf_file_id").
+      joins("JOIN #{Project.table_name} on dmsf_files.project_id = projects.id").
       where(["#{DmsfFile.table_name}.deleted = ?", DmsfFile::STATUS_ACTIVE])
 end
diff --git a/app/views/dmsf/dmsf_rows.js.erb b/app/views/dmsf/dmsf_rows.js.erb
index 8c1b6316..21c538c7 100644
--- a/app/views/dmsf/dmsf_rows.js.erb
+++ b/app/views/dmsf/dmsf_rows.js.erb
@@ -13,6 +13,7 @@ $("#browser").dataTable().fnDestroy();
 
 // Add rows
 $('#<%= params[:row_id] %>').after('<%= escape_javascript(render(:partial => 'dmsf/dmsf_rows')) %>');
+hideOnLoad();
 
 // Reinitialize the dataTable
 <% title = DmsfFolder.get_column_position('title') %>