Index: lams_tool_imscc/web/pages/export/exportportfolio.jsp
===================================================================
diff -u -rb0a6e6d35ab909144c15a0d7dcd0cf8909a46ac4 -r77bcef245dda8b166cdf40c12c62a7a5ab8d6fde
--- lams_tool_imscc/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision b0a6e6d35ab909144c15a0d7dcd0cf8909a46ac4)
+++ lams_tool_imscc/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 77bcef245dda8b166cdf40c12c62a7a5ab8d6fde)
@@ -41,7 +41,7 @@
 	<div id="content">
 
 		<h1>
-			${title}
+			<c:out value="${title}"/>
 		</h1>
 		
 		<div>
Index: lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r73d41a9e127d790407deda8286fa5aa8182d8a1d -r77bcef245dda8b166cdf40c12c62a7a5ab8d6fde
--- lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 73d41a9e127d790407deda8286fa5aa8182d8a1d)
+++ lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 77bcef245dda8b166cdf40c12c62a7a5ab8d6fde)
@@ -80,7 +80,7 @@
 					<td>
 						<span class="field-name"> <fmt:message
 								key="label.authoring.basic.resource.file" /> : </span>
-						${resource.title}
+						<c:out value="${resource.title}" escapeXml="true"/>
 					</td>
 					<td>
 						<a href="#"
@@ -136,7 +136,7 @@
 					<td>
 						<span class="field-name"> <fmt:message
 								key="label.authoring.basic.resource.website" /> : </span>
-						${resource.title}
+						<c:out value="${resource.title}" escapeXml="true"/>
 					</td>
 					<td>
 						<a href="#"
@@ -191,7 +191,7 @@
 					<td>
 						<span class="field-name"> <fmt:message
 								key="label.authoring.basic.resource.learning.object" /> : </span>
-						${resource.title}
+						<c:out value="${resource.title}" escapeXml="true"/>
 					</td>
 					<td>
 						<a href="#"
Index: lams_tool_larsrc/web/pages/export/exportportfolio.jsp
===================================================================
diff -u -r73d41a9e127d790407deda8286fa5aa8182d8a1d -r77bcef245dda8b166cdf40c12c62a7a5ab8d6fde
--- lams_tool_larsrc/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 73d41a9e127d790407deda8286fa5aa8182d8a1d)
+++ lams_tool_larsrc/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 77bcef245dda8b166cdf40c12c62a7a5ab8d6fde)
@@ -129,7 +129,7 @@
 							</td>
 
 							<td>
-								${item.itemTitle}
+								<c:out value="${item.itemTitle}"/>
 							</td>
 							
 							<td>
Index: lams_tool_leader/web/layouts/mobileLearningLayout.jsp
===================================================================
diff -u -r17ddd3aac11d9fecc83159a9c829e989754accfb -r77bcef245dda8b166cdf40c12c62a7a5ab8d6fde
--- lams_tool_leader/web/layouts/mobileLearningLayout.jsp	(.../mobileLearningLayout.jsp)	(revision 17ddd3aac11d9fecc83159a9c829e989754accfb)
+++ lams_tool_leader/web/layouts/mobileLearningLayout.jsp	(.../mobileLearningLayout.jsp)	(revision 77bcef245dda8b166cdf40c12c62a7a5ab8d6fde)
@@ -34,7 +34,7 @@
 		
 			<div data-role="header" data-theme="b" data-nobackbtn="true">
 				<h1>
-					${content.title}
+					<c:out value="${content.title}"/>
 				</h1>
 			</div>
 	
@@ -52,7 +52,7 @@
 				<div style="text-align: right;">
 					<c:forEach var="user" items="${groupUsers}" varStatus="status">
 						<div>
-							${user.firstName} ${user.lastName}
+							<c:out value="${user.firstName} ${user.lastName}"/>
 						</div>
 					</c:forEach>
 				</div>
Index: lams_tool_mindmap/web/pages/learning/submissionDeadline.jsp
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r77bcef245dda8b166cdf40c12c62a7a5ab8d6fde
--- lams_tool_mindmap/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_mindmap/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 77bcef245dda8b166cdf40c12c62a7a5ab8d6fde)
@@ -13,7 +13,7 @@
 
 <div id="content">
 	<h1>
-		${mindmapDTO.title}
+		<c:out value="${mindmapDTO.title}"/>
 	</h1>
 
 	<div class="warning">
