Index: lams_tool_preview/web/common/taglibs.jsp
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -r1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7
--- lams_tool_preview/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_preview/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7)
@@ -6,4 +6,4 @@
 <%@ taglib uri="tags-xml" prefix="x" %>
 <%@ 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"%>
Index: lams_tool_preview/web/pages/learning/comment.jsp
===================================================================
diff -u -r9c67c4442e3be5f0e4ff25e09dbafa61cd29d2c8 -r1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7
--- lams_tool_preview/web/pages/learning/comment.jsp	(.../comment.jsp)	(revision 9c67c4442e3be5f0e4ff25e09dbafa61cd29d2c8)
+++ lams_tool_preview/web/pages/learning/comment.jsp	(.../comment.jsp)	(revision 1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7)
@@ -20,9 +20,9 @@
 		COUNT_RATED_ITEMS = 0, // only applies to stars
 		LAMS_URL = '${lams}',
 		COMMENTS_MIN_WORDS_LIMIT = ${criteriaRatings.ratingCriteria.commentsMinWordsLimit},
-		COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip"/>',
-		WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="warning.comment.blank"/>',
-		WARN_MIN_NUMBER_WORDS_LABEL = "<fmt:message key="warning.minimum.number.words"><fmt:param value="${criteriaRatings.ratingCriteria.commentsMinWordsLimit}"/></fmt:message>",
+		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="warning.comment.blank"/></spring:escapeBody>',
+		WARN_MIN_NUMBER_WORDS_LABEL = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='warning.minimum.number.words'><fmt:param value='${criteriaRatings.ratingCriteria.commentsMinWordsLimit}'/></fmt:message></spring:escapeBody>",
 		ALLOW_RERATE = true,
 		SESSION_ID = ${toolSessionId}; 
 
@@ -194,7 +194,7 @@
 	function updatedComment(comment) {		
 		// if the data has been saved to the database, don't clear it!
 		if ( comment.value == '' && comment.defaultValue != '' ) {
-			alert('<fmt:message key="error.edit.not.remove"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.edit.not.remove"/></spring:escapeBody>');
 			comment.value = comment.defaultValue;
 			return;
 		}
@@ -215,7 +215,7 @@
 				});
 			}
 		}
-		$('#countRatedItemsSpan').html('<fmt:message key="label.rate.limits.topic.reminder"/>'.replace('{0}', numCommentsOnPage + commentsOnOtherPages));
+		$('#countRatedItemsSpan').html('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rate.limits.topic.reminder"/></spring:escapeBody>'.replace('{0}', numCommentsOnPage + commentsOnOtherPages));
 		checkButtons();
 		return true;
 	}
@@ -226,7 +226,7 @@
 
 		hideButtons();
 		if (!skipNumberValidation && (numCommentsOnPage + commentsOnOtherPages < ${minRates})) {
-			alert('<fmt:message key="label.rate.limits.reminder.min"/>'.replace('{0}',${minRates}) );
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rate.limits.reminder.min"/></spring:escapeBody>'.replace('{0}',${minRates}) );
 			return false;
 		}
 			
@@ -264,7 +264,7 @@
 		        success: function (response) {
 	    			var countCommentsSaved = response.countCommentsSaved;
 					if ( ! ( countCommentsSaved > 0 ) ) {
-	       				alert('<fmt:message key="error.unable.save.comments"/>');
+	       				alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.unable.save.comments"/></spring:escapeBody>');
 	       				showButtons();
 	       				return false;
 					} else {
Index: lams_tool_preview/web/pages/learning/hedging.jsp
===================================================================
diff -u -r9bc29026b38d8068d7be685e2a627890af31db33 -r1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7
--- lams_tool_preview/web/pages/learning/hedging.jsp	(.../hedging.jsp)	(revision 9bc29026b38d8068d7be685e2a627890af31db33)
+++ lams_tool_preview/web/pages/learning/hedging.jsp	(.../hedging.jsp)	(revision 1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7)
@@ -38,7 +38,7 @@
 				$("#editForm").submit();
 				}
 			} else {
-				alert('<fmt:message key="error.assign.marks"><fmt:param>${criteriaRatings.ratingCriteria.maxRating}</fmt:param></fmt:message>');
+				alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.assign.marks"><fmt:param>${criteriaRatings.ratingCriteria.maxRating}</fmt:param></fmt:message></spring:escapeBody>');
 			}
 		}
 		
