diff --git a/app/controllers/label_templates_controller.rb b/app/controllers/label_templates_controller.rb
index dcb312dac..710b71d42 100644
--- a/app/controllers/label_templates_controller.rb
+++ b/app/controllers/label_templates_controller.rb
@@ -5,7 +5,7 @@ class LabelTemplatesController < ApplicationController
   include TeamsHelper
 
   before_action :check_feature_enabled, except: %i(index zpl_preview list)
-  before_action :load_label_templates, only: %i(index datatable list)
+  before_action :load_label_templates, only: %i(index list)
   before_action :load_label_template, only: %i(show set_default update template_tags)
   before_action :check_view_permissions, except: %i(create duplicate set_default delete update)
   before_action :check_manage_permissions, only: %i(create duplicate set_default delete update)
diff --git a/app/models/label_template.rb b/app/models/label_template.rb
index a272cb057..784b9f8bf 100644
--- a/app/models/label_template.rb
+++ b/app/models/label_template.rb
@@ -23,7 +23,7 @@ class LabelTemplate < ApplicationRecord
   scope :predefined, -> { where(predefined: true) }
 
   def self.readable_by_user(user, teams)
-    where(team: teams.with_granted_permissions(user, TeamPermissions::LABEL_TEMPLATES_READ, teams))
+    where(team: Team.with_granted_permissions(user, TeamPermissions::LABEL_TEMPLATES_READ, teams))
   end
 
   def self.enabled?
diff --git a/app/models/project_folder.rb b/app/models/project_folder.rb
index a926d45b5..dbce95bbc 100644
--- a/app/models/project_folder.rb
+++ b/app/models/project_folder.rb
@@ -35,7 +35,7 @@ class ProjectFolder < ApplicationRecord
   scope :top_level, -> { where(parent_folder: nil) }
 
   def self.readable_by_user(user, teams)
-    joins(team: :users)
+    joins(team: :user_assignments)
       .where(teams: { user_assignments: { user: user } })
       .where(team: teams)
   end
diff --git a/app/models/result.rb b/app/models/result.rb
index f3bff42b6..0b0368aff 100644
--- a/app/models/result.rb
+++ b/app/models/result.rb
@@ -54,8 +54,7 @@ class Result < ApplicationRecord
     new_query = joins(:my_module)
                 .where(
                   my_modules: {
-                    id: MyModule.with_granted_permissions(user, MyModulePermissions::READ)
-                                .where(user_assignments: { team: teams }).select(:id)
+                    id: MyModule.with_granted_permissions(user, MyModulePermissions::READ, teams).select(:id)
                   }
                 )