Index: lams_tool_assessment/web/common/taglibs.jsp
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -rcfd463431d2171b40403dcff2508408e72685c0e
--- lams_tool_assessment/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_assessment/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
@@ -5,5 +5,6 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <c:set var="ALPHABET" value="${fn:split('a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z', ',')}" scope="request"/>
 <c:set var="ALPHABET_CAPITAL_LETTERS" value="${fn:split('A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z', ',')}" scope="request"/>
Index: lams_tool_assessment/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r09cb8620b7ebc847ae6a700d11ba7c24435a279a -rcfd463431d2171b40403dcff2508408e72685c0e
--- lams_tool_assessment/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 09cb8620b7ebc847ae6a700d11ba7c24435a279a)
+++ lams_tool_assessment/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
@@ -32,7 +32,7 @@
         function validateForm() {
             //check with a teacher whether he forgot to add questions to the question bank
             var referenceCount = $("#referencesTable tr").length - 1;
-			if ((referenceCount == 0) && !confirm("<fmt:message key="label.no.questions.in.question.bank"/>")) {
+			if ((referenceCount == 0) && !confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.no.questions.in.question.bank'/></spring:escapeBody>")) {
 				return false;
 			}
 
Index: lams_tool_assessment/web/pages/authoring/basic.jsp
===================================================================
diff -u -r3de7373cb7edbe60031348d749768fd0a978d5b8 -rcfd463431d2171b40403dcff2508408e72685c0e
--- lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 3de7373cb7edbe60031348d749768fd0a978d5b8)
+++ lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
@@ -70,7 +70,7 @@
 
     	//handler for "delete" buttons
     	$(document).on("click", '.delete-reference-link', function() {
-    		var	deletionConfirmed = confirm("<fmt:message key="warning.msg.authoring.do.you.want.to.delete"></fmt:message>");
+    		var	deletionConfirmed = confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='warning.msg.authoring.do.you.want.to.delete'/></spring:escapeBody>");
 
     		if (deletionConfirmed) {
     			var sequenceId = $('.reference-sequence-id', $(this).parents('tr')).val();
@@ -185,7 +185,7 @@
 	function reinitializePassingMarkSelect(isPageFresh){
 		var oldValue = (isPageFresh) ? "${assessmentForm.assessment.passingMark}" : $("#passingMark").val();
 		$('#passingMark').empty();
-		$('#passingMark').append( new Option("<fmt:message key='label.authoring.advance.passing.mark.none' />",0) );
+		$('#passingMark').append( new Option("<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.advance.passing.mark.none' /></spring:escapeBody>",0) );
 		
 		var sumMaxMark = 0;
 		$("[name^=maxMark]").each(function() {
Index: lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
===================================================================
diff -u -r784731558fee35bec1bcb6ce76ecf352b5856db5 -rcfd463431d2171b40403dcff2508408e72685c0e
--- lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision 784731558fee35bec1bcb6ce76ecf352b5856db5)
+++ lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
@@ -18,7 +18,7 @@
 		
 	switch (qbQuestionModified) {
 		case <%= IQbService.QUESTION_MODIFIED_UPDATE %>: 
-			qbMessage = '<fmt:message key="message.qb.modified.update" />';
+			qbMessage = '<spring:escapeBody javaScriptEscape='true'><fmt:message key="message.qb.modified.update" /></spring:escapeBody>';
 			break;
 		case <%= IQbService.QUESTION_MODIFIED_VERSION_BUMP %>: 
 			let showMessage = true;
@@ -36,11 +36,11 @@
 			}
 	
 			if (showMessage) {
-				qbMessage = '<fmt:message key="message.qb.modified.version" />';
+				qbMessage = '<spring:escapeBody javaScriptEscape='true'><fmt:message key="message.qb.modified.version" /></spring:escapeBody>';
 			}
 			break;
 		case <%= IQbService.QUESTION_MODIFIED_ID_BUMP %>: 
-			qbMessage = '<fmt:message key="message.qb.modified.new" />';
+			qbMessage = '<spring:escapeBody javaScriptEscape='true'><fmt:message key="message.qb.modified.new" /></spring:escapeBody>';
 			break;
 	}
 	if (qbMessage) {
Index: lams_tool_assessment/web/pages/authoring/randomQuestion.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -rcfd463431d2171b40403dcff2508408e72685c0e
--- lams_tool_assessment/web/pages/authoring/randomQuestion.jsp	(.../randomQuestion.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_assessment/web/pages/authoring/randomQuestion.jsp	(.../randomQuestion.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
@@ -26,8 +26,8 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.tabcontroller.js"></script>
 	<script type="text/javascript">
-		const VALIDATION_ERROR_LABEL = "<fmt:message key='error.form.validation.error'/>";
-		const VALIDATION_ERRORS_LABEL = "<fmt:message key='error.form.validation.errors'><fmt:param >{errors_counter}</fmt:param></fmt:message>";
+		const VALIDATION_ERROR_LABEL = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.form.validation.error'/></spring:escapeBody>";
+		const VALIDATION_ERRORS_LABEL = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.form.validation.errors'><fmt:param >{errors_counter}</fmt:param></fmt:message></spring:escapeBody>";
 	</script>
 	<lams:JSImport src="includes/javascript/qb-question.js" />
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
@@ -114,7 +114,7 @@
 			    },
 			   	colNames:[
 				   	'questionUid',
-					'<fmt:message key="label.authoring.basic.list.header.question"/>',
+					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.authoring.basic.list.header.question"/></spring:escapeBody>',
 					'questionDescription'
 				],
 			   	colModel:[
@@ -133,7 +133,7 @@
 			    loadError: function(xhr,textStatus,errorThrown) {
 			    	$("#questions-grid").clearGridData();
 			    	//display warning message
-			    	$(this).jqGrid("displayErrorMessage", "<fmt:message key="error.loaderror"/>");
+			    	$(this).jqGrid("displayErrorMessage", "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.loaderror'/></spring:escapeBody>");
 			    }
 			})
 			.navGrid("#questions-grid-pager", {edit:false,add:false,del:false,search:false});	
@@ -226,4 +226,4 @@
       	</div>
     </footer>
 </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -r88aed13531804313250bc33b09743ed763b2824e -rcfd463431d2171b40403dcff2508408e72685c0e
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 88aed13531804313250bc33b09743ed763b2824e)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
@@ -305,14 +305,14 @@
 				},
 				<c:if test="${hasEditRight && (mode != 'teacher')}">
 					onExpiry: function(periods) {
-				        $.blockUI({ message: '<h1 id="timelimit-expired"><i class="fa fa-refresh fa-spin fa-1x fa-fw"></i> <fmt:message key="label.learning.blockui.time.is.over" /></h1>' }); 
+				        $.blockUI({ message: '<h1 id="timelimit-expired"><i class="fa fa-refresh fa-spin fa-1x fa-fw"></i> <spring:escapeBody javaScriptEscape="true"><fmt:message key="label.learning.blockui.time.is.over" /></spring:escapeBody></h1>' }); 
 				        
 				        setTimeout(function() { 
 				        	submitAll(true);
 				        }, 4000); 
 					},
 				</c:if>
-				description: "<div id='countdown-label'><fmt:message key='label.learning.countdown.time.left' /></div>"
+				description: "<div id='countdown-label'><spring:escapeBody javaScriptEscape='true'><fmt:message key='label.learning.countdown.time.left' /></spring:escapeBody></div>"
 			});
 		}
 			
@@ -359,7 +359,7 @@
 			            }
 			            
 		                $.jGrowl(
-		                	"<i class='fa fa-lg fa-floppy-o'></i> <fmt:message key="label.learning.draft.autosaved" />",
+		                	"<i class='fa fa-lg fa-floppy-o'></i> <spring:escapeBody javaScriptEscape='true'><fmt:message key='label.learning.draft.autosaved' /></spring:escapeBody>",
 		                	{ life: 2000, closeTemplate: '' }
 		                );
 	                },
