Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentOptionAnswer.java
===================================================================
diff -u -r95a8036ef190595474c3bac650ecd8e004434fd2 -rb6ddefd42c5660f90bd1da67f25e44d65ee21e30
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentOptionAnswer.java	(.../AssessmentOptionAnswer.java)	(revision 95a8036ef190595474c3bac650ecd8e004434fd2)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentOptionAnswer.java	(.../AssessmentOptionAnswer.java)	(revision b6ddefd42c5660f90bd1da67f25e44d65ee21e30)
@@ -55,7 +55,7 @@
 	return uid;
     }
 
-    private void setUid(Long uid) {
+    public void setUid(Long uid) {
 	this.uid = uid;
     }
     
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
===================================================================
diff -u -rc2897ead02cf7864ed8c7162b1a91a5959ede593 -rb6ddefd42c5660f90bd1da67f25e44d65ee21e30
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java	(.../AssessmentQuestion.java)	(revision c2897ead02cf7864ed8c7162b1a91a5959ede593)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java	(.../AssessmentQuestion.java)	(revision b6ddefd42c5660f90bd1da67f25e44d65ee21e30)
@@ -102,6 +102,8 @@
     
     private String questionFeedback;
     
+    private String titleEscaped;
+    
     /**
      * Grade acquired from QUestionReference in learner.
      */
@@ -506,6 +508,13 @@
 	return questionFeedback;
     }
     
+    public String getTitleEscaped() {
+	return titleEscaped;
+    }
+    public void setTitleEscaped(String titleEscaped) {
+	this.titleEscaped = titleEscaped;
+    }
+    
     /**
      * @return Grade acquired from QUestionReference in learner.
      */
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionOption.java
===================================================================
diff -u -rd209a8f4bb44ac8c149c57f6aff431a0cab8f2b6 -rb6ddefd42c5660f90bd1da67f25e44d65ee21e30
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionOption.java	(.../AssessmentQuestionOption.java)	(revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionOption.java	(.../AssessmentQuestionOption.java)	(revision b6ddefd42c5660f90bd1da67f25e44d65ee21e30)
@@ -55,6 +55,10 @@
     private int answerInt = -1;
     
     private boolean answerBoolean;
+    
+    private String questionEscaped;
+    
+    private String optionStringEscaped;
 
     // **********************************************************
     // Get/Set methods
@@ -191,7 +195,21 @@
     }
     public void setAnswerBoolean(boolean answerBoolean) {
 	this.answerBoolean = answerBoolean;
-    }    
+    }
+    
+    public String getQuestionEscaped() {
+	return questionEscaped;
+    }
+    public void setQuestionEscaped(String questionEscaped) {
+	this.questionEscaped = questionEscaped;
+    }
+    
+    public String getOptionStringEscaped() {
+	return optionStringEscaped;
+    }
+    public void setOptionStringEscaped(String optionStringEscaped) {
+	this.optionStringEscaped = optionStringEscaped;
+    }
 
     @Override
     public Object clone() {
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
===================================================================
diff -u -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9 -rb6ddefd42c5660f90bd1da67f25e44d65ee21e30
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java	(.../AssessmentQuestionResult.java)	(revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java	(.../AssessmentQuestionResult.java)	(revision b6ddefd42c5660f90bd1da67f25e44d65ee21e30)
@@ -52,6 +52,7 @@
     // DTO fields:
     private Date finishDate;
     private AssessmentUser user;
+    private String answerStringEscaped;
     
     public AssessmentQuestionResult() {
 	optionAnswers = new LinkedHashSet<AssessmentOptionAnswer>();
@@ -209,5 +210,13 @@
     public void setUser(AssessmentUser user) {
 	this.user = user;
     }
+    
+    public String getAnswerStringEscaped() {
+	return answerStringEscaped;
+    }
+
+    public void setAnswerStringEscaped(String answerStringEscaped) {
+	this.answerStringEscaped = answerStringEscaped;
+    }
  
 }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -r33da76d05725a84e191a5f6dca50b394cca3c1ee -rb6ddefd42c5660f90bd1da67f25e44d65ee21e30
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 33da76d05725a84e191a5f6dca50b394cca3c1ee)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision b6ddefd42c5660f90bd1da67f25e44d65ee21e30)
@@ -68,7 +68,6 @@
 import org.lamsfoundation.lams.tool.ToolContentManager;
 import org.lamsfoundation.lams.tool.ToolOutput;
 import org.lamsfoundation.lams.tool.ToolOutputDefinition;