@@ -52,7 +52,7 @@
 					wordCount = value ? (value.replace(/['";:,.?\-!]+/g, '').match(/\S+/g) || []).length : 0;
 				    
 			    if(wordCount < wordLimit){
-			    	var alertMessage = '<fmt:message key="warning.minimum.number.words"><fmt:param value="${criteriaRatings.ratingCriteria.commentsMinWordsLimit}"/></fmt:message>';
+			    	var alertMessage = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="warning.minimum.number.words"><fmt:param value="${criteriaRatings.ratingCriteria.commentsMinWordsLimit}"/></fmt:message></spring:escapeBody>';
 					alert( alertMessage.replace("{1}", wordCount));
 					return false;
 				}
Index: lams_tool_preview/web/pages/learning/rankall.jsp
===================================================================
diff -u -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2 -r1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7
--- lams_tool_preview/web/pages/learning/rankall.jsp	(.../rankall.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
+++ lams_tool_preview/web/pages/learning/rankall.jsp	(.../rankall.jsp)	(revision 1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7)
@@ -61,9 +61,9 @@
 		
 		function updateAddLabel() {
 			if ( learners.children == undefined || learners.children.length == 0  ) {
-		    	$('#lastEntry').html('<fmt:message key="label.alllearnersadded"/>');
+		    	$('#lastEntry').html('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.alllearnersadded"/></spring:escapeBody>');
 			} else {
-				$('#lastEntry').html('<fmt:message key="label.addlearnerhere"/>');
+				$('#lastEntry').html('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.addlearnerhere"/></spring:escapeBody>');
 			}
 		}
 			
@@ -91,7 +91,7 @@
 			hideButtons();
 
 			if ( learners.children.length > 0 ) {
-				alert('<fmt:message key="error.assign.rankAll"/>');
+				alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.assign.rankAll"/></spring:escapeBody>');
 				return false;
 			}
 
Index: lams_tool_preview/web/pages/learning/ranking.jsp
===================================================================
diff -u -r9dcc3e2d26b504f92d919f53f0d45dd4093a82a2 -r1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7
--- lams_tool_preview/web/pages/learning/ranking.jsp	(.../ranking.jsp)	(revision 9dcc3e2d26b504f92d919f53f0d45dd4093a82a2)
+++ lams_tool_preview/web/pages/learning/ranking.jsp	(.../ranking.jsp)	(revision 1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7)
@@ -74,7 +74,7 @@
 				$("#next").val(next);
 				editForm.submit();
 			} else {
-				alert('<fmt:message key="error.assign.ranks"><fmt:param>${criteriaRatings.ratingCriteria.maxRating}</fmt:param></fmt:message>');
+				alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.assign.ranks"><fmt:param>${criteriaRatings.ratingCriteria.maxRating}</fmt:param></fmt:message></spring:escapeBody>');
 			}
 		}
 
Index: lams_tool_preview/web/pages/learning/rubrics.jsp
===================================================================
diff -u -r4a6c8a497b55005dcd5b6158ebc2051fc5e3b40a -r1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7
--- lams_tool_preview/web/pages/learning/rubrics.jsp	(.../rubrics.jsp)	(revision 4a6c8a497b55005dcd5b6158ebc2051fc5e3b40a)
+++ lams_tool_preview/web/pages/learning/rubrics.jsp	(.../rubrics.jsp)	(revision 1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7)
@@ -46,7 +46,7 @@
 	
 	function submitEntry(next) {
 		if (next && !rubricsRequireRatings && isRatingMissing() 
-				&& !confirm('<fmt:message key="message.rating.rubrics.selection.missing" />')){
+				&& !confirm('<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.rating.rubrics.selection.missing" /></spring:escapeBody>')){
 			return;
 		}
 		// answer saved when clicked so don't use next button to submit
@@ -65,7 +65,7 @@
     		},
     		success: function(data, textStatus) {
     			if (data.error) {
-        			alert('<fmt:message key="label.rating.rubrics.error.rate" />');
+        			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.error.rate" /></spring:escapeBody>');
     				return;
     			}
     			$(cell).addClass('bg-success').siblings('td').removeClass('bg-success');
@@ -75,7 +75,7 @@
             	}
     		},
 			onError : function(){
-    			alert('<fmt:message key="label.rating.rubrics.error.rate" />');
+    			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.error.rate" /></spring:escapeBody>');
  			}
     	});
 	}