@@ -369,7 +369,7 @@
 			window.setInterval(learnerAutosave, autosaveInterval);
 
 			function onLearnerAutosaveError() {
-				alert('<fmt:message key="label.learning.draft.autosave.error" />');
+				alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.learning.draft.autosave.error" /></spring:escapeBody>');
 				location.reload();
 			}
 		</c:if>
@@ -562,7 +562,7 @@
 			} else {
 				<c:if test="${mode == 'author'}">
 					if (!skipValidation) {
-						alert('<fmt:message key="label.authoring.preview.skip.validation" />');
+						alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.authoring.preview.skip.validation" /></spring:escapeBody>');
 						skipValidation = true;
 					} else {
 						return true;
Index: lams_tool_assessment/web/pages/learning/results/allquestions.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -rcfd463431d2171b40403dcff2508408e72685c0e
--- lams_tool_assessment/web/pages/learning/results/allquestions.jsp	(.../allquestions.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_assessment/web/pages/learning/results/allquestions.jsp	(.../allquestions.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
@@ -59,15 +59,15 @@
 	var pathToImageFolder = "${lams}images/css/",
 	
 	//vars for rating.js
-		AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
-		YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
+		AVG_RATING_LABEL = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message></spring:escapeBody>',
+		YOUR_RATING_LABEL = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message></spring:escapeBody>',
 		COMMENTS_MIN_WORDS_LIMIT = 0,
 		MAX_RATES = 0,
 		MIN_RATES = 0,
 		LAMS_URL = '${lams}',
 		COUNT_RATED_ITEMS = true,
-		COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip"/>',
-		WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="error.resource.image.comment.blank"/>',
+		COMMENT_TEXTAREA_TIP_LABEL = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.comment.textarea.tip"/></spring:escapeBody>',
+		WARN_COMMENTS_IS_BLANK_LABEL = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.resource.image.comment.blank"/></spring:escapeBody>',
 		ALLOW_RERATE = false;
 	<%-- Do not allow rating if it is a teacher view --%>
 	<c:if test="${not empty toolSessionID}">
Index: lams_tool_assessment/web/pages/learning/results/allquestions5.jsp
===================================================================
diff -u -r8486267e084a39a57c6e684dfdf618ffbb2d0217 -rcfd463431d2171b40403dcff2508408e72685c0e
--- lams_tool_assessment/web/pages/learning/results/allquestions5.jsp	(.../allquestions5.jsp)	(revision 8486267e084a39a57c6e684dfdf618ffbb2d0217)
+++ lams_tool_assessment/web/pages/learning/results/allquestions5.jsp	(.../allquestions5.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
@@ -56,15 +56,15 @@
 	var pathToImageFolder = "${lams}images/css/",
 	
 	//vars for rating.js
-		AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
-		YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
+		AVG_RATING_LABEL = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message></spring:escapeBody>',
+		YOUR_RATING_LABEL = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message></spring:escapeBody>',
 		COMMENTS_MIN_WORDS_LIMIT = 0,
 		MAX_RATES = 0,
 		MIN_RATES = 0,
 		LAMS_URL = '${lams}',
 		COUNT_RATED_ITEMS = true,
-		COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip"/>',
-		WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="error.resource.image.comment.blank"/>',
+		COMMENT_TEXTAREA_TIP_LABEL = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.comment.textarea.tip"/></spring:escapeBody>',
+		WARN_COMMENTS_IS_BLANK_LABEL = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.resource.image.comment.blank"/></spring:escapeBody>',
 		ALLOW_RERATE = false;
 	<%-- Do not allow rating if it is a teacher view --%>
 	<c:if test="${not empty toolSessionID}">
Index: lams_tool_assessment/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -rcfd463431d2171b40403dcff2508408e72685c0e
--- lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
@@ -47,24 +47,15 @@
 			var LAMS_URL    = '<lams:LAMSURL />',
 				WEB_APP_URL = '<lams:WebAppURL />',
 				LABELS = {
-					<fmt:message key="label.monitoring.summary.completion" var="ACTIVITY_COMPLETION_CHART_TITLE_VAR"/>
-					ACTIVITY_COMPLETION_CHART_TITLE : '<c:out value="${ACTIVITY_COMPLETION_CHART_TITLE_VAR}" />',
-					<fmt:message key="label.monitoring.summary.completion.possible" var="ACTIVITY_COMPLETION_CHART_POSSIBLE_LEARNERS_VAR"/>
-					ACTIVITY_COMPLETION_CHART_POSSIBLE_LEARNERS : '<c:out value="${ACTIVITY_COMPLETION_CHART_POSSIBLE_LEARNERS_VAR}" />',
-					<fmt:message key="label.monitoring.summary.completion.started" var="ACTIVITY_COMPLETION_CHART_STARTED_LEARNERS_VAR"/>
-					ACTIVITY_COMPLETION_CHART_STARTED_LEARNERS : '<c:out value="${ACTIVITY_COMPLETION_CHART_STARTED_LEARNERS_VAR}" />',	
-					<fmt:message key="label.monitoring.summary.completion.completed" var="ACTIVITY_COMPLETION_CHART_COMPLETED_LEARNERS_VAR"/>
-					ACTIVITY_COMPLETION_CHART_COMPLETED_LEARNERS : '<c:out value="${ACTIVITY_COMPLETION_CHART_COMPLETED_LEARNERS_VAR}" />',	
-					<fmt:message key="label.monitoring.summary.answered.questions" var="ANSWERED_QUESTIONS_CHART_TITLE_VAR"/>
-					ANSWERED_QUESTIONS_CHART_TITLE : '<c:out value="${ANSWERED_QUESTIONS_CHART_TITLE_VAR}" />',
-					<fmt:message key="label.monitoring.summary.answered.questions.groups" var="ANSWERED_QUESTIONS_CHART_TITLE_GROUPS_VAR"/>
-					ANSWERED_QUESTIONS_CHART_TITLE_GROUPS : '<c:out value="${ANSWERED_QUESTIONS_CHART_TITLE_GROUPS_VAR}" />',
-					<fmt:message key="label.monitoring.summary.answered.questions.x.axis" var="ANSWERED_QUESTIONS_CHART_X_AXIS_VAR"/>
-					ANSWERED_QUESTIONS_CHART_X_AXIS : '<c:out value="${ANSWERED_QUESTIONS_CHART_X_AXIS_VAR}" />',
-					<fmt:message key="label.monitoring.summary.answered.questions.y.axis.students" var="ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS_VAR"/>
-					ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS : '<c:out value="${ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS_VAR}" />',
-					<fmt:message key="label.monitoring.summary.answered.questions.y.axis.groups" var="ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS_VAR"/>
-					ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS : '<c:out value="${ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS_VAR}" />'
+					ACTIVITY_COMPLETION_CHART_TITLE : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.completion"/></spring:escapeBody>',
+					ACTIVITY_COMPLETION_CHART_POSSIBLE_LEARNERS : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.completion.possible"/></spring:escapeBody>',
+					ACTIVITY_COMPLETION_CHART_STARTED_LEARNERS : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.completion.started"/></spring:escapeBody>',
+					ACTIVITY_COMPLETION_CHART_COMPLETED_LEARNERS : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.completion.completed"/></spring:escapeBody>',
+					ANSWERED_QUESTIONS_CHART_TITLE : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.answered.questions"/></spring:escapeBody>',
+					ANSWERED_QUESTIONS_CHART_TITLE_GROUPS : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.answered.questions.groups"/></spring:escapeBody>',
+					ANSWERED_QUESTIONS_CHART_X_AXIS : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.answered.questions.x.axis"/></spring:escapeBody>',
+					ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.answered.questions.y.axis.students"/></spring:escapeBody>',
+					ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.answered.questions.y.axis.groups"/></spring:escapeBody>'
 				},
 				// pass settings to monitorToolSummaryAdvanced.js
 			    submissionDeadlineSettings = {
@@ -73,18 +64,18 @@
 					submissionDateString: '${submissionDateString}',
 					setSubmissionDeadlineUrl: '<c:url value="/monitoring/setSubmissionDeadline.do"/>?<csrf:token/>',
 					toolContentID: '<c:out value="${param.toolContentID}" />',
-					messageNotification: '<fmt:message key="monitor.summary.notification" />',
-					messageRestrictionSet: '<fmt:message key="monitor.summary.date.restriction.set" />',
-					messageRestrictionRemoved: '<fmt:message key="monitor.summary.date.restriction.removed" />'
+					messageNotification: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="monitor.summary.notification" /></spring:escapeBody>',
+					messageRestrictionSet: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="monitor.summary.date.restriction.set" /></spring:escapeBody>',
+					messageRestrictionRemoved: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="monitor.summary.date.restriction.removed" /></spring:escapeBody>'
 				},
 				confidenceLevelsSettings = {
 					type: "${assessment.confidenceLevelsType}",
-					LABEL_NOT_CONFIDENT : '<fmt:message key="label.not.confident" />',
-					LABEL_CONFIDENT : '<fmt:message key="label.confident" />',
-					LABEL_VERY_CONFIDENT : '<fmt:message key="label.very.confident" />',
-					LABEL_NOT_SURE : '<fmt:message key="label.not.sure" />',
-					LABEL_SURE : '<fmt:message key="label.sure" />',
-					LABEL_VERY_SURE : '<fmt:message key="label.very.sure" />'
+					LABEL_NOT_CONFIDENT: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.not.confident" /></spring:escapeBody>',
+					LABEL_CONFIDENT: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.confident" /></spring:escapeBody>',
+					LABEL_VERY_CONFIDENT: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.very.confident" /></spring:escapeBody>',
+					LABEL_NOT_SURE: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.not.sure" /></spring:escapeBody>',
+					LABEL_SURE: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.sure" /></spring:escapeBody>',
+					LABEL_VERY_SURE: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.very.sure" /></spring:escapeBody>'
 				};
 		</script>
 		<lams:JSImport src="includes/javascript/common.js" />
Index: lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers.jsp
===================================================================
diff -u -r0dc7053a22593e90f9609deb45da9ceb202f496a -rcfd463431d2171b40403dcff2508408e72685c0e
--- lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers.jsp	(.../discloseAnswers.jsp)	(revision 0dc7053a22593e90f9609deb45da9ceb202f496a)
+++ lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers.jsp	(.../discloseAnswers.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
@@ -24,15 +24,15 @@
 				
 				
 				button.click(function(event) {	
-					if (!confirm(isCorrectButton ? "<fmt:message key='message.disclose.correct.answers' />"
-												: "<fmt:message key='message.disclose.groups.answers' />")) {
+					if (!confirm(isCorrectButton ? "<spring:escapeBody javaScriptEscape='true'><fmt:message key='message.disclose.correct.answers' /></spring:escapeBody>"
+												: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='message.disclose.groups.answers' /></spring:escapeBody>")) {
 						return;
 					}
 		
 					// check if correct answers are disclosed before groups' answers
 					if (isCorrectButton &&
 						!button.closest('.disclose-button-group').find('.disclose-groups-button').is('[disabled]') &&
-						!confirm("<fmt:message key='message.disclose.correct.before.groups.answers' />")) {
+						!confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='message.disclose.correct.before.groups.answers' /></spring:escapeBody>")) {
 						return;
 					}
 					
@@ -47,13 +47,13 @@
 				// do not add a handler twice
 				if (!isRefresh) {
 					allCorrectButton.click(function(){
-						if (!confirm("<fmt:message key='message.disclose.all.correct.answers' />")) {
+						if (!confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='message.disclose.all.correct.answers' /></spring:escapeBody>")) {
 							return;
 						}
 		
 						// check if correct answers are disclosed before groups' answers
 						if (!$('.disclose-all-groups-button', assessmentQuestionsPane).is('[disabled]') &&
-							!confirm("<fmt:message key='message.disclose.correct.before.groups.answers' />")) {
+							!confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='message.disclose.correct.before.groups.answers' /></spring:escapeBody>")) {
 							return;
 						}
 						
@@ -75,7 +75,7 @@
 				// do not add a handler twice
 				if (!isRefresh) {
 					allGroupsButton.click(function(){
-						if (!confirm("<fmt:message key='message.disclose.all.groups.answers' />")) {
+						if (!confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='message.disclose.all.groups.answers' /></spring:escapeBody>")) {
 							return;
 						}
 		
Index: lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers5.jsp
===================================================================
diff -u -r35dd47046a83ab2f9e80f76dc22d1521412219b5 -rcfd463431d2171b40403dcff2508408e72685c0e
--- lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers5.jsp	(.../discloseAnswers5.jsp)	(revision 35dd47046a83ab2f9e80f76dc22d1521412219b5)
+++ lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers5.jsp	(.../discloseAnswers5.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
@@ -24,12 +24,12 @@
 				
 				
 				button.click(function(event) {	
-					showConfirm(isCorrectButton ? "<fmt:message key='message.disclose.correct.answers' />"
-								: "<fmt:message key='message.disclose.groups.answers' />", function(){
+					showConfirm(isCorrectButton ? "<spring:escapeBody javaScriptEscape='true'><fmt:message key='message.disclose.correct.answers' /></spring:escapeBody>"
+								: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='message.disclose.groups.answers' /></spring:escapeBody>", function(){
 						// check if correct answers are disclosed before groups' answers
 						if (isCorrectButton &&
 							!button.closest('.disclose-button-group').find('.disclose-groups-button').is('[disabled]')) {
-								showConfirm("<fmt:message key='message.disclose.correct.before.groups.answers' />", function(){
+								showConfirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='message.disclose.correct.before.groups.answers' /></spring:escapeBody>", function(){
 									discloseAnswers(button, resultsPane, true);
 								});
 						} else {
@@ -46,7 +46,7 @@
 				// do not add a handler twice
 				if (!isRefresh) {
 					allCorrectButton.click(function(){
-						showConfirm("<fmt:message key='message.disclose.all.correct.answers' />", function(){
+						showConfirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='message.disclose.all.correct.answers' /></spring:escapeBody>", function(){
 							// check if correct answers are disclosed before groups' answers
 							let discloseFunction = function(){
 								let nonDisclosedQuestions = $('.disclose-correct-button', assessmentQuestionsPane).not('[disabled]'),
@@ -59,7 +59,7 @@
 							};
 							
 							if (!$('.disclose-all-groups-button', assessmentQuestionsPane).is('[disabled]')) {
-								showConfirm("<fmt:message key='message.disclose.correct.before.groups.answers' />", discloseFunction);
+								showConfirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='message.disclose.correct.before.groups.answers' /></spring:escapeBody>", discloseFunction);
 								return;
 							}
 							
@@ -76,7 +76,7 @@
 				// do not add a handler twice
 				if (!isRefresh) {
 					allGroupsButton.click(function(){
-						showConfirm("<fmt:message key='message.disclose.all.groups.answers' />", function(){
+						showConfirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='message.disclose.all.groups.answers' /></spring:escapeBody>", function(){
 							let nonDisclosedQuestions = $('.disclose-groups-button', assessmentQuestionsPane).not('[disabled]'),
 			    				lastQuestionUid = nonDisclosedQuestions.last().closest('.disclose-button-group').attr('questionUid');
 							nonDisclosedQuestions.each(function() {
Index: lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp
===================================================================
diff -u -r0586f1081f3b7e5b550da93b64463175ea698c28 -rcfd463431d2171b40403dcff2508408e72685c0e
--- lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp	(.../masterDetailLoadUp.jsp)	(revision 0586f1081f3b7e5b550da93b64463175ea698c28)
+++ lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp	(.../masterDetailLoadUp.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
@@ -36,7 +36,7 @@
 	 	 	    marker : 
 		 	 	 <c:choose>
 	 	 	    	<c:when test="${requiresMarking}">
-		 	    		("<b><fmt:message key='label.monitoring.user.summary.grade.required' /></b>")
+		 	    		("<b><spring:escapeBody javaScriptEscape='true'><fmt:message key='label.monitoring.user.summary.grade.required' /></spring:escapeBody></b>")
 		 	    	</c:when>
 		 	    	<c:when test="${not empty questionResult.markedBy}">
 		 	  			"<c:out value='${questionResult.markedBy.fullName}' />"
Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -rcfd463431d2171b40403dcff2508408e72685c0e
--- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
@@ -36,12 +36,12 @@
 			// pass settings to jquery.jqGrid.confidence-level-formattter.js
 			var confidenceLevelsSettings = {
 				type: "${assessment.confidenceLevelsType}",
-				LABEL_NOT_CONFIDENT : '<fmt:message key="label.not.confident" />',
-				LABEL_CONFIDENT : '<fmt:message key="label.confident" />',
-				LABEL_VERY_CONFIDENT : '<fmt:message key="label.very.confident" />',
-				LABEL_NOT_SURE : '<fmt:message key="label.not.sure" />',
-				LABEL_SURE : '<fmt:message key="label.sure" />',
-				LABEL_VERY_SURE : '<fmt:message key="label.very.sure" />'
+				LABEL_NOT_CONFIDENT : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.not.confident" /></spring:escapeBody>',
+				LABEL_CONFIDENT : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.confident" /></spring:escapeBody>',
+				LABEL_VERY_CONFIDENT : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.very.confident" /></spring:escapeBody>',
+				LABEL_NOT_SURE : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.not.sure" /></spring:escapeBody>',
+				LABEL_SURE : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.sure" /></spring:escapeBody>',
+				LABEL_VERY_SURE : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.very.sure" /></spring:escapeBody>'
 			};
 			
 			//var for jquery.jRating.js
@@ -102,17 +102,17 @@
 	  				   	colNames:[
 		  				   	'questionResultUid',
 	  				   	    'maxMark',
-	  		  				"<fmt:message key="label.monitoring.summary.user.name" />",
-		  			   		"<fmt:message key="label.monitoring.user.summary.response" />",
+	  		  				"<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.monitoring.summary.user.name" /></spring:escapeBody>",
+		  			   		"<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.monitoring.user.summary.response" /></spring:escapeBody>",
 		  			   		<c:if test="${assessment.enableConfidenceLevels and questionDto.type != 8}">
-		  			   			"<fmt:message key="label.confidence" />",
+		  			   			"<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.confidence" /></spring:escapeBody>",
 		  			  		</c:if>
 			  			   	<c:if test="${questionDto.groupsAnswersDisclosed}">
-		  			   			"<fmt:message key="label.answer.rating.title" />",
+		  			   			"<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.answer.rating.title" /></spring:escapeBody>",
 		  			  		</c:if>
-		  		  			"<fmt:message key="label.monitoring.user.summary.grade" />",
-		  					"<fmt:message key="label.monitoring.user.summary.marker" />",
-		  					"<fmt:message key="label.monitoring.user.summary.marker.comment" />",
+		  		  			"<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.monitoring.user.summary.grade" /></spring:escapeBody>",
+		  					"<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.monitoring.user.summary.marker" /></spring:escapeBody>",
+		  					"<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.monitoring.user.summary.marker.comment" /></spring:escapeBody>",
 		  			   		'userId',
 	  						'portraitId'
 	  					],
@@ -237,9 +237,9 @@
   									iconSet: 'fontAwesome',
   									colNames:[
   										'ratingId',
-  				  		  				'<fmt:message key="label.comment.name" />',
-  				  		  				'<fmt:message key="label.rating" />',
-  				  		  				'<fmt:message key="label.comment" />',
+  				  		  				'<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.comment.name" /></spring:escapeBody>',
+  				  		  				'<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.rating" /></spring:escapeBody>',
+  				  		  				'<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.comment" /></spring:escapeBody>',
   				  		  				'userId',
   				  		  				'portraitId'
   										],
Index: lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp
===================================================================
diff -u -r3b83454706f152d81a25b6c08444ceb3ce964638 -rcfd463431d2171b40403dcff2508408e72685c0e
--- lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp	(.../userresponse.jsp)	(revision 3b83454706f152d81a25b6c08444ceb3ce964638)
+++ lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp	(.../userresponse.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
@@ -92,6 +92,6 @@
 </c:choose>
 
 <c:if test="${not empty questionResult.justification}">
-	responseStr += '<br><br><i><fmt:message key="label.answer.justification" /></i><br>';
+	responseStr += '<br><br><i><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.answer.justification" /></spring:escapeBody></i><br>';
 	responseStr += "${questionResult.justificationEscaped}"
 </c:if>
Index: lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
===================================================================
diff -u -r1dbecfa7a6a96832fa3c1578a4ac977b424a2b9d -rcfd463431d2171b40403dcff2508408e72685c0e
--- lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(.../usersummary.jsp)	(revision 1dbecfa7a6a96832fa3c1578a4ac977b424a2b9d)
+++ lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(.../usersummary.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
@@ -37,12 +37,12 @@
 			// pass settings to jquery.jqGrid.confidence-level-formattter.js
 			var confidenceLevelsSettings = {
 				type: "${assessment.confidenceLevelsType}",
-				LABEL_NOT_CONFIDENT : '<fmt:message key="label.not.confident" />',
-				LABEL_CONFIDENT : '<fmt:message key="label.confident" />',
-				LABEL_VERY_CONFIDENT : '<fmt:message key="label.very.confident" />',
-				LABEL_NOT_SURE : '<fmt:message key="label.not.sure" />',
-				LABEL_SURE : '<fmt:message key="label.sure" />',
-				LABEL_VERY_SURE : '<fmt:message key="label.very.sure" />'
+				LABEL_NOT_CONFIDENT : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.not.confident" /></spring:escapeBody>',
+				LABEL_CONFIDENT : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.confident" /></spring:escapeBody>',
+				LABEL_VERY_CONFIDENT : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.very.confident" /></spring:escapeBody>',
+				LABEL_NOT_SURE : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.not.sure" /></spring:escapeBody>',
+				LABEL_SURE : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.sure" /></spring:escapeBody>',
+				LABEL_VERY_SURE : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.very.sure" /></spring:escapeBody>'
 			};
 		</script>
 		<script type="text/javascript" src="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
@@ -84,16 +84,16 @@
 	  					guiStyle: "bootstrap",
 	  					iconSet: 'fontAwesome',
 	  				   	colNames:[
-		  				   	"<fmt:message key="label.monitoring.user.summary.attempt" />",
+		  				   	"<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.monitoring.user.summary.attempt" /></spring:escapeBody>",
 	  						'questionResultUid',
-	  						"<fmt:message key="label.monitoring.user.summary.time" />",
-	  						"<fmt:message key="label.monitoring.user.summary.response" />",
+	  						"<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.monitoring.user.summary.time" /></spring:escapeBody>",
+	  						"<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.monitoring.user.summary.response" /></spring:escapeBody>",
 	  						<c:if test="${assessment.enableConfidenceLevels and question.type != 8}">
-	  							"<fmt:message key="label.confidence" />",
+	  							"<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.confidence' /></spring:escapeBody>",
 	  						</c:if>
-	  						"<fmt:message key="label.monitoring.user.summary.grade" />",
-	  	  					"<fmt:message key="label.monitoring.user.summary.marker" />",
-	  	  					"<fmt:message key="label.monitoring.user.summary.marker.comment" />"
+	  						"<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.monitoring.user.summary.grade" /></spring:escapeBody>",
+	  	  					"<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.monitoring.user.summary.marker" /></spring:escapeBody>",
+	  	  					"<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.monitoring.user.summary.marker.comment" /></spring:escapeBody>"
 	  					],  
 	  				   	colModel:[
 	  				   		{name:'id', index:'id', width:52, sorttype:"int"},
Index: lams_tool_assessment/web/pages/monitoring/statisticpart.jsp
===================================================================
diff -u -rb8506f4514d358dea8c01475dd2d2acef0909843 -rcfd463431d2171b40403dcff2508408e72685c0e
--- lams_tool_assessment/web/pages/monitoring/statisticpart.jsp	(.../statisticpart.jsp)	(revision b8506f4514d358dea8c01475dd2d2acef0909843)
+++ lams_tool_assessment/web/pages/monitoring/statisticpart.jsp	(.../statisticpart.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
@@ -11,7 +11,7 @@
 		$('#activity-evaluation').on('focus', function(){
 			$(this).data('previousValue', this.value);
 		}).on('change', function() {
-			if (!this.value && !confirm("<fmt:message key='warn.tool.output.change.none'/>")) {
+			if (!this.value && !confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='warn.tool.output.change.none'/></spring:escapeBody>")) {
 				$(this).val($(this).data('previousValue'));
 				return;
 			}
@@ -26,11 +26,11 @@
 				method: 'post',
 				success: function (json) {
 					if (json.success == "true") {
-						alert("<fmt:message key='label.tool.output.has.been.changed'/>");
+						alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.tool.output.has.been.changed'/></spring:escapeBody>");
 					}
 				},
 				error: function (xhr, ajaxOptions, thrownError) {
-					alert("<fmt:message key='label.operation.failed'/>");
+					alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.operation.failed'/></spring:escapeBody>");
 				}
 			});
 			
@@ -42,17 +42,17 @@
 		<c:when test="${sessionMap.assessment.useSelectLeaderToolOuput}">	
 			drawHistogram('chartDivLeader${sessionMap.toolContentID}', 
 					'<c:url value="/monitoring/getMarkChartData.do?sessionMapID=${sessionMapID}"/>', 
-					'<fmt:message key="label.marks"/>', '<fmt:message key="label.number.groups.in.mark.range"/>');
+					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.marks"/></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.number.groups.in.mark.range"/></spring:escapeBody>');
 		</c:when>
 		<c:otherwise>
 			drawHistogram('chartDivActivity${sessionMap.toolContentID}', 
 				'<c:url value="/monitoring/getMarkChartData.do?sessionMapID=${sessionMapID}"/>', 
-				'<fmt:message key="label.marks"/>', '<fmt:message key="label.number.learners.in.mark.range"/>');
+				'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.marks"/></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.number.learners.in.mark.range"/></spring:escapeBody>');
 			
 			<c:forEach var="sessionDto" items="${sessionDtos}">
 			drawHistogram('chartDivSession${sessionDto.sessionId}', 
 					'<c:url value="/monitoring/getMarkChartData.do?sessionMapID=${sessionMapID}&toolSessionID=${sessionDto.sessionId}"/>', 
-					'<fmt:message key="label.marks"/>', '<fmt:message key="label.number.learners.in.mark.range"/>');
+					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.marks"/></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.number.learners.in.mark.range"/></spring:escapeBody>');
 			</c:forEach>	
 		</c:otherwise>
 		</c:choose>
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r0083f3733489a25a89db5cfa6810303c015acd8f -rcfd463431d2171b40403dcff2508408e72685c0e
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 0083f3733489a25a89db5cfa6810303c015acd8f)
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
@@ -81,8 +81,8 @@
 		   	colNames:[
 			   	'userId',
 				'sessionId',
-				"<fmt:message key="label.monitoring.summary.user.name" />",
-				"<fmt:message key="label.monitoring.summary.total" />",
+				'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.user.name" /></spring:escapeBody>',
+				'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.total" /></spring:escapeBody>',
 				'portraitId'
 			],
 		   	colModel:[
@@ -123,7 +123,7 @@
 		    loadError: function(xhr,st,err) {
 		    	var sessionId = $(this).data('sessionId');
 		    	jQuery("#list" + sessionId).clearGridData();
-		    	$.jgrid.info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="error.loaderror"/>", "<fmt:message key="label.ok"/>");
+		    	$.jgrid.info_dialog("<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.error"/></spring:escapeBody>", "<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.loaderror"/></spring:escapeBody>", "<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.ok"/></spring:escapeBody>");
 		    },
 		    loadComplete: function () {
 		   	 	initializePortraitPopover('<lams:LAMSURL/>');
@@ -147,18 +147,18 @@
 			shrinkToFit: false,
 			guiStyle: "bootstrap",
 			iconSet: 'fontAwesome',
-		   	colNames:[
-			   	'#',
+			colNames: [
+				'#',
 				'questionResultUid',
-					"<fmt:message key="label.monitoring.question.summary.question" />",
-  					"<fmt:message key="label.monitoring.user.summary.response" />",
-					<c:if test="${sessionMap.assessment.enableConfidenceLevels}">
-						"<fmt:message key="label.confidence" />",
-					</c:if>
-  					"<fmt:message key="label.authoring.basic.list.header.mark" />",
-  					"<fmt:message key="label.monitoring.user.summary.marker" />",
-  					"<fmt:message key="label.monitoring.user.summary.marker.comment" />"
-				],
+				'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.question.summary.question" /></spring:escapeBody>',
+				'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.user.summary.response" /></spring:escapeBody>',
+				<c:if test="${sessionMap.assessment.enableConfidenceLevels}">
+					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.confidence" /></spring:escapeBody>',
+				</c:if>
+				'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.authoring.basic.list.header.mark" /></spring:escapeBody>',
+				'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.user.summary.marker" /></spring:escapeBody>',
+				'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.user.summary.marker.comment" /></spring:escapeBody>'
+			],
 		   	colModel:[
   			   	{name:'id', index:'id', width:20, sorttype:"int"},
   			   	{name:'questionResultUid', index:'questionResultUid', width:0, hidden: true},
@@ -255,7 +255,7 @@
 
 	function exportSummary() {
 		var url = "<c:url value='/monitoring/exportSummary.do'/>?<csrf:token/>&sessionMapID=${sessionMapID}&reqID="+(new Date()).getTime();
-		return downloadFile(url, 'messageArea_Busy', '<fmt:message key="label.summary.downloaded"/>', 'messageArea', 'btn-disable-on-submit');
+		return downloadFile(url, 'messageArea_Busy', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.summary.downloaded"/></spring:escapeBody>', 'messageArea', 'btn-disable-on-submit');
 	};
 	
 	function showChangeLeaderModal(toolSessionId) {
@@ -277,16 +277,16 @@
     				'<csrf:tokenname/>' : '<csrf:tokenvalue/>'
     			},
     			success : function(){
-    				alert("<fmt:message key='label.monitoring.leader.successfully.changed'/>");
+    				alert("<spring:escapeBody javaScriptEscape="true"><fmt:message key='label.monitoring.leader.successfully.changed'/></spring:escapeBody>");
     				location.reload();
     			},
     			error : function(){
-    				alert("<fmt:message key='label.monitoring.leader.not.changed'/>");
+    				alert("<spring:escapeBody javaScriptEscape="true"><fmt:message key='label.monitoring.leader.not.changed'/></spring:escapeBody>");
         		}
             });
         	
 		} else {
-			alert("<fmt:message key='label.monitoring.leader.not.changed'/>");
+			alert("<spring:escapeBody javaScriptEscape="true"><fmt:message key='label.monitoring.leader.not.changed'/></spring:escapeBody>");
 		}
 	}
 	
Index: lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp
===================================================================
diff -u -reccd6838790a4369b6788e48fb5ae5851622fe35 -rcfd463431d2171b40403dcff2508408e72685c0e
--- lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp	(.../assessmentStudentChoices.jsp)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
+++ lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp	(.../assessmentStudentChoices.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
@@ -14,24 +14,15 @@
 	var WEB_APP_URL = '<lams:WebAppURL />',
 	
 	LABELS = $.extend(LABELS, {
-		<fmt:message key="label.monitoring.summary.completion" var="ACTIVITY_COMPLETION_CHART_TITLE_VAR"/>
-		ACTIVITY_COMPLETION_CHART_TITLE : '<c:out value="${ACTIVITY_COMPLETION_CHART_TITLE_VAR}" />',
-		<fmt:message key="label.monitoring.summary.completion.possible" var="ACTIVITY_COMPLETION_CHART_POSSIBLE_LEARNERS_VAR"/>
-		ACTIVITY_COMPLETION_CHART_POSSIBLE_LEARNERS : '<c:out value="${ACTIVITY_COMPLETION_CHART_POSSIBLE_LEARNERS_VAR}" />',
-		<fmt:message key="label.monitoring.summary.completion.started" var="ACTIVITY_COMPLETION_CHART_STARTED_LEARNERS_VAR"/>
-		ACTIVITY_COMPLETION_CHART_STARTED_LEARNERS : '<c:out value="${ACTIVITY_COMPLETION_CHART_STARTED_LEARNERS_VAR}" />',	
-		<fmt:message key="label.monitoring.summary.completion.completed" var="ACTIVITY_COMPLETION_CHART_COMPLETED_LEARNERS_VAR"/>
-		ACTIVITY_COMPLETION_CHART_COMPLETED_LEARNERS : '<c:out value="${ACTIVITY_COMPLETION_CHART_COMPLETED_LEARNERS_VAR}" />',	
-		<fmt:message key="label.monitoring.summary.answered.questions" var="ANSWERED_QUESTIONS_CHART_TITLE_VAR"/>
-		ANSWERED_QUESTIONS_CHART_TITLE : '<c:out value="${ANSWERED_QUESTIONS_CHART_TITLE_VAR}" />',
-		<fmt:message key="label.monitoring.summary.answered.questions.groups" var="ANSWERED_QUESTIONS_CHART_TITLE_GROUPS_VAR"/>
-		ANSWERED_QUESTIONS_CHART_TITLE_GROUPS : '<c:out value="${ANSWERED_QUESTIONS_CHART_TITLE_GROUPS_VAR}" />',
-		<fmt:message key="label.monitoring.summary.answered.questions.x.axis" var="ANSWERED_QUESTIONS_CHART_X_AXIS_VAR"/>
-		ANSWERED_QUESTIONS_CHART_X_AXIS : '<c:out value="${ANSWERED_QUESTIONS_CHART_X_AXIS_VAR}" />',
-		<fmt:message key="label.monitoring.summary.answered.questions.y.axis.students" var="ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS_VAR"/>
-		ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS : '<c:out value="${ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS_VAR}" />',
-		<fmt:message key="label.monitoring.summary.answered.questions.y.axis.groups" var="ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS_VAR"/>
-		ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS : '<c:out value="${ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS_VAR}" />'
+		ACTIVITY_COMPLETION_CHART_TITLE : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.completion" /></spring:escapeBody>',
+		ACTIVITY_COMPLETION_CHART_POSSIBLE_LEARNERS : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.completion.possible" /></spring:escapeBody>',
+		ACTIVITY_COMPLETION_CHART_STARTED_LEARNERS : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.completion.started" /></spring:escapeBody>',	
+		ACTIVITY_COMPLETION_CHART_COMPLETED_LEARNERS : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.completion.completed" /></spring:escapeBody>',	
+		ANSWERED_QUESTIONS_CHART_TITLE : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.answered.questions" /></spring:escapeBody>',
+		ANSWERED_QUESTIONS_CHART_TITLE_GROUPS : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.answered.questions.groups" /></spring:escapeBody>',
+		ANSWERED_QUESTIONS_CHART_X_AXIS : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.answered.questions.x.axis" /></spring:escapeBody>',
+		ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.answered.questions.y.axis.students" /></spring:escapeBody>',
+		ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.answered.questions.y.axis.groups" /></spring:escapeBody>'
 	}),
 
 	activityCompletionChart = null,
Index: lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
===================================================================
diff -u -reccd6838790a4369b6788e48fb5ae5851622fe35 -rcfd463431d2171b40403dcff2508408e72685c0e
--- lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(.../iraAssessmentStudentChoices.jsp)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
+++ lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(.../iraAssessmentStudentChoices.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
@@ -7,24 +7,15 @@
 	var WEB_APP_URL = '<lams:WebAppURL />',
 
 			LABELS = $.extend(LABELS, {
-				<fmt:message key="label.monitoring.summary.completion" var="ACTIVITY_COMPLETION_CHART_TITLE_VAR"/>
-				ACTIVITY_COMPLETION_CHART_TITLE : '<c:out value="${ACTIVITY_COMPLETION_CHART_TITLE_VAR}" />',
-				<fmt:message key="label.monitoring.summary.completion.possible" var="ACTIVITY_COMPLETION_CHART_POSSIBLE_LEARNERS_VAR"/>
-				ACTIVITY_COMPLETION_CHART_POSSIBLE_LEARNERS : '<c:out value="${ACTIVITY_COMPLETION_CHART_POSSIBLE_LEARNERS_VAR}" />',
-				<fmt:message key="label.monitoring.summary.completion.started" var="ACTIVITY_COMPLETION_CHART_STARTED_LEARNERS_VAR"/>
-				ACTIVITY_COMPLETION_CHART_STARTED_LEARNERS : '<c:out value="${ACTIVITY_COMPLETION_CHART_STARTED_LEARNERS_VAR}" />',
-				<fmt:message key="label.monitoring.summary.completion.completed" var="ACTIVITY_COMPLETION_CHART_COMPLETED_LEARNERS_VAR"/>
-				ACTIVITY_COMPLETION_CHART_COMPLETED_LEARNERS : '<c:out value="${ACTIVITY_COMPLETION_CHART_COMPLETED_LEARNERS_VAR}" />',
-				<fmt:message key="label.monitoring.summary.answered.questions" var="ANSWERED_QUESTIONS_CHART_TITLE_VAR"/>
-				ANSWERED_QUESTIONS_CHART_TITLE : '<c:out value="${ANSWERED_QUESTIONS_CHART_TITLE_VAR}" />',
-				<fmt:message key="label.monitoring.summary.answered.questions.groups" var="ANSWERED_QUESTIONS_CHART_TITLE_GROUPS_VAR"/>
-				ANSWERED_QUESTIONS_CHART_TITLE_GROUPS : '<c:out value="${ANSWERED_QUESTIONS_CHART_TITLE_GROUPS_VAR}" />',
-				<fmt:message key="label.monitoring.summary.answered.questions.x.axis" var="ANSWERED_QUESTIONS_CHART_X_AXIS_VAR"/>
-				ANSWERED_QUESTIONS_CHART_X_AXIS : '<c:out value="${ANSWERED_QUESTIONS_CHART_X_AXIS_VAR}" />',
-				<fmt:message key="label.monitoring.summary.answered.questions.y.axis.students" var="ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS_VAR"/>
-				ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS : '<c:out value="${ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS_VAR}" />',
-				<fmt:message key="label.monitoring.summary.answered.questions.y.axis.groups" var="ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS_VAR"/>
-				ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS : '<c:out value="${ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS_VAR}" />'
+				ACTIVITY_COMPLETION_CHART_TITLE : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.completion" /></spring:escapeBody>',
+				ACTIVITY_COMPLETION_CHART_POSSIBLE_LEARNERS : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.completion.possible" /></spring:escapeBody>',
+				ACTIVITY_COMPLETION_CHART_STARTED_LEARNERS : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.completion.started" /></spring:escapeBody>',
+				ACTIVITY_COMPLETION_CHART_COMPLETED_LEARNERS : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.completion.completed" /></spring:escapeBody>',
+				ANSWERED_QUESTIONS_CHART_TITLE : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.answered.questions" /></spring:escapeBody>',
+				ANSWERED_QUESTIONS_CHART_TITLE_GROUPS : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.answered.questions.groups" /></spring:escapeBody>',
+				ANSWERED_QUESTIONS_CHART_X_AXIS : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.answered.questions.x.axis" /></spring:escapeBody>',
+				ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.answered.questions.y.axis.students" /></spring:escapeBody>',
+				ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS : '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.summary.answered.questions.y.axis.groups" /></spring:escapeBody>'
 			}),
 
 			activityCompletionChart = null,