Index: lams_admin/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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_admin/web/organisation/deleteAllLessons.jsp
===================================================================
diff -u -rb1f3169b7b71acb63d6ca0cff04e3d84094af7fc -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_admin/web/organisation/deleteAllLessons.jsp	(.../deleteAllLessons.jsp)	(revision b1f3169b7b71acb63d6ca0cff04e3d84094af7fc)
+++ lams_admin/web/organisation/deleteAllLessons.jsp	(.../deleteAllLessons.jsp)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -52,7 +52,7 @@
 			'url'     : '<lams:LAMSURL/>admin/organisation/deleteAllLessons.do',
 			'data'    : {
 				'limit'  : 5,
-				'orgId'  : ${param.orgId},
+				'orgId'  : <c:out value="${param.orgId}" />,
 				"<csrf:tokenname/>":"<csrf:tokenvalue/>"
 			},
 			'success' : function(response){
@@ -80,7 +80,7 @@
 	<lams:Page type="admin" title="${title}">
 				<p>
 					<a href="<lams:LAMSURL/>admin/orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
-					:  <a href="<lams:LAMSURL/>admin/orgmanage.do?org=${param.orgId}" class="btn btn-default"><c:out value="${courseName}" /></a>
+					:  <a href='<lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="${param.orgId}" />' class="btn btn-default"><c:out value="${courseName}" /></a>
 				</p>
 				
 				<lams:errors/>
Index: lams_admin/web/userChangePass.jsp
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_admin/web/userChangePass.jsp	(.../userChangePass.jsp)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_admin/web/userChangePass.jsp	(.../userChangePass.jsp)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -141,7 +141,7 @@
 
 			<form id="userForm" modelAttribute="userForm" action="usersave/changePass.do" method="post">
 				<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
-				<input type="hidden" name="userId" value="${param.userId}" />
+				<input type="hidden" name="userId" value='<c:out value="${param.userId}" />' />
 							
 						<lams:errors path="password"/>
 						
Index: lams_central/src/java/org/lamsfoundation/lams/web/GroupingController.java
===================================================================
diff -u -r7b3eba5d7b856941bb0b89cb6e49a1498a8feac4 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_central/src/java/org/lamsfoundation/lams/web/GroupingController.java	(.../GroupingController.java)	(revision 7b3eba5d7b856941bb0b89cb6e49a1498a8feac4)
+++ lams_central/src/java/org/lamsfoundation/lams/web/GroupingController.java	(.../GroupingController.java)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -26,7 +26,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -49,7 +48,6 @@
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.BranchingActivity;
 import org.lamsfoundation.lams.learningdesign.Group;
-import org.lamsfoundation.lams.learningdesign.GroupComparator;
 import org.lamsfoundation.lams.learningdesign.Grouping;
 import org.lamsfoundation.lams.learningdesign.GroupingActivity;
 import org.lamsfoundation.lams.learningdesign.service.LearningDesignService;
@@ -65,7 +63,6 @@
 import org.lamsfoundation.lams.usermanagement.dto.OrganisationGroupingDTO;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
-import org.lamsfoundation.lams.util.AlphanumComparator;
 import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -525,9 +522,8 @@
 	ArrayNode groupsJSON = JsonNodeFactory.instance.arrayNode();
 	if (groups != null) {
 	    // sort groups by their name
-	    List<Group> groupList = new LinkedList<>(groups);
-	    Collections.sort(groupList, new GroupComparator());
-	    for (Group group : groupList) {
+	    Set<Group> groupSet = new TreeSet<>(groups);
+	    for (Group group : groupSet) {
 		ObjectNode groupJSON = JsonNodeFactory.instance.objectNode();
 		groupJSON.put("name", group.getGroupName());
 		groupJSON.put("groupId", group.getGroupId());
@@ -553,25 +549,13 @@
      */
     private ArrayNode getOrgGroupsDetails(Set<OrganisationGroup> groups, Collection<User> learners) {
 
-	final Comparator<OrganisationGroup> ORG_GROUP_COMPARATOR = new Comparator<>() {
-	    @Override
-	    public int compare(OrganisationGroup o1, OrganisationGroup o2) {
-		String grp1Name = o1 != null ? o1.getName() : "";
-		String grp2Name = o2 != null ? o2.getName() : "";
-
-		AlphanumComparator comparator = new AlphanumComparator();
-		return comparator.compare(grp1Name, grp2Name);
-	    }
-	};
-
 	// serialize database group objects into JSON
 	ArrayNode groupsJSON = JsonNodeFactory.instance.arrayNode();
 	if (groups != null) {
 	    // sort groups by their name
-	    List<OrganisationGroup> groupList = new LinkedList<>(groups);
-	    Collections.sort(groupList, ORG_GROUP_COMPARATOR);
+	    Set<OrganisationGroup> groupSet = new TreeSet<>(groups);
 
-	    for (OrganisationGroup group : groupList) {
+	    for (OrganisationGroup group : groupSet) {
 		ObjectNode groupJSON = JsonNodeFactory.instance.objectNode();
 		groupJSON.put("name", group.getName());
 		groupJSON.put("groupId", group.getGroupId());
Index: lams_central/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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_central/web/WEB-INF/web.xml
===================================================================
diff -u -r67971954b8537811d7f3497041713d98412b1680 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 67971954b8537811d7f3497041713d98412b1680)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -10,38 +10,7 @@
 		</param-value>
 	</context-param>
 
-	<!-- In LAMS 2.3 there was a change in this section in all tools and core 
-		parts (central, learning, monitoring etc.) All LAMS web application now use 
-		shared application context. See refBeanContext.xml file in lams_common for 
-		its description. This refBeanContext.xml contains definition of the shared 
-		context. It is located by this entry: <context-param> <param-name>locatorFactorySelector</param-name> 
-		<param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value> 
-		</context-param> telling to look for refBeanContext.xml files in selected 
-		part of the classpath. Currently LAMS has only one refBeanContext.xml with 
-		one shared context definition. Lams_central uses only beans from the shared 
-		context "context.central". That is why there is no value in contextConfigLocation. 
-		Even so, this parameter needs to be declared with empty value for locatorFactorySelector 
-		to work properly. Also, if no local application context file is declare, 
-		there MUST be a file named "applicationContext.xml" in web/WEB-INF containing 
-		empty bean list, otherwise there will be errors during start up. If there 
-		are local (private for web application; see tools and admin for example) 
-		bean definitions, path to application context XML file can still be added 
-		to contextConfigLocation. -->
-
 	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value></param-value>
-	</context-param>
-	<context-param>
-		<param-name>locatorFactorySelector</param-name>
-		<param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml
-		</param-value>
-	</context-param>
-	<context-param>
-		<param-name>parentContextKey</param-name>
-		<param-value>context.central</param-value>
-	</context-param>
-	<context-param>
         <param-name>Owasp.CsrfGuard.Config</param-name>
         <param-value>WEB-INF/Owasp.CsrfGuard.properties</param-value>
     </context-param>
@@ -176,7 +145,7 @@
 
 	<listener>
 		<listener-class>
-			org.springframework.web.context.ContextLoaderListener
+			org.lamsfoundation.lams.web.filter.LamsContextLoaderListener
 		</listener-class>
 	</listener>
 
@@ -624,7 +593,7 @@
 			<role-name>MONITOR</role-name>
 			<role-name>AUTHOR</role-name>
 			<role-name>GROUP MANAGER</role-name>
-			<role-name>SYSADMIN</role-name>
+			<role-name>APPADMIN</role-name>
 		</auth-constraint>
 	</security-constraint>
 	<security-constraint>
@@ -659,8 +628,8 @@
 			<url-pattern>/images/*</url-pattern>
 			<url-pattern>/includes/javascript/*</url-pattern>
 			<url-pattern>/includes/font-awesome/*</url-pattern>
+			<url-pattern>/includes/font-awesome6/*</url-pattern>
 			<url-pattern>/ckeditor/*</url-pattern>
-			<url-pattern>/loadVars.jsp</url-pattern>
 			<url-pattern>/favicon.ico</url-pattern>
 			<http-method>GET</http-method>
  			<http-method>POST</http-method>
@@ -677,15 +646,15 @@
 		</web-resource-collection>
 		<auth-constraint>
 			<role-name>AUTHOR</role-name>
-			<role-name>SYSADMIN</role-name>
+			<role-name>APPADMIN</role-name>
 		</auth-constraint>
 	</security-constraint>
 
 	<!-- Some constraints are based on DisplayGroupAction class -->
 	<security-constraint>
 		<web-resource-collection>
 			<web-resource-name>Any superuser content</web-resource-name>
-			<url-pattern>/orgGroup.jsp</url-pattern>
+			<url-pattern>/groups.jsp</url-pattern>
 			<url-pattern>/orgGrouping.jsp</url-pattern>
 			<url-pattern>/qb/collection/*</url-pattern>
 			<url-pattern>/qb/stats/*</url-pattern>
@@ -698,7 +667,7 @@
 			<role-name>AUTHOR</role-name>
 			<role-name>MONITOR</role-name>
 			<role-name>GROUP MANAGER</role-name>
-			<role-name>SYSADMIN</role-name>
+			<role-name>APPADMIN</role-name>
 		</auth-constraint>
 	</security-constraint>
 	<security-constraint>
@@ -712,19 +681,19 @@
 		<auth-constraint>
 			<role-name>MONITOR</role-name>
 			<role-name>GROUP MANAGER</role-name>
-			<role-name>SYSADMIN</role-name>
+			<role-name>APPADMIN</role-name>
 		</auth-constraint>
 	</security-constraint>
 	<security-constraint>
 		<web-resource-collection>
-			<web-resource-name>Sysadmin content</web-resource-name>
+			<web-resource-name>Appadmin content</web-resource-name>
 			<url-pattern>/admin.jsp</url-pattern>
-			<url-pattern>/sysadmin.jsp</url-pattern>
+			<url-pattern>/appadmin.jsp</url-pattern>
 			<http-method>GET</http-method>
  			<http-method>POST</http-method>
 		</web-resource-collection>
 		<auth-constraint>
-			<role-name>SYSADMIN</role-name>
+			<role-name>APPADMIN</role-name>
 		</auth-constraint>
 	</security-constraint>
 
@@ -759,7 +728,7 @@
 		<role-name>GROUP MANAGER</role-name>
 	</security-role>
 	<security-role>
-		<description>LAMS System Adminstrator</description>
-		<role-name>SYSADMIN</role-name>
+		<description>LAMS Application Adminstrator</description>
+		<role-name>APPADMIN</role-name>
 	</security-role>
-</web-app>
\ No newline at end of file
+</web-app>
Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -ra40a77e307317e8038ed9e6b8699c18386286497 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision a40a77e307317e8038ed9e6b8699c18386286497)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -279,8 +279,8 @@
 			activitiesOnlySelectable = false,
 			isLtiContentSelection = ${param.ltiContentSelection eq 'true'},
 			initContentFolderID = '${contentFolderID}',
-			initLearningDesignID = '${param.learningDesignID}',
-			initRelaunchMonitorLessonID = '${param.relaunchMonitorLessonID}',
+			initLearningDesignID = '<c:out value="${param.learningDesignID}" />',
+			initRelaunchMonitorLessonID = '<c:out value="${param.relaunchMonitorLessonID}" />',
 			initAccess = ${access},
 			csrfTokenName = '<csrf:tokenname/>',
 			csrfTokenValue = '<csrf:tokenvalue/>';
Index: lams_central/web/authoring/svgGenerator.jsp
===================================================================
diff -u -r4436ad48ebfcbce1f25ad39db54f55c32873afc1 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_central/web/authoring/svgGenerator.jsp	(.../svgGenerator.jsp)	(revision 4436ad48ebfcbce1f25ad39db54f55c32873afc1)
+++ lams_central/web/authoring/svgGenerator.jsp	(.../svgGenerator.jsp)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -50,7 +50,7 @@
 			isReadOnlyMode = true,
 			activitiesOnlySelectable = ${param.selectable eq 'true'},
 			isLtiContentSelection = false,
-			initLearningDesignID = '${param.learningDesignID}',
+			initLearningDesignID = '<c:out value="${param.learningDesignID}" />',
 			initRelaunchMonitorLessonID = null,
 			csrfTokenName = '<csrf:tokenname/>',
 			csrfTokenValue = '<csrf:tokenvalue/>';
Index: lams_central/web/extGroups.jsp
===================================================================
diff -u -rb28b1e41d273fdce6c086a72a4e6a9f2e1a8a946 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_central/web/extGroups.jsp	(.../extGroups.jsp)	(revision b28b1e41d273fdce6c086a72a4e6a9f2e1a8a946)
+++ lams_central/web/extGroups.jsp	(.../extGroups.jsp)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -21,8 +21,8 @@
 </div>
 
 <form id="ext-groups-form" action="<lams:LAMSURL/>grouping/viewGroups.do" method="POST">
-	<input name="lessonID" value="${lessonID}" type="hidden"/>
-	<input name="activityID" value="${param.activityID}" type="hidden"/>
+	<input name="lessonID" value='<c:out value="${lessonID}" />' type="hidden"/>
+	<input name="activityID" value='<c:out value="${param.activityID}" />' type="hidden"/>
 
 	<c:forEach var="group" items="${extGroups}">
 		<div class="groupingContainer">
Index: lams_central/web/groups.jsp
===================================================================
diff -u -r0132ac7723f6060a3a656d216ac93a1540634c7f -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_central/web/groups.jsp	(.../groups.jsp)	(revision 0132ac7723f6060a3a656d216ac93a1540634c7f)
+++ lams_central/web/groups.jsp	(.../groups.jsp)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -33,7 +33,7 @@
 		var grouping = ${grouping},
 			organisationId = grouping.organisationId,
 			unassignedUsers = ${unassignedUsers},
-			groupingActivityId = '${param.activityID}',
+			groupingActivityId = '<c:out value="${param.activityID}" />',
 			lessonId = '${lessonID}',
 			lessonMode = ${lessonMode},
 			// This attribute can be empty.
@@ -212,8 +212,8 @@
 							<i class="fa fa-download"></i> <fmt:message key="label.download.template" />
 						</button>
 						<form action="../monitoring/groupingUpload/importLearnersForGrouping.do" enctype="multipart/form-data" id="uploadForm">
-							<input type="hidden" name="activityID" value="${param.activityID}"/>
-							<input type="hidden" name="lessonID" value="${lessonID}"/>
+							<input type="hidden" name="activityID" value='<c:out value="${param.activityID}" />' />
+							<input type="hidden" name="lessonID" value='<c:out value="${lessonID}" />' />
 							<lams:FileUpload5 fileFieldname="groupUploadFile" fileInputMessageKey="label.upload.group.spreadsheet"
 								uploadInfoMessageKey="-" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/>
 							<button id="import" type="button" class="btn btn-primary btn-disable-on-downupload ms-3"
Index: lams_central/web/orgGrouping.jsp
===================================================================
diff -u -r0132ac7723f6060a3a656d216ac93a1540634c7f -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_central/web/orgGrouping.jsp	(.../orgGrouping.jsp)	(revision 0132ac7723f6060a3a656d216ac93a1540634c7f)
+++ lams_central/web/orgGrouping.jsp	(.../orgGrouping.jsp)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -31,12 +31,12 @@
 	<lams:JSImport src="includes/javascript/orgGrouping.js" />
 	
 	<script type="text/javascript">
-		var groupingActivityId = '${param.activityID}',
+		var groupingActivityId = '<c:out value="${param.activityID}" />',
 			lessonMode = ${lessonMode},
 			// parameter can be null and the ID available only as a JSP attribute
-			organisationId = ${empty organisationID ? param.organisationID : organisationID},
+			organisationId = <c:out value="${empty organisationID ? param.organisationID : organisationID}" />,
 			targetOrganisationId = '${targetOrganisationId}',
-			lessonId = '${param.lessonID}',
+			lessonId = '<c:out value="${param.lessonID}" />',
 			csrfTokenName = '<csrf:tokenname/>',
 			csrfTokenValue = '<csrf:tokenvalue/>',
 			LAMS_URL = '<lams:LAMSURL/>',
Index: lams_gradebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_gradebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_gradebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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_gradebook/web/releaseLessonMarks.jsp
===================================================================
diff -u -r3e28bc1c181bea4cc5c4f1358fb7aef5c065621a -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_gradebook/web/releaseLessonMarks.jsp	(.../releaseLessonMarks.jsp)	(revision 3e28bc1c181bea4cc5c4f1358fb7aef5c065621a)
+++ lams_gradebook/web/releaseLessonMarks.jsp	(.../releaseLessonMarks.jsp)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -47,7 +47,7 @@
 	marksReleased = ${marksReleased};
 
 	
-	var releaseMarksLessonID = ${param.lessonID},
+	var releaseMarksLessonID = <c:out value="${param.lessonID}" />,
 		releaseMarksAlertBox = null,
 		// is release marks scheduled?
 		releaseMarksScheduleDate = '${releaseMarksScheduleDate}';
Index: lams_learning/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_learning/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_learning/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingController.java
===================================================================
diff -u -rd6cc136dd301517f59c05b2ba254a4538dae65aa -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingController.java	(.../GroupingController.java)	(revision d6cc136dd301517f59c05b2ba254a4538dae65aa)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingController.java	(.../GroupingController.java)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -42,7 +42,6 @@
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.Group;
-import org.lamsfoundation.lams.learningdesign.GroupComparator;
 import org.lamsfoundation.lams.learningdesign.Grouping;
 import org.lamsfoundation.lams.learningdesign.GroupingActivity;
 import org.lamsfoundation.lams.lesson.service.LessonServiceException;
@@ -137,7 +136,7 @@
 	request.setAttribute(GroupingController.PARAM_ACTIVITY_TITLE, activity.getTitle());
 	request.setAttribute(GroupingController.PARAM_ACTIVITY_DESCRIPTION, activity.getDescription());
 
-	SortedSet<Group> groups = new TreeSet<>(new GroupComparator());
+	SortedSet<Group> groups = new TreeSet<>();
 	groups.addAll(grouping.getGroups());
 
 	// sort users with first, then last name, then login
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java
===================================================================
diff -u -r0132ac7723f6060a3a656d216ac93a1540634c7f -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java	(.../GroupingUploadController.java)	(revision 0132ac7723f6060a3a656d216ac93a1540634c7f)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java	(.../GroupingUploadController.java)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -26,15 +26,14 @@
 import java.io.IOException;
 import java.security.InvalidParameterException;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeSet;
 import java.util.Vector;
 
 import javax.servlet.ServletOutputStream;
@@ -52,7 +51,6 @@
 import org.apache.poi.ss.usermodel.CellType;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.Group;
-import org.lamsfoundation.lams.learningdesign.GroupComparator;
 import org.lamsfoundation.lams.learningdesign.Grouping;
 import org.lamsfoundation.lams.learningdesign.GroupingActivity;
 import org.lamsfoundation.lams.lesson.Lesson;
@@ -67,7 +65,6 @@
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
-import org.lamsfoundation.lams.util.AlphanumComparator;
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
@@ -199,9 +196,8 @@
 	titleRow.addCell(messageService.getMessage("spreadsheet.column.groupname"));
 
 	if (groups != null) {
-	    List<Group> groupList = new LinkedList<>(groups);
-	    Collections.sort(groupList, new GroupComparator());
-	    for (Group group : groupList) {
+	    Set<Group> groupSet = new TreeSet<>(groups);
+	    for (Group group : groupSet) {
 		String groupName = group.getGroupName();
 		for (User groupUser : group.getUsers()) {
 		    generateUserRow(groupName, groupUser, excelSheet);
@@ -513,17 +509,6 @@
 	return skipped;
     }
 
-    final Comparator<OrganisationGroup> ORG_GROUP_COMPARATOR = new Comparator<>() {
-	@Override
-	public int compare(OrganisationGroup o1, OrganisationGroup o2) {
-	    String grp1Name = o1 != null ? o1.getName() : "";
-	    String grp2Name = o2 != null ? o2.getName() : "";
-
-	    AlphanumComparator comparator = new AlphanumComparator();
-	    return comparator.compare(grp1Name, grp2Name);
-	}
-    };
-
     private UserDTO getUserDTO() {
 	HttpSession ss = SessionManager.getSession();
 	return (UserDTO) ss.getAttribute(AttributeNames.USER);
Index: lams_monitoring/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_monitoring/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_monitoring/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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_chat/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_doku/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_doku/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_gmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_gmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_preview/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_preview/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_whiteboard/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_whiteboard/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_tool_zoom/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_tool_zoom/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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 -r41caf9ff14b3744b4f2f67b9b085619add90f348 -r3eab31a1109437bc25679e6ebe38be0a350e17ac
--- lams_www/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 41caf9ff14b3744b4f2f67b9b085619add90f348)
+++ lams_www/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
@@ -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/',