Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -rf9377e7d8d81e048c6218184f598826038b0cb35 -r7526ca9885157455bb66079b6cc8a3571f819de9
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision f9377e7d8d81e048c6218184f598826038b0cb35)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 7526ca9885157455bb66079b6cc8a3571f819de9)
@@ -2730,7 +2730,7 @@
 	int displayOrder = 1;
 	for (QbQuestion qbQuestion : newQuestions) {
 	    AssessmentQuestion assessmentQuestion = new AssessmentQuestion();
-	    assessmentQuestion.setDisplayOrder(displayOrder++);
+	    assessmentQuestion.setDisplayOrder(displayOrder);
 	    assessmentQuestion.setQbQuestion(qbQuestion);
 	    assessmentQuestion.setToolContentId(toolContentId);
 	    assessmentQuestionDao.insert(assessmentQuestion);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java
===================================================================
diff -u -r75d9ca69b7061931cacbd4dd862a3286d1a5306a -r7526ca9885157455bb66079b6cc8a3571f819de9
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java	(.../McContent.java)	(revision 75d9ca69b7061931cacbd4dd862a3286d1a5306a)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java	(.../McContent.java)	(revision 7526ca9885157455bb66079b6cc8a3571f819de9)
@@ -35,10 +35,11 @@
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
 import javax.persistence.Table;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
+import org.hibernate.annotations.SortComparator;
+import org.lamsfoundation.lams.qb.model.QbToolQuestion;
 
 /**
  * <p>
@@ -122,8 +123,8 @@
     private String reflectionSubject;
 
     @OneToMany(mappedBy = "mcContent", cascade = CascadeType.ALL)
-    @OrderBy("displayOrder")
-    private Set<McQueContent> mcQueContents;
+    @SortComparator(QbToolQuestion.QbToolQuestionComparator.class)
+    private Set<McQueContent> mcQueContents = new TreeSet<>();
 
     @OneToMany(mappedBy = "mcContent", cascade = CascadeType.ALL, orphanRemoval = true)
     private Set<McSession> mcSessions;
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
===================================================================
diff -u -r9511fd69d09fb40f3871022ee45b9f2df55b44c4 -r7526ca9885157455bb66079b6cc8a3571f819de9
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java	(.../Scratchie.java)	(revision 9511fd69d09fb40f3871022ee45b9f2df55b44c4)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java	(.../Scratchie.java)	(revision 7526ca9885157455bb66079b6cc8a3571f819de9)
@@ -40,6 +40,8 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.log4j.Logger;
+import org.hibernate.annotations.SortComparator;
+import org.lamsfoundation.lams.qb.model.QbToolQuestion;
 
 /**
  * Scratchie
@@ -83,6 +85,7 @@
 
     @OneToMany
     @JoinColumn(name = "scratchie_uid")
+    @SortComparator(QbToolQuestion.QbToolQuestionComparator.class)
     private Set<ScratchieItem> scratchieItems = new TreeSet<>();
 
     @Column(name = "extra_point")