diff --git a/app/controllers/ecs/course_targets_controller.rb b/app/controllers/ecs/course_targets_controller.rb
index 744840c39..e5ac4b36e 100644
--- a/app/controllers/ecs/course_targets_controller.rb
+++ b/app/controllers/ecs/course_targets_controller.rb
@@ -19,7 +19,9 @@ class Ecs::CourseTargetsController < Ecs::CourseBaseController
   end
 
   def with_achievement_methods
-    @course_targets = current_course.ec_course_targets.includes(:ec_graduation_subitems, :ec_course_achievement_methods)
+    @course_targets = current_course.ec_course_targets
+                        .includes(:ec_graduation_subitems,
+                                  ec_course_achievement_methods: [:ec_course_evaluation, :ec_course_evaluation_subitems])
   end
 
   private
diff --git a/app/services/ecs/query_course_evaluation_service.rb b/app/services/ecs/query_course_evaluation_service.rb
index 22e0ce1f4..fd1619076 100644
--- a/app/services/ecs/query_course_evaluation_service.rb
+++ b/app/services/ecs/query_course_evaluation_service.rb
@@ -29,7 +29,7 @@ class Ecs::QueryCourseEvaluationService < ApplicationService
 
       support = subitem.ec_course_supports.find_by(ec_course_id: ec_course.id)
 
-      weight = support.weights.to_f
+      weight = support&.weights.to_f
       objective_achievement = (weight * ec_course.ec_year.calculation_value.to_f).round(3)
 
       target_total_rates = 0
diff --git a/app/views/ecs/course_evaluations/shared/_ec_course_evaluation_only.json.jbuilder b/app/views/ecs/course_evaluations/shared/_ec_course_evaluation_only.json.jbuilder
index 776d446f7..010109524 100644
--- a/app/views/ecs/course_evaluations/shared/_ec_course_evaluation_only.json.jbuilder
+++ b/app/views/ecs/course_evaluations/shared/_ec_course_evaluation_only.json.jbuilder
@@ -1 +1 @@
-json.extract! ec_course_evaluation, :id, :name, :evaluation_count, :status
+json.extract! ec_course_evaluation, :id, :name, :evluation_count, :status