Index: lams_tool_sbmt/web/learner/notebook.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -r77bcef245dda8b166cdf40c12c62a7a5ab8d6fde
--- lams_tool_sbmt/web/learner/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_sbmt/web/learner/notebook.jsp	(.../notebook.jsp)	(revision 77bcef245dda8b166cdf40c12c62a7a5ab8d6fde)
@@ -27,7 +27,7 @@
 		<html:hidden property="sessionMapID" />
 		<div id="content">
 			<h1>
-				${sessionMap.title}
+				<c:out value="${sessionMap.title}"/>
 			</h1>
 
 			<%@ include file="/common/messages.jsp"%>
Index: lams_tool_scratchie/web/pages/export/parts/exportLearner.jsp
===================================================================
diff -u -r6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18 -r77bcef245dda8b166cdf40c12c62a7a5ab8d6fde
--- lams_tool_scratchie/web/pages/export/parts/exportLearner.jsp	(.../exportLearner.jsp)	(revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18)
+++ lams_tool_scratchie/web/pages/export/parts/exportLearner.jsp	(.../exportLearner.jsp)	(revision 77bcef245dda8b166cdf40c12c62a7a5ab8d6fde)
@@ -22,20 +22,20 @@
 	<div id="content">
 
 		<h1>
-			${sessionMap.scratchie.title}
+			<c:out value="${sessionMap.scratchie.title}"/>
 		</h1>
 		
 		<div>
-			${sessionMap.scratchie.instructions}
+			<c:out value="${sessionMap.scratchie.instructions}" escapeXml="false"/>
 		</div>
 
 		<table id="scratches" class="alternative-color">
 			<c:forEach var="item" items="${sessionMap.itemList}">
 				<tr id="tr${item.uid}">
 					<td>
-						${item.title}
+						<c:out value="${item.title}"/>
 						<br/>
-						${item.description} 
+						<c:out value="${item.description}" escapeXml="false"/>
 					</td>
 					<td align="right">
 						<c:choose>
Index: lams_tool_scratchie/web/pages/export/parts/exportTeacher.jsp
===================================================================
diff -u -r9908e067a5350bea350dea231dbe734558e67be8 -r77bcef245dda8b166cdf40c12c62a7a5ab8d6fde
--- lams_tool_scratchie/web/pages/export/parts/exportTeacher.jsp	(.../exportTeacher.jsp)	(revision 9908e067a5350bea350dea231dbe734558e67be8)
+++ lams_tool_scratchie/web/pages/export/parts/exportTeacher.jsp	(.../exportTeacher.jsp)	(revision 77bcef245dda8b166cdf40c12c62a7a5ab8d6fde)
@@ -65,11 +65,11 @@
 	<div id="content">
 
 		<h1>
-			${sessionMap.scratchie.title}
+			<c:out value="${sessionMap.scratchie.title}"/>
 		</h1>
 		
 		<div>
-			${sessionMap.scratchie.instructions}
+			<c:out value="${sessionMap.scratchie.instructions}" escapeXml="false"/>
 		</div>
 
 		<c:choose>
Index: lams_tool_scratchie/web/pages/learning/results.jsp
===================================================================
diff -u -r537b1cb3333b17ffb5b53577dc3b610a2ab0f085 -r77bcef245dda8b166cdf40c12c62a7a5ab8d6fde
--- lams_tool_scratchie/web/pages/learning/results.jsp	(.../results.jsp)	(revision 537b1cb3333b17ffb5b53577dc3b610a2ab0f085)
+++ lams_tool_scratchie/web/pages/learning/results.jsp	(.../results.jsp)	(revision 77bcef245dda8b166cdf40c12c62a7a5ab8d6fde)
@@ -33,7 +33,7 @@
 
 	<div id="content">
 		<h1>
-			${scratchie.title}
+			<c:out value="${scratchie.title}"/>
 		</h1>
 		
 		<c:if test="${not empty sessionMap.submissionDeadline}">
@@ -59,7 +59,7 @@
 		<c:if test="${sessionMap.reflectOn}">
 			<div class="small-space-top">
 				<h3>
-					${sessionMap.reflectInstructions}
+					<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
 				</h3>
 
 				<c:choose>
@@ -92,7 +92,7 @@
 					
 				    <c:forEach var="reflectDTO" items="${reflections}">
 				    	<div>
-				    		${reflectDTO.groupName}: <c:out value="${reflectDTO.reflection}" escapeXml="true"></c:out> 
+				    		<c:out value="${reflectDTO.groupName}"/>: <lams:out value="${reflectDTO.reflection}" escapeHtml="true"></c:out> 
 				    	</div>
 			        </c:forEach>
 		        </c:if>
