Index: lams_gradebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_gradebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_gradebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_learning/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_learning/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_learning/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_assessment/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_daco/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_doku/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_doku/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_doku/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_forum/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_gmap/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_gmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_gmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_images/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_imscc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_lamc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_laqa/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_larsrc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_leader/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_mindmap/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_nb/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_notebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_pixlr/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_preview/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_preview/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_preview/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_sbmt/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_scratchie/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_scribe/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_survey/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_task/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_vote/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_whiteboard/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_whiteboard/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_whiteboard/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_wiki/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_tool_zoom/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_tool_zoom/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_tool_zoom/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',
Index: lams_www/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf68c67dec73a0ea26037cbb9b45754ef3b1b2276 -rd5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f
--- lams_www/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f68c67dec73a0ea26037cbb9b45754ef3b1b2276)
+++ lams_www/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d5ad7b5a58050f7d21dd7428a2c2bb6d7b3a361f)
@@ -100,9 +100,9 @@
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
-				toolSessionId = '${toolSessionId}',
-				lessonId = '${lessonID}',
-				mode = '${mode}',
+				toolSessionId = '<c:out value="${toolSessionId}" />',
+				lessonId = '<c:out value="${lessonID}" />',
+				mode = '<c:out value="${mode}" />',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				LEARNING_URL = LAMS_URL + 'learning/',