Index: lams_tool_preview/web/pages/learning/rubricsPivot.jsp
===================================================================
diff -u -r4a6c8a497b55005dcd5b6158ebc2051fc5e3b40a -r1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7
--- lams_tool_preview/web/pages/learning/rubricsPivot.jsp	(.../rubricsPivot.jsp)	(revision 4a6c8a497b55005dcd5b6158ebc2051fc5e3b40a)
+++ lams_tool_preview/web/pages/learning/rubricsPivot.jsp	(.../rubricsPivot.jsp)	(revision 1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7)
@@ -40,7 +40,7 @@
 
 	function submitEntry(next) {
 		if (next && !rubricsRequireRatings && isRatingMissing() 
-				&& !confirm('<fmt:message key="message.rating.rubrics.selection.missing" />')){
+				&& !confirm('<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.rating.rubrics.selection.missing" /></spring:escapeBody>')){
 			return;
 		}
 		// answer saved when clicked so don't use next button to submit
@@ -59,7 +59,7 @@
     		},
     		success: function(data, textStatus) {
     			if (data.error) {
-        			alert('<fmt:message key="label.rating.rubrics.error.rate" />');
+        			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.error.rate" /></spring:escapeBody>');
     				return;
     			}
     			let row = $(cell).parent(),
@@ -74,7 +74,7 @@
             	}
     		},
 			onError : function(){
-    			alert('<fmt:message key="label.rating.rubrics.error.rate" />');
+    			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.error.rate" /></spring:escapeBody>');
  			}
     	});
 	}