Index: lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp
===================================================================
diff -u -r99545d1824fcf0b2ea23a6bdce46aab3b288bff5 -r77bcef245dda8b166cdf40c12c62a7a5ab8d6fde
--- lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp	(.../itemSummary.jsp)	(revision 99545d1824fcf0b2ea23a6bdce46aab3b288bff5)
+++ lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp	(.../itemSummary.jsp)	(revision 77bcef245dda8b166cdf40c12c62a7a5ab8d6fde)
@@ -78,7 +78,7 @@
 				</fmt:message>
 			</h1>
 			<h3>
-				${item.description}
+				<c:out value="${item.description}" escapeXml="false"/>
 			</h3>	
 			<%@ include file="/common/messages.jsp"%>
 			<br/>
Index: lams_tool_survey/web/pages/export/exportportfolio.jsp
===================================================================
diff -u -r09e543ff11a5c1e6749e012cdc0d5983265f60ec -r77bcef245dda8b166cdf40c12c62a7a5ab8d6fde
--- lams_tool_survey/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 09e543ff11a5c1e6749e012cdc0d5983265f60ec)
+++ lams_tool_survey/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 77bcef245dda8b166cdf40c12c62a7a5ab8d6fde)
@@ -14,7 +14,7 @@
 <body class="stripes">
 		<div id="content">
 		<h1>
-			${sessionMap.title}
+			<c:out value="${sessionMap.title}"/>
 		</h1>
 
 			<c:forEach var="sessionEntry" items="${sessionMap.summaryList}" varStatus="sessionStatus">
@@ -36,7 +36,7 @@
 											<%= SurveyConstants.OPTION_SHORT_HEADER %>${optTitleStatus.count}
 										</td>
 										<td>
-											${optionTitle.description}
+											<c:out value="${optionTitle.description}" escapeXml="false"/>
 										</td>
 									</tr>
 								</c:forEach>
@@ -75,7 +75,7 @@
 					<c:forEach var="answer" items="${answers}">
 						<%--  User answer list --%>
 						<tr>
-							<td>${answer.replier.loginName}</td>
+							<td><c:out value="${answer.replier.loginName}"/></td>
 							<c:forEach var="option" items="${question.options}">
 								<td>
 									<c:if test="${not empty answer.answer}">
@@ -112,7 +112,7 @@
 						<h3><fmt:message key="label.export.reflection" /></h3>
 						<c:set var="reflectDTOSet" value="${sessionMap.reflectList[toolSession.sessionId]}" />
 						<c:forEach var="reflectDTO" items="${reflectDTOSet}">
-							<h4>${reflectDTO.fullName}</h4>
+							<h4><c:out value="${reflectDTO.fullName}"/></h4>
 							<p>
 								<lams:out value="${reflectDTO.reflect}" escapeHtml="true" /> 
 							</p>						
Index: lams_tool_survey/web/pages/learning/submissionDeadline.jsp
===================================================================
diff -u -r8b97231e320c0c5b674f07c14da711f232ba9e1c -r77bcef245dda8b166cdf40c12c62a7a5ab8d6fde
--- lams_tool_survey/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
+++ lams_tool_survey/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 77bcef245dda8b166cdf40c12c62a7a5ab8d6fde)
@@ -26,7 +26,7 @@
 	<div id="content">
 
 		<h1>
-			${sessionMap.title}
+			<c:out value="${sessionMap.title}"/>
 		</h1>
 		
 		<div class="warning">
@@ -38,7 +38,7 @@
 		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
 			<div class="small-space-top">
 				<h2>
-					${sessionMap.reflectInstructions}
+					<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
 				</h2>
 
 				<c:choose>
Index: lams_tool_survey/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r61d957b69e2230effe4ab96242233c281e0bba44 -r77bcef245dda8b166cdf40c12c62a7a5ab8d6fde
--- lams_tool_survey/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 61d957b69e2230effe4ab96242233c281e0bba44)
+++ lams_tool_survey/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 77bcef245dda8b166cdf40c12c62a7a5ab8d6fde)
@@ -90,7 +90,7 @@
 			<tr>
 				<th class="first" colspan="2">
 					<a href="javascript:;" onclick="launchPopup('<c:url value="/monitoring/listAnswers.do?"/>toolSessionID=${surveySession.sessionId}&questionUid=${question.uid}')">
-						${question.shortTitle} 
+						<c:out value="${question.shortTitle}"/> 
 					</a>
 					<div style="float:right">
 					<%-- Only show pie/bar chart when question is single/multiple choics type --%>
