Index: lams_tool_notebook/web/pages/export/exportPortfolio.jsp
===================================================================
diff -u -rb36b344930e722597930064e3361bc291223fefc -r3bf4ee4aac914dfc772dd08ee28d0f6b555ee4fc
--- lams_tool_notebook/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision b36b344930e722597930064e3361bc291223fefc)
+++ lams_tool_notebook/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 3bf4ee4aac914dfc772dd08ee28d0f6b555ee4fc)
@@ -72,7 +72,7 @@
 											<fmt:message key="label.notebookEntry" />
 										</td>
 										<td>
-											<c:out value="${user.entryDTO.entry}" escapeXml="true"></c:out>
+											<lams:out value="${user.entryDTO.entry}" escapeHtml="true"/>
 										</td>
 									</tr>
 								</c:if>
Index: lams_tool_notebook/web/pages/monitoring/notebookDisplay.jsp
===================================================================
diff -u -ra10a0d3f83b0f9147502ac620c570dd1537db15f -r3bf4ee4aac914dfc772dd08ee28d0f6b555ee4fc
--- lams_tool_notebook/web/pages/monitoring/notebookDisplay.jsp	(.../notebookDisplay.jsp)	(revision a10a0d3f83b0f9147502ac620c570dd1537db15f)
+++ lams_tool_notebook/web/pages/monitoring/notebookDisplay.jsp	(.../notebookDisplay.jsp)	(revision 3bf4ee4aac914dfc772dd08ee28d0f6b555ee4fc)
@@ -26,7 +26,7 @@
 					<tr>
 						<td colspan="2">
 							<h2>
-								${userDTO.firstName} ${userDTO.lastName }
+								<c:out value="${userDTO.firstName} ${userDTO.lastName}" escapeXml="true"/>
 							</h2>
 						</td>
 					</tr>
@@ -53,7 +53,7 @@
 							<fmt:message key="label.notebookEntry" />
 						</td>
 						<td>
-							<c:out value="${userDTO.entryDTO.entry}" escapeXml="true"></c:out>
+							<lams:out value="${userDTO.entryDTO.entry}" escapeHtml="true"/>
 						</td>
 					</tr>
 				</table>
Index: lams_tool_notebook/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r9d41bc7e76703e62ceaf4d2dc425f74b0d18c636 -r3bf4ee4aac914dfc772dd08ee28d0f6b555ee4fc
--- lams_tool_notebook/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 9d41bc7e76703e62ceaf4d2dc425f74b0d18c636)
+++ lams_tool_notebook/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 3bf4ee4aac914dfc772dd08ee28d0f6b555ee4fc)
@@ -129,7 +129,7 @@
 		<c:forEach var="user" items="${session.userDTOs}">
 			<tr>
 				<td width="30%">
-					${user.firstName} ${user.lastName}
+					<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>
 				</td>
 				<td width="70%">
 					<c:choose>
Index: lams_tool_pixlr/web/pages/export/exportPortfolio.jsp
===================================================================
diff -u -r63ab4413a66861635ecc8d57de6256e4aefed77b -r3bf4ee4aac914dfc772dd08ee28d0f6b555ee4fc
--- lams_tool_pixlr/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 63ab4413a66861635ecc8d57de6256e4aefed77b)
+++ lams_tool_pixlr/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 3bf4ee4aac914dfc772dd08ee28d0f6b555ee4fc)
@@ -106,7 +106,7 @@
 					<tr>
 						<td><a
 							href="javascript:openPopup('${pixlrImageFolderURL}/${user.imageFileName}', ${user.imageHeight}, ${user.imageWidth})">
-						${user.firstName} ${user.lastName} </a></td>
+						<c:out value="${user.firstName} ${user.lastName}"/></a></td>
 						<td align="center"><c:choose>
 							<c:when
 								test="${user.imageFileName != null && user.imageFileName != pixlrDTO.imageFileName}">
Index: lams_tool_scratchie/web/pages/learning/waitforleader.jsp
===================================================================
diff -u -rc7569597546126af159f169353e68e91241b7f10 -r3bf4ee4aac914dfc772dd08ee28d0f6b555ee4fc
--- lams_tool_scratchie/web/pages/learning/waitforleader.jsp	(.../waitforleader.jsp)	(revision c7569597546126af159f169353e68e91241b7f10)
+++ lams_tool_scratchie/web/pages/learning/waitforleader.jsp	(.../waitforleader.jsp)	(revision 3bf4ee4aac914dfc772dd08ee28d0f6b555ee4fc)
@@ -20,7 +20,7 @@
 
 	<div id="content">
 		<h1>
-			${scratchie.title}
+			<c:out value="${scratchie.title}" escapeXml="true"/>
 		</h1>
 		
 		<h2>
@@ -34,7 +34,7 @@
 		<div>
 			<c:forEach var="user" items="${groupUsers}" varStatus="status">
 				<div>
-					${user.firstName} ${user.lastName}
+					<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>
 				</div>
 			</c:forEach>
 		</div>
@@ -51,4 +51,4 @@
 	</div>
 
 </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_wookie/web/pages/monitoring/wookieDisplay.jsp
===================================================================
diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -r3bf4ee4aac914dfc772dd08ee28d0f6b555ee4fc
--- lams_tool_wookie/web/pages/monitoring/wookieDisplay.jsp	(.../wookieDisplay.jsp)	(revision 7c52d117dbe910bd67630b5506346429e25b99a9)
+++ lams_tool_wookie/web/pages/monitoring/wookieDisplay.jsp	(.../wookieDisplay.jsp)	(revision 3bf4ee4aac914dfc772dd08ee28d0f6b555ee4fc)
@@ -4,7 +4,7 @@
 	<tr>
 		<td colspan="2">
 			<h2>
-				${userDTO.firstName} ${userDTO.lastName }
+				<c:out value="${userDTO.firstName} ${userDTO.lastName}" escapeXml="true"/>
 			</h2>
 		</td>
 	</tr>
@@ -31,7 +31,7 @@
 			<fmt:message key="label.notebookEntry" />
 		</td>
 		<td>
-			<c:out value="${userDTO.entryDTO.entry}" escapeXml="false"></c:out>
+			<lams:out value="${userDTO.entryDTO.entry}" escapeHtml="true"/>
 		</td>
 	</tr>
 </table>