Index: lams_tool_preview/web/pages/learning/star.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7
--- lams_tool_preview/web/pages/learning/star.jsp	(.../star.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/pages/learning/star.jsp	(.../star.jsp)	(revision 1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7)
@@ -20,9 +20,9 @@
 		LIMIT_BY_CRITERIA = "true";
 		LAMS_URL = '${lams}',
 		COUNT_RATED_ITEMS = ${criteriaRatings.countRatedItems},
-		COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip"/>',
-		WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="warning.comment.blank"/>',
-		WARN_MIN_NUMBER_WORDS_LABEL = "<fmt:message key="warning.minimum.number.words"><fmt:param value="${criteriaRatings.ratingCriteria.commentsMinWordsLimit}"/></fmt:message>",
+		COMMENT_TEXTAREA_TIP_LABEL = '<spring:escapeBody javaScriptEscape="true">:message key="label.comment.textarea.tip"/></spring:escapeBody>',
+		WARN_COMMENTS_IS_BLANK_LABEL = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="warning.comment.blank"/></spring:escapeBody>',
+		WARN_MIN_NUMBER_WORDS_LABEL = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='warning.minimum.number.words'><fmt:param value='${criteriaRatings.ratingCriteria.commentsMinWordsLimit}'/></fmt:message></spring:escapeBody>",
 		ALLOW_RERATE = true,
 		SESSION_ID = ${toolSessionId};
 	</script>
@@ -35,7 +35,7 @@
 	
 	<script type="text/javascript">
 	
-	var YOUR_RATING_LABEL = '<fmt:message key="label.you.gave.rating"><fmt:param>@1@</fmt:param></fmt:message>',
+	var YOUR_RATING_LABEL = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.you.gave.rating"><fmt:param>@1@</fmt:param></fmt:message></spring:escapeBody>',
 		IS_DISABLED =  ${sessionMap.isDisabled},
 		commentsSaved = true;
 	
@@ -108,7 +108,7 @@
 							rows += '</span>'
 								
 							if (isMaximumRatesPerUserReached) {
-								rows += '<br/><div class="alert alert-warning"><i class="fa fa-exclamation-circle text-muted"></i> <fmt:message key="label.cant.rate" /></div>';
+								rows += '<br/><div class="alert alert-warning"><i class="fa fa-exclamation-circle text-muted"></i> <spring:escapeBody javaScriptEscape="true"><fmt:message key="label.cant.rate" /></spring:escapeBody></div>';
 							}
 
 							rows += '</td>';
@@ -221,7 +221,7 @@
 		        success: function (response) {
 	    			var countCommentsSaved = response.countCommentsSaved;
 					if ( ! ( countCommentsSaved >= 0 ) ) {
-	       				alert('<fmt:message key="error.unable.save.comments"/>');
+	       				alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.unable.save.comments"/></spring:escapeBody>');
 	       				return false;
 					} else {
 						return moveOn(next);
Index: lams_tool_preview/web/pages/monitoring/advanceoptions.jsp
===================================================================
diff -u -rf1d0722ace2f721a8a423f094d2101c433c15a0a -r1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7
--- lams_tool_preview/web/pages/monitoring/advanceoptions.jsp	(.../advanceoptions.jsp)	(revision f1d0722ace2f721a8a423f094d2101c433c15a0a)
+++ lams_tool_preview/web/pages/monitoring/advanceoptions.jsp	(.../advanceoptions.jsp)	(revision 1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7)
@@ -1,6 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="adTitle"><fmt:message key="monitor.summary.th.advancedSettings" /></c:set>
+<c:set var="adTitle"><spring:escapeBody javaScriptEscape="true"><fmt:message key="monitor.summary.th.advancedSettings" /></spring:escapeBody></c:set>
 <lams:AdvancedAccordian title="${adTitle}">
              
 <table class="table table-striped table-condensed">
Index: lams_tool_preview/web/pages/monitoring/criteriapart.jsp
===================================================================
diff -u -rf9c593122ee2e6b2463a208dfd4b2ab035860af7 -r1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7
--- lams_tool_preview/web/pages/monitoring/criteriapart.jsp	(.../criteriapart.jsp)	(revision f9c593122ee2e6b2463a208dfd4b2ab035860af7)
+++ lams_tool_preview/web/pages/monitoring/criteriapart.jsp	(.../criteriapart.jsp)	(revision 1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7)
@@ -43,8 +43,8 @@
 			iconSet: 'fontAwesome',
 		   	colNames:[
 				'itemId',
-				'<fmt:message key="label.user.name" />',
-				'${heading}',
+				'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.user.name" /></spring:escapeBody>',
+				'<spring:escapeBody javaScriptEscape="true">${heading}</spring:escapeBody>',
 				'portraitId',
 				''
 			],
@@ -91,8 +91,8 @@
 						iconSet: 'fontAwesome',
 						colNames:[
 							'id',
-							'<fmt:message key="label.user.name" />',
-							'${heading}',
+							'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.user.name" /></spring:escapeBody>',
+							'<spring:escapeBody javaScriptEscape="true">${heading}</spring:escapeBody>',
 							'criteriaId',
 							'userId'
 							],
@@ -146,12 +146,12 @@
 							//remove empty subgrids
 					        var table_value = $('#'+subgridTableId).getGridParam('records');
 					        if(table_value === 0){
-					            $('#'+subgrid_id).parent().unbind('click').html('<fmt:message key="label.no.ratings.left" />');
+					            $('#'+subgrid_id).parent().unbind('click').html('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.no.ratings.left" /></spring:escapeBody>');
 					        }
 						},
 						loadError: function(xhr,st,err) {
 					    	jQuery("#"+subgridTableId).clearGridData();
-					    	info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="gradebook.error.loaderror"/>", "<fmt:message key="label.ok"/>");
+					    	info_dialog("<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.error'/></spring:escapeBody>", "<spring:escapeBody javaScriptEscape='true'><fmt:message key='gradebook.error.loaderror'/></spring:escapeBody>", "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.ok'/></spring:escapeBody>");
 					    }
 					})
 			}