@@ -180,10 +180,10 @@
 						</c:if>
 						<tr>
 							<td colspan="2">
-								${user.fullName}
+								<c:out value="${user.fullName}" escapeXml="true"/>
 							</td>
 							<td colspan="2">
-								${user.loginName}
+								<c:out value="${user.loginName}" escapeXml="true"/>
 							</td>
 							<td >
 								<c:set var="viewReflection">
Index: lams_tool_task/web/pages/authoring/parts/addtask.jsp
===================================================================
diff -u -rc2ba0dc3e2d99441897de8d185e83c419a416f2d -r77bcef245dda8b166cdf40c12c62a7a5ab8d6fde
--- lams_tool_task/web/pages/authoring/parts/addtask.jsp	(.../addtask.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
+++ lams_tool_task/web/pages/authoring/parts/addtask.jsp	(.../addtask.jsp)	(revision 77bcef245dda8b166cdf40c12c62a7a5ab8d6fde)
@@ -136,15 +136,15 @@
 					<c:forEach var="taskListItem" items="${sessionMap.taskListList}">
 						<c:choose>
 							<c:when	test="${formBean.parentTaskName == taskListItem.title}">
-								<option value="${taskListItem.title}" selected="true">
-									${taskListItem.title}
+								<option value="${fn:escapeXml(taskListItem.title)}" selected="true">
+									<c:out value="${taskListItem.title}"/>
 								</option>
 							</c:when>
 							<c:when	test="${formBean.title == taskListItem.title}">
 							</c:when>
 							<c:otherwise>
-								<option value="${taskListItem.title}">
-									${taskListItem.title}
+								<option value="${fn:escapeXml(taskListItem.title)}">
+									<c:out value="${taskListItem.title}"/>
 								</option>
 							</c:otherwise>
 						</c:choose>
Index: lams_tool_task/web/pages/learning/submissionDeadline.jsp
===================================================================
diff -u -r8b97231e320c0c5b674f07c14da711f232ba9e1c -r77bcef245dda8b166cdf40c12c62a7a5ab8d6fde
--- lams_tool_task/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
+++ lams_tool_task/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 77bcef245dda8b166cdf40c12c62a7a5ab8d6fde)
@@ -25,7 +25,7 @@
 <body class="stripes">
 	<div id="content">
 		<h1>
-			${sessionMap.title}
+			<c:out value="${sessionMap.title}"/>
 		</h1>
 
 		<div class="warning">
Index: lams_tool_videorecorder/web/pages/learning/videoRecorder.jsp
===================================================================
diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -r77bcef245dda8b166cdf40c12c62a7a5ab8d6fde
--- lams_tool_videorecorder/web/pages/learning/videoRecorder.jsp	(.../videoRecorder.jsp)	(revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
+++ lams_tool_videorecorder/web/pages/learning/videoRecorder.jsp	(.../videoRecorder.jsp)	(revision 77bcef245dda8b166cdf40c12c62a7a5ab8d6fde)
@@ -67,11 +67,11 @@
 
 <div id="content">
 	<h1>
-		${videoRecorderDTO.title}
+		<c:out value="${videoRecorderDTO.title}"/>
 	</h1>
 
 	<p>
-		${videoRecorderDTO.instructions}
+		<c:out value="${videoRecorderDTO.instructions}" escapeXml="false"/>
 	</p>
 
 	<c:if test="${videoRecorderDTO.lockOnFinish and mode == 'learner'}">
Index: lams_tool_wookie/web/pages/authoring/widgetList.jsp
===================================================================
diff -u -r03c1b10ef9f45b0e2b1c52610d1104716e3a9037 -r77bcef245dda8b166cdf40c12c62a7a5ab8d6fde
--- lams_tool_wookie/web/pages/authoring/widgetList.jsp	(.../widgetList.jsp)	(revision 03c1b10ef9f45b0e2b1c52610d1104716e3a9037)
+++ lams_tool_wookie/web/pages/authoring/widgetList.jsp	(.../widgetList.jsp)	(revision 77bcef245dda8b166cdf40c12c62a7a5ab8d6fde)
@@ -44,7 +44,7 @@
 					</tr>
 					<tr align="center">
 						<td class="wookie-title" align="center" valign="top">
-							<a href="javascript:selectWookieWidget('${widget.identifier}')">${widget.title}</a>
+							<a href="javascript:selectWookieWidget('${widget.identifier}')"><c:out value="${widget.title}"/></a>
 						</td>
 					</tr>