-import org.lamsfoundation.lams.tool.ToolSession;
 import org.lamsfoundation.lams.tool.ToolSessionExportOutputData;
 import org.lamsfoundation.lams.tool.ToolSessionManager;
 import org.lamsfoundation.lams.tool.assessment.AssessmentConstants;
@@ -654,7 +653,8 @@
 	AssessmentResult lastFinishedResult = assessmentResultDao.getLastFinishedAssessmentResultBySessionId(sessionId,
 		userId);
 	if (lastFinishedResult != null) {
-	    SortedSet questionResults = new TreeSet(new AssessmentQuestionResultComparator());
+	    SortedSet<AssessmentQuestionResult> questionResults = new TreeSet<AssessmentQuestionResult>(
+		    new AssessmentQuestionResultComparator());
 	    questionResults.addAll(lastFinishedResult.getQuestionResults());
 	    lastFinishedResult.setQuestionResults(questionResults);
 	    escapeQuotes(lastFinishedResult);
@@ -849,28 +849,28 @@
     private static void escapeQuotesInQuestionResult(AssessmentQuestionResult questionResult) {
 	String answerString = questionResult.getAnswerString();
 	if (answerString != null) {
-	    answerString = StringEscapeUtils.escapeJavaScript(answerString);
-	    questionResult.setAnswerString(answerString);
+	    String answerStringEscaped = StringEscapeUtils.escapeJavaScript(answerString);
+	    questionResult.setAnswerStringEscaped(answerStringEscaped);
 	}
 
 	AssessmentQuestion question = questionResult.getAssessmentQuestion();
 	String title = question.getTitle();
 	if (title != null) {
-	    title = StringEscapeUtils.escapeJavaScript(title);
-	    question.setTitle(title);
+	    String titleEscaped = StringEscapeUtils.escapeJavaScript(title);
+	    question.setTitleEscaped(titleEscaped);
 	}
 
 	for (AssessmentQuestionOption questionOption : question.getQuestionOptions()) {
 	    String questionStr = questionOption.getQuestion();
 	    if (questionStr != null) {
-		questionStr = StringEscapeUtils.escapeJavaScript(questionStr);
-		questionOption.setQuestion(questionStr);
+		String questionEscaped = StringEscapeUtils.escapeJavaScript(questionStr);
+		questionOption.setQuestionEscaped(questionEscaped);
 	    }
 
 	    String optionStr = questionOption.getOptionString();
 	    if (optionStr != null) {
-		optionStr = StringEscapeUtils.escapeJavaScript(optionStr);
-		questionOption.setOptionString(optionStr);
+		String optionEscaped = StringEscapeUtils.escapeJavaScript(optionStr);
+		questionOption.setOptionStringEscaped(optionEscaped);
 	    }
 	}
     }
@@ -1091,16 +1091,6 @@
 
 	Assessment toContent = Assessment.newInstance(assessment, toContentId, assessmentToolContentHandler);
 	assessmentDao.saveObject(toContent);
-
-	// save assessment questions as well
-	Set questions = toContent.getQuestions();
-	if (questions != null) {
-	    Iterator iter = questions.iterator();
-	    while (iter.hasNext()) {
-		AssessmentQuestion question = (AssessmentQuestion) iter.next();
-		// createRootTopic(toContent.getUid(),null,msg);
-	    }
-	}
     }
 
     public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException {
Index: lams_tool_assessment/web/pages/export/parts/exportlearner.jsp
===================================================================
diff -u -r65e3365a66b2977b268fafdd0b9fe2e5eae732a4 -rb6ddefd42c5660f90bd1da67f25e44d65ee21e30
--- lams_tool_assessment/web/pages/export/parts/exportlearner.jsp	(.../exportlearner.jsp)	(revision 65e3365a66b2977b268fafdd0b9fe2e5eae732a4)
+++ lams_tool_assessment/web/pages/export/parts/exportlearner.jsp	(.../exportlearner.jsp)	(revision b6ddefd42c5660f90bd1da67f25e44d65ee21e30)
@@ -40,7 +40,7 @@
 	  				   	],
 
 	  				   	multiselect: false,
