diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb
index cafae30b..187ccf42 100644
--- a/app/controllers/exercises_controller.rb
+++ b/app/controllers/exercises_controller.rb
@@ -75,7 +75,7 @@ class ExercisesController < ApplicationController
 
   def index
     @search = policy_scope(Exercise).ransack(params[:q])
-    @exercises = @search.result.includes(:execution_environment, :user).order(:title).paginate(page: params[:page], per_page: per_page_param)
+    @exercises = @search.result.includes(:execution_environment, :user, :files, :exercise_tags).order(:title).paginate(page: params[:page], per_page: per_page_param)
     authorize!
   end
 
@@ -460,7 +460,7 @@ class ExercisesController < ApplicationController
   private :set_execution_environments
 
   def set_exercise_and_authorize
-    @exercise = Exercise.find(params[:id])
+    @exercise = Exercise.includes(:exercise_tips, files: [:file_type]).find(params[:id])
     authorize!
   end
 
diff --git a/app/models/exercise.rb b/app/models/exercise.rb
index 426746b3..abdbd7a0 100644
--- a/app/models/exercise.rb
+++ b/app/models/exercise.rb
@@ -517,7 +517,11 @@ class Exercise < ApplicationRecord
         0
       end
     else
-      @maximum_score ||= files.teacher_defined_assessments.sum(:weight)
+      @maximum_score ||= if files.loaded?
+                           files.filter(&:teacher_defined_assessment?).pluck(:weight).sum
+                         else
+                           files.teacher_defined_assessments.sum(:weight)
+                         end
     end
   end
 
diff --git a/app/policies/exercise_policy.rb b/app/policies/exercise_policy.rb
index f10c446a..a109cfc6 100644
--- a/app/policies/exercise_policy.rb
+++ b/app/policies/exercise_policy.rb
@@ -31,7 +31,7 @@ class ExercisePolicy < AdminOrAuthorPolicy
 
   %i[implement? working_times? intervention? search? reload?].each do |action|
     define_method(action) do
-      return no_one unless @record.files.visible.exists? && @record.execution_environment.present?
+      return no_one unless @record.files.any? {|f| f.hidden == false } && @record.execution_environment.present?
 
       admin? || teacher_in_study_group? || author? || (everyone && !@record.unpublished?)
     end
diff --git a/app/views/exercises/index.html.slim b/app/views/exercises/index.html.slim
index 3c91b5d1..d7bd2126 100644
--- a/app/views/exercises/index.html.slim
+++ b/app/views/exercises/index.html.slim
@@ -29,9 +29,9 @@ h1 = Exercise.model_name.human(count: 2)
         tr data-id=exercise.id
           td.p-1.pt-2 = link_to_if(policy(exercise).show?, exercise.title, exercise, 'data-turbolinks' => "false")
           td.p-1.pt-2 = link_to_if(exercise.execution_environment && policy(exercise.execution_environment).show?, exercise.execution_environment, exercise.execution_environment)
-          td.p-1.pt-2 = exercise.files.teacher_defined_assessments.count
+          td.p-1.pt-2 = exercise.files.filter(&:teacher_defined_assessment?).length
           td.p-1.pt-2 = exercise.maximum_score
-          td.p-1.pt-2 = exercise.exercise_tags.count
+          td.p-1.pt-2 = exercise.exercise_tags.length
           td.p-1.pt-2 = exercise.expected_difficulty
           td.p-1.pt-2.public data-value=exercise.public? = symbol_for(exercise.public?)
           td.p-1.pt-2 = link_to(t('shared.edit'), edit_exercise_path(exercise)) if policy(exercise).edit?