Index: lams_tool_bbb/web/pages/export/exportPortfolio.jsp
===================================================================
diff -u -rdf5534fd49894e3369fc98f8273d9e2fefbb4817 -r33c642c7896741b77af6bf3cd92d1322c7978e71
--- lams_tool_bbb/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision df5534fd49894e3369fc98f8273d9e2fefbb4817)
+++ lams_tool_bbb/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 33c642c7896741b77af6bf3cd92d1322c7978e71)
@@ -5,7 +5,7 @@
 
 <html>
 	<lams:head>
-		<title><c:out value="${contentDTO.title}" escapeXml="false" />
+		<title><c:out value="${contentDTO.title}" escapeXml="true" />
 		</title>
 		<lams:css localLinkPath="../" />
 	</lams:head>
Index: lams_tool_bbb/web/pages/learning/learning.jsp
===================================================================
diff -u -rdf5534fd49894e3369fc98f8273d9e2fefbb4817 -r33c642c7896741b77af6bf3cd92d1322c7978e71
--- lams_tool_bbb/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision df5534fd49894e3369fc98f8273d9e2fefbb4817)
+++ lams_tool_bbb/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 33c642c7896741b77af6bf3cd92d1322c7978e71)
@@ -42,11 +42,11 @@
 
 <div id="content">
 	<h1>
-		${contentDTO.title}
+		<c:out value="${contentDTO.title}" escapeXml="true"/>
 	</h1>
 
 	<p>
-		${contentDTO.instructions}
+		<c:out value="${contentDTO.instructions}" escapeXml="false"/>
 	</p>
 
 	<c:if test="${contentDTO.lockOnFinish and mode == 'learner'}">
Index: lams_tool_bbb/web/pages/learning/notebook.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -r33c642c7896741b77af6bf3cd92d1322c7978e71
--- lams_tool_bbb/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_bbb/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 33c642c7896741b77af6bf3cd92d1322c7978e71)
@@ -8,14 +8,14 @@
 
 <div id="content">
 	<h1>
-		${contentDTO.title}
+		<c:out value="${contentDTO.title}" escapeXml="true"/>
 	</h1>
 
 	<html:form action="/learning" method="post"
 		onsubmit="disableFinishButton();">
 
 		<p class="small-space-top">
-			<lams:out value="${contentDTO.reflectInstructions}" />
+			<lams:out value="${contentDTO.reflectInstructions}" escapeHmtl="true"/>
 		</p>
 
 		<html:textarea cols="60" rows="8" property="entryText"
Index: lams_tool_bbb/web/pages/monitoring/editActivity.jsp
===================================================================
diff -u -rdf5534fd49894e3369fc98f8273d9e2fefbb4817 -r33c642c7896741b77af6bf3cd92d1322c7978e71
--- lams_tool_bbb/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision df5534fd49894e3369fc98f8273d9e2fefbb4817)
+++ lams_tool_bbb/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 33c642c7896741b77af6bf3cd92d1322c7978e71)
@@ -15,7 +15,7 @@
 				<fmt:message key="label.authoring.basic.title" />
 			</td>
 			<td>
-				<c:out value="${dto.title}" escapeXml="false" />
+				<c:out value="${dto.title}" escapeXml="true" />
 			</td>
 		</tr>
 		<tr>
Index: lams_tool_bbb/web/pages/monitoring/notebook.jsp
===================================================================
diff -u -rdf5534fd49894e3369fc98f8273d9e2fefbb4817 -r33c642c7896741b77af6bf3cd92d1322c7978e71
--- lams_tool_bbb/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision df5534fd49894e3369fc98f8273d9e2fefbb4817)
+++ lams_tool_bbb/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 33c642c7896741b77af6bf3cd92d1322c7978e71)
@@ -9,7 +9,7 @@
 	</h1>
 
 	<h2>
-		${userDTO.firstName} ${userDTO.lastName }
+		<c:out value="${userDTO.firstName} ${userDTO.lastName}" escapeXml="true"/>
 	</h2>
 
 	<table>
@@ -36,7 +36,7 @@
 				<fmt:message key="label.notebookEntry" />
 			</td>
 			<td>
-				<c:out value="${userDTO.notebookEntryDTO.entry}" escapeXml="false"></c:out>
+				<lams:out value="${userDTO.notebookEntryDTO.entry}" escapeHtml="true"/>
 			</td>
 		</tr>
 	</table>
@@ -46,4 +46,4 @@
 </div>
 
 <div id="footer">
-</div>
\ No newline at end of file
+</div>
Index: lams_tool_bbb/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rdf5534fd49894e3369fc98f8273d9e2fefbb4817 -r33c642c7896741b77af6bf3cd92d1322c7978e71
--- lams_tool_bbb/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision df5534fd49894e3369fc98f8273d9e2fefbb4817)
+++ lams_tool_bbb/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 33c642c7896741b77af6bf3cd92d1322c7978e71)
@@ -82,7 +82,7 @@
 				<c:forEach var="user" items="${session.userDTOs}">
 					<tr>
 						<td>
-							${user.firstName} ${user.lastName}
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>
 						</td>
 						<td>
 							<c:choose>