-	  				   	caption: "${question.title}"
+	  				   	caption: "${question.titleEscaped}"
   						/*  resetSelection() doesn't work in this version
 						    hope it'll be fixed in the next one
 						    
Index: lams_tool_assessment/web/pages/export/parts/exportteacher.jsp
===================================================================
diff -u -r65e3365a66b2977b268fafdd0b9fe2e5eae732a4 -rb6ddefd42c5660f90bd1da67f25e44d65ee21e30
--- lams_tool_assessment/web/pages/export/parts/exportteacher.jsp	(.../exportteacher.jsp)	(revision 65e3365a66b2977b268fafdd0b9fe2e5eae732a4)
+++ lams_tool_assessment/web/pages/export/parts/exportteacher.jsp	(.../exportteacher.jsp)	(revision b6ddefd42c5660f90bd1da67f25e44d65ee21e30)
@@ -31,7 +31,7 @@
 	  				   	colNames:['#',
 	  							"<fmt:message key="label.monitoring.summary.user.name" />",
 	  				   	        <c:forEach var="question" items="${assessment.questions}">
-	  				   	     		"${question.title}", 
+	  				   	     		"${question.titleEscaped}", 
 	  				   	        </c:forEach>
 	  						    "<fmt:message key="label.monitoring.summary.total" />"],
 	  						    
Index: lams_tool_assessment/web/pages/export/parts/userresponse.jsp
===================================================================
diff -u -r0c7332f878ff51630f2c84a47f419abc832e022e -rb6ddefd42c5660f90bd1da67f25e44d65ee21e30
--- lams_tool_assessment/web/pages/export/parts/userresponse.jsp	(.../userresponse.jsp)	(revision 0c7332f878ff51630f2c84a47f419abc832e022e)
+++ lams_tool_assessment/web/pages/export/parts/userresponse.jsp	(.../userresponse.jsp)	(revision b6ddefd42c5660f90bd1da67f25e44d65ee21e30)
@@ -5,7 +5,7 @@
 							<c:forEach var="questionOption" items="${question.questionOptions}">
 								<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
 									<c:if test="${optionAnswer.answerBoolean && (optionAnswer.questionOptionUid == questionOption.uid)}">
-										responseStr += "${questionOption.optionString}";
+										responseStr += "${questionOption.optionStringEscaped}";
 									</c:if>
 								</c:forEach>					
 							</c:forEach>						
@@ -15,15 +15,15 @@
 								<c:forEach var="questionOption" items="${question.questionOptions}">
 									responseStr +='<tr>';
 										responseStr +='<td style="width:40%; background: none; padding: 0px; margin: 0px; border: none;">';
-											responseStr +="${questionOption.question}";
+											responseStr +="${questionOption.questionEscaped}";
 										responseStr +='</td>';
 										responseStr +='<td style="background: none; padding: 0px; margin: 0px; border: none; vertical-align: middle;">';
 											responseStr +='-'; 
 											<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
 												<c:if test="${questionOption.uid == optionAnswer.questionOptionUid}">
 													<c:forEach var="questionOption2" items="${question.questionOptions}">
 														<c:if test="${questionOption2.uid == optionAnswer.answerInt}">
-															responseStr +="${questionOption2.optionString}";
+															responseStr +="${questionOption2.optionStringEscaped}";
 														</c:if>
 													</c:forEach>
 												</c:if>
@@ -34,26 +34,26 @@
 							responseStr +='</table>';
 						</c:when>
 						<c:when test="${question.type == 3}">
-							responseStr +="${questionResult.answerString}";
+							responseStr +="${questionResult.answerStringEscaped}";
 						</c:when>
 						<c:when test="${question.type == 4}">
-							responseStr +="${questionResult.answerString}";
+							responseStr +="${questionResult.answerStringEscaped}";
 						</c:when>
 						<c:when test="${question.type == 5}">
 							<c:if test="${questionResult.answerString != null}">			
 								responseStr +="${questionResult.answerBoolean}";
 							</c:if>
 						</c:when>
 						<c:when test="${question.type == 6}">
-							responseStr +="${questionResult.answerString}";
+							responseStr +="${questionResult.answerStringEscaped}";
 						</c:when>
 						<c:when test="${question.type == 7}">
 							<c:forEach var="j" begin="0" end="${fn:length(questionResult.optionAnswers) - 1}" step="1">
 								<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
 									<c:if test="${optionAnswer.answerInt == j}">		
 										<c:forEach var="questionOption" items="${question.questionOptions}">
 											<c:if test="${optionAnswer.questionOptionUid == questionOption.uid}">
-												responseStr +="${questionOption.optionString}";
+												responseStr +="${questionOption.optionStringEscaped}";
 											</c:if>
 										</c:forEach>
 									</c:if>								
Index: lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp
===================================================================
diff -u -re61834875a93b3f72e0fc73ab384017c45d795fb -rb6ddefd42c5660f90bd1da67f25e44d65ee21e30
--- lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp	(.../masterDetailLoadUp.jsp)	(revision e61834875a93b3f72e0fc73ab384017c45d795fb)
+++ lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp	(.../masterDetailLoadUp.jsp)	(revision b6ddefd42c5660f90bd1da67f25e44d65ee21e30)
@@ -10,7 +10,7 @@
  	     		jQuery("#userSummary${assessmentResult.sessionId}").addRowData(${i.index + 1}, {
  	   	     		id:"${i.index + 1}",
  	   	   			questionResultUid:"${questionResult.uid}",
- 	   	   			title:"${questionResult.assessmentQuestion.title}",
+ 	   	   			title:"${questionResult.assessmentQuestion.titleEscaped}",
  	   	   			response:responseStr,
  	   	   			grade:"<fmt:formatNumber value='${questionResult.mark}' maxFractionDigits='3'/>"
  	   	   	    });	
Index: lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp
===================================================================
diff -u -r0c7332f878ff51630f2c84a47f419abc832e022e -rb6ddefd42c5660f90bd1da67f25e44d65ee21e30
--- lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp	(.../userresponse.jsp)	(revision 0c7332f878ff51630f2c84a47f419abc832e022e)
+++ lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp	(.../userresponse.jsp)	(revision b6ddefd42c5660f90bd1da67f25e44d65ee21e30)
@@ -5,7 +5,7 @@
 							<c:forEach var="questionOption" items="${question.questionOptions}">
 								<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
 									<c:if test="${optionAnswer.answerBoolean && (optionAnswer.questionOptionUid == questionOption.uid)}">
-										responseStr += "${questionOption.optionString}";
+										responseStr += "${questionOption.optionStringEscaped}";
 									</c:if>
 								</c:forEach>					
 							</c:forEach>						
@@ -14,15 +14,15 @@
 							<c:forEach var="questionOption" items="${question.questionOptions}">
 								responseStr +='<div>';
 									responseStr +='<div style="float: left;">';
-										responseStr +="${questionOption.question}";
+										responseStr +="${questionOption.questionEscaped}";
 									responseStr +='</div>';
 									responseStr +='<div style=" float: right; width: 50%;">';
 										responseStr +=' - '; 
 										<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
 											<c:if test="${questionOption.uid == optionAnswer.questionOptionUid}">
 												<c:forEach var="questionOption2" items="${question.questionOptions}">
 													<c:if test="${questionOption2.uid == optionAnswer.answerInt}">
-														responseStr +="${questionOption2.optionString}";
+														responseStr +="${questionOption2.optionStringEscaped}";
 													</c:if>
 												</c:forEach>
 											</c:if>
@@ -35,26 +35,26 @@
 
 						</c:when>
 						<c:when test="${question.type == 3}">
-							responseStr +="${questionResult.answerString}";
+							responseStr +="${questionResult.answerStringEscaped}";
 						</c:when>
 						<c:when test="${question.type == 4}">
-							responseStr +="${questionResult.answerString}";
+							responseStr +="${questionResult.answerStringEscaped}";
 						</c:when>
 						<c:when test="${question.type == 5}">
 							<c:if test="${questionResult.answerString != null}">			
 								responseStr +="${questionResult.answerBoolean}";
 							</c:if>
 						</c:when>
 						<c:when test="${question.type == 6}">
-							responseStr +="${questionResult.answerString}";
+							responseStr +="${questionResult.answerStringEscaped}";
 						</c:when>
 						<c:when test="${question.type == 7}">
 							<c:forEach var="j" begin="0" end="${fn:length(questionResult.optionAnswers) - 1}" step="1">
 								<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
 									<c:if test="${optionAnswer.answerInt == j}">		
 										<c:forEach var="questionOption" items="${question.questionOptions}">
 											<c:if test="${optionAnswer.questionOptionUid == questionOption.uid}">
-												responseStr +="${questionOption.optionString}";
+												responseStr +="${questionOption.optionStringEscaped}";
 											</c:if>
 										</c:forEach>
 									</c:if>								
Index: lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
===================================================================
diff -u -r92b9d466bd236638bc349bdce4dac6eaa01071eb -rb6ddefd42c5660f90bd1da67f25e44d65ee21e30
--- lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(.../usersummary.jsp)	(revision 92b9d466bd236638bc349bdce4dac6eaa01071eb)
+++ lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(.../usersummary.jsp)	(revision b6ddefd42c5660f90bd1da67f25e44d65ee21e30)
@@ -52,7 +52,7 @@
 	  				   	],
 	  				   	
 	  				   	multiselect: false,
-	  				   	caption: "${question.title}",
+	  				   	caption: "${question.titleEscaped}",
 	  				  	cellurl: '<c:url value="/monitoring/saveUserGrade.do?sessionMapID=${sessionMapID}"/>',
 	  				  	cellEdit: true,
 	  				  	beforeEditCell: function (rowid,name,val,iRow,iCol){