Index: lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
===================================================================
diff -u -r66bda55b4291ff10c230b0ab5227dab5fa058a8a -r332dc363ec2e219166fdb26fd55b0342c05e9607
--- lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(.../QbQuestion.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(.../QbQuestion.java)	(revision 332dc363ec2e219166fdb26fd55b0342c05e9607)
@@ -7,7 +7,6 @@
 import java.util.Map;
 import java.util.UUID;
 
-import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -22,10 +21,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
 import org.lamsfoundation.lams.qb.service.IQbService;
 
 /**
@@ -157,13 +152,11 @@
     private boolean autocompleteEnabled;
 
     @OneToMany(mappedBy = "qbQuestion", cascade = CascadeType.ALL)
-    @Fetch(FetchMode.SUBSELECT)
     @OrderBy("displayOrder")
     // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private List<QbOption> qbOptions = new ArrayList<>();
 
     @OneToMany(mappedBy = "qbQuestion", cascade = CascadeType.ALL)
-    @Fetch(FetchMode.SUBSELECT)
     // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private List<QbQuestionUnit> units = new ArrayList<>();