Index: lams_tool_preview/web/pages/monitoring/manageUsers.jsp
===================================================================
diff -u -r1ba75f43a383fb925aae69975d748d0a8dfdf9a5 -r1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7
--- lams_tool_preview/web/pages/monitoring/manageUsers.jsp	(.../manageUsers.jsp)	(revision 1ba75f43a383fb925aae69975d748d0a8dfdf9a5)
+++ lams_tool_preview/web/pages/monitoring/manageUsers.jsp	(.../manageUsers.jsp)	(revision 1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7)
@@ -39,8 +39,8 @@
 				iconSet: 'fontAwesome',
 			   	colNames:[
 					'userUid',
-			   		'<fmt:message key="label.user.hidden" />',
-					'<fmt:message key="label.user.name" />'
+			   		'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.user.hidden" /></spring:escapeBody>',
+					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.user.name" /></spring:escapeBody>'
 				],
 			   	colModel:[
 			   		{name:'userUid', index:'userUid', width:0, hidden: true},
@@ -60,7 +60,7 @@
 				    $(":checkbox").on("click", function(event){
 				    	
 				    	//if teacher doesn't confirm - prevent checkbox from being unchecked and do not save to DB
-				    	if (!$(this).is(":checked") && !confirm('<fmt:message key="label.hide.user.confirmation" />')) {
+				    	if (!$(this).is(":checked") && !confirm('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.hide.user.confirmation" /></spring:escapeBody>')) {
 					    	event.preventDefault();
 					    	event.stopPropagation();
 					    	return false;
Index: lams_tool_preview/web/pages/monitoring/reflections.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7
--- lams_tool_preview/web/pages/monitoring/reflections.jsp	(.../reflections.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_preview/web/pages/monitoring/reflections.jsp	(.../reflections.jsp)	(revision 1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7)
@@ -32,10 +32,10 @@
 				iconSet: 'fontAwesome',
 			   	colNames:[
 						'itemId',
-						'<fmt:message key="label.user.name" />',
+						'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.user.name" /></spring:escapeBody>',
 						'timeago',
 						'portraitId',
-						'<fmt:message key="title.reflection" />'
+						'<spring:escapeBody javaScriptEscape="true"><fmt:message key="title.reflection" /></spring:escapeBody>'
 				],
 			   	colModel:[
 			   		{name:'itemId', index:'itemId', width:0, hidden: true},
Index: lams_tool_preview/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7
--- lams_tool_preview/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_preview/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7)
@@ -42,7 +42,7 @@
 <script type="text/javascript">
 	function exportResults() {
 		var exportExcelUrl = '<c:url value="/monitoring/exportTeamReport.do"/>?<csrf:token/>&sessionMapID=${sessionMapID}&toolSessionId=${groupSummary.sessionId}&toolContentID=${sessionMap.toolContentID}';
-		return downloadFile(exportExcelUrl, 'messageArea_Busy', '<fmt:message key="label.file.downloaded"/>', 'messageArea', 'btn-disable-on-submit');
+		return downloadFile(exportExcelUrl, 'messageArea_Busy', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.file.downloaded"/></spring:escapeBody>', 'messageArea', 'btn-disable-on-submit');
 	}
 
 	function getResultsElement(sessionId, selector) {
@@ -58,7 +58,7 @@
 	}
 
 	function sendResults(sessionId) {
-		if (!confirm('<fmt:message key="confirm.notify.user.of.results" />')) {
+		if (!confirm('<spring:escapeBody javaScriptEscape="true"><fmt:message key="confirm.notify.user.of.results" /></spring:escapeBody>')) {
 			return;
 		}
 		let buttons = sessionId ? getResultsElement(sessionId, ".btn-disable-on-submit") : $('.btn-disable-on-submit'),
Index: lams_tool_preview/web/pages/monitoring/summary5.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7
--- lams_tool_preview/web/pages/monitoring/summary5.jsp	(.../summary5.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_preview/web/pages/monitoring/summary5.jsp	(.../summary5.jsp)	(revision 1a95fab3ccfb6157bf176c530eb7ae5c0900bdd7)
@@ -28,7 +28,7 @@
 <script type="text/javascript">
 	function exportResults() {
 		var exportExcelUrl = '<c:url value="/monitoring/exportTeamReport.do"/>?<csrf:token/>&sessionMapID=${sessionMapID}&toolSessionId=${groupSummary.sessionId}&toolContentID=${sessionMap.toolContentID}';
-		return downloadFile(exportExcelUrl, 'messageArea_Busy', '<fmt:message key="label.file.downloaded"/>', 'messageArea', 'btn-disable-on-submit');
+		return downloadFile(exportExcelUrl, 'messageArea_Busy', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.file.downloaded"/></spring:escapeBody>', 'messageArea', 'btn-disable-on-submit');
 	}
 
 	function getResultsElement(sessionId, selector) {
@@ -44,7 +44,7 @@
 	}
 	
 	function sendResults(sessionId) {
-		showConfirm('<fmt:message key="confirm.notify.user.of.results" />', function(){
+		showConfirm('<spring:escapeBody javaScriptEscape="true"><fmt:message key="confirm.notify.user.of.results" /></spring:escapeBody>', function(){
 			let buttons = getResultsElement(sessionId, ".btn-disable-on-submit"),
 				messageArea = getResultsElement(sessionId, ".messageArea2"),
 				messageAreaBusy = getResultsElement(sessionId, ".messageArea2_Busy"),