Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java,v
diff -u -r1.49.4.1.4.1 -r1.49.4.1.4.2
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java	4 Mar 2010 07:50:29 -0000	1.49.4.1.4.1
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java	5 Mar 2010 00:11:19 -0000	1.49.4.1.4.2
@@ -547,8 +547,7 @@
      * 
      * LDEV-2526 note that questions have already been removed before this method is called, but
      * their displayOrder fields haven't been updated yet.  Note also that the given
-     * mapQuestionContent maps question numbers to question strings, according to the number of
-     * questions that existed before any questions were removed. :(
+     * mapQuestionContent maps question numbers to question strings.
      */
     protected QaContent createQuestionContent(Map mapQuestionContent, Map mapFeedback, IQaService qaService,
 	    QaContent qaContent, Set<QaCondition> conditions) {
@@ -571,8 +570,10 @@
 		
 		String currentFeedback = (String) mapFeedback.get(new Integer(displayOrder).toString());
 
-		QaQueContent existingQaQueContent = qaService.getQuestionContentByDisplayOrder(new Long(displayOrder),
-			qaContent.getUid());
+		//QaQueContent existingQaQueContent = qaService.getQuestionContentByDisplayOrder(new Long(displayOrder),
+		//	qaContent.getUid());
+		QaQueContent existingQaQueContent = qaService.getQuestionContentByQuestionText(pairs.getValue()
+			    .toString(), qaContent.getUid());
 
 		if (existingQaQueContent == null) {
 		    //QaQueContent duplicateQaQueContent = qaService.getQuestionContentByQuestionText(pairs.getValue()
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java,v
diff -u -r1.28 -r1.28.8.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	19 Feb 2009 23:59:14 -0000	1.28
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	5 Mar 2010 00:11:19 -0000	1.28.8.1
@@ -1031,6 +1031,7 @@
 	qaAuthoringForm.setCurrentTab("1");
 
 	request.setAttribute(QaAppConstants.LIST_QUESTION_CONTENT_DTO, listQuestionContentDTO);
+	sessionMap.put(QaAppConstants.LIST_QUESTION_CONTENT_DTO_KEY, listQuestionContentDTO);
 
 	qaGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString());