Index: lams_central/web/orgGrouping.jsp
===================================================================
diff -u -rddb552387ac914ce1e6b67746a01632395120ac0 -r47dddf6db4afaba99d8f3f88fc50b16df9251a76
--- lams_central/web/orgGrouping.jsp	(.../orgGrouping.jsp)	(revision ddb552387ac914ce1e6b67746a01632395120ac0)
+++ lams_central/web/orgGrouping.jsp	(.../orgGrouping.jsp)	(revision 47dddf6db4afaba99d8f3f88fc50b16df9251a76)
@@ -17,12 +17,12 @@
 	<script type="text/javascript" src="${lams}includes/javascript/orgGrouping.js"></script>
 	<lams:JSImport src="includes/javascript/dialog.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/>',