Index: lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
===================================================================
diff -u -rf32e50c400c8f387d531315fc1def501aaafb15c -r6517e6082d2775fcc434d86d274cead255d7c20b
--- lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(.../QbQuestion.java)	(revision f32e50c400c8f387d531315fc1def501aaafb15c)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(.../QbQuestion.java)	(revision 6517e6082d2775fcc434d86d274cead255d7c20b)
@@ -10,7 +10,6 @@
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -154,12 +153,12 @@
     @Column(name = "autocomplete_enabled")
     private boolean autocompleteEnabled;
 
-    @OneToMany(mappedBy = "qbQuestion", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+    @OneToMany(mappedBy = "qbQuestion", cascade = CascadeType.ALL)
     @Fetch(FetchMode.SUBSELECT)
     @OrderBy("displayOrder")
     private List<QbOption> qbOptions = new ArrayList<>();
 
-    @OneToMany(mappedBy = "qbQuestion", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+    @OneToMany(mappedBy = "qbQuestion", cascade = CascadeType.ALL)
     @Fetch(FetchMode.SUBSELECT)
     private List<QbQuestionUnit> units = new ArrayList<>();
 
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
===================================================================
diff -u -r8ffb8a4e0269d5abfca9f435911e6b38c5287bdb -r6517e6082d2775fcc434d86d274cead255d7c20b
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(.../Assessment.java)	(revision 8ffb8a4e0269d5abfca9f435911e6b38c5287bdb)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(.../Assessment.java)	(revision 6517e6082d2775fcc434d86d274cead255d7c20b)
@@ -191,7 +191,7 @@
     @OrderBy("sequence_id ASC")
     private Set<QuestionReference> questionReferences = new TreeSet<>(new SequencableComparator());
 
-    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "assessment_uid")
     @OrderBy("sequence_id ASC")
     private Set<AssessmentOverallFeedback> overallFeedbacks = new TreeSet<>(new SequencableComparator());
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
===================================================================
diff -u -rff6537798655584102f5dba4dd2fc293f7186118 -r6517e6082d2775fcc434d86d274cead255d7c20b
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java	(.../AssessmentQuestionResult.java)	(revision ff6537798655584102f5dba4dd2fc293f7186118)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java	(.../AssessmentQuestionResult.java)	(revision 6517e6082d2775fcc434d86d274cead255d7c20b)
@@ -82,7 +82,7 @@
     @JoinColumn(name = "result_uid")
     private AssessmentResult assessmentResult;
 
-    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "question_result_uid")
     private Set<AssessmentOptionAnswer> optionAnswers = new LinkedHashSet<>();
 
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java
===================================================================
diff -u -r7f09ca6e27d33ac2afa5859c4b482178657748c4 -r6517e6082d2775fcc434d86d274cead255d7c20b
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java	(.../AssessmentResult.java)	(revision 7f09ca6e27d33ac2afa5859c4b482178657748c4)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java	(.../AssessmentResult.java)	(revision 6517e6082d2775fcc434d86d274cead255d7c20b)
@@ -88,7 +88,7 @@
     @JoinColumn(name = "user_uid")
     private AssessmentUser user;
 
-    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "result_uid")
     @SortComparator(QbToolAnswer.QbToolAnswerComparator.class)
     private Set<AssessmentQuestionResult> questionResults = new TreeSet<>();