Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringConditionController.java
===================================================================
diff -u -r658034e7f07579dd682db62112b9353b3a0d3f65 -r50e67f677a0db400bbd8eeba754c0e31971d05fb
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringConditionController.java	(.../QaAuthoringConditionController.java)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringConditionController.java	(.../QaAuthoringConditionController.java)	(revision 50e67f677a0db400bbd8eeba754c0e31971d05fb)
@@ -23,8 +23,10 @@
 package org.lamsfoundation.lams.tool.qa.web.controller;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
@@ -334,8 +336,7 @@
 	List<QaQuestionDTO> questions = getQuestionList(sessionMap);
 
 	// Initialise the LabelValueBeans in the possibleOptions array.
-	LabelValueBean[] lvBeans = new LabelValueBean[questions.size()];
-
+	Map<String, String> possibleItems = new HashMap<>(questions.size());
 	int i = 0;
 	for (QaQuestionDTO question : questions) {
 	    String nonHTMLQuestion = question.getQuestion();
@@ -347,9 +348,9 @@
 		    nonHTMLQuestion = nonHTMLQuestion.substring(0, QaAppConstants.QUESTION_CUTOFF_INDEX) + "...";
 		}
 	    }
-	    lvBeans[i++] = new LabelValueBean(nonHTMLQuestion, new Integer(question.getDisplayOrder()).toString());
+	    possibleItems.put(nonHTMLQuestion, new Integer(question.getDisplayOrder()).toString());
 	}
-	QaConditionForm.setPossibleItems(lvBeans);
+	QaConditionForm.setPossibleItems(possibleItems);
     }
 
     /**
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaConditionForm.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r50e67f677a0db400bbd8eeba754c0e31971d05fb
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaConditionForm.java	(.../QaConditionForm.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaConditionForm.java	(.../QaConditionForm.java)	(revision 50e67f677a0db400bbd8eeba754c0e31971d05fb)
@@ -22,7 +22,8 @@
 
 package org.lamsfoundation.lams.tool.qa.web.form;
 
-import org.apache.struts.util.LabelValueBean;
+import java.util.Map;
+
 import org.lamsfoundation.lams.tool.qa.QaCondition;
 import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO;
 import org.lamsfoundation.lams.web.TextSearchForm;
@@ -37,7 +38,7 @@
     /**
      * Names of the questions that could be selected by a user.
      */
-    private LabelValueBean[] possibleItems;
+    private Map<String, String> possibleItems;
     /**
      * Numbers of questions that were selected by a user.
      */
@@ -69,11 +70,11 @@
 	setSelectedItems(selectedItems);
     }
 
-    public LabelValueBean[] getPossibleItems() {
+    public Map<String, String> getPossibleItems() {
 	return possibleItems;
     }
 
-    public void setPossibleItems(LabelValueBean[] possibleItems) {
+    public void setPossibleItems(Map<String, String> possibleItems) {
 	this.possibleItems = possibleItems;
     }
 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java
===================================================================
diff -u -r658034e7f07579dd682db62112b9353b3a0d3f65 -r50e67f677a0db400bbd8eeba754c0e31971d05fb
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 50e67f677a0db400bbd8eeba754c0e31971d05fb)
@@ -360,7 +360,7 @@
      *
      */
     @RequestMapping(value = "/start")
-    private String start(@ModelAttribute ResourceForm startForm, HttpServletRequest request) throws ServletException {
+    private String start(@ModelAttribute("startForm") ResourceForm startForm, HttpServletRequest request) throws ServletException {
 
 	ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request);
 	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
@@ -438,12 +438,11 @@
 	sessionMap.put(ResourceConstants.ATTR_RESOURCE_FORM, startForm);
 	request.getSession().setAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL,
 		request.getParameter(AttributeNames.PARAM_NOTIFY_CLOSE_URL));
-	request.setAttribute("startForm", startForm);
 	return "pages/authoring/start";
     }
 
     @RequestMapping("/definelater")
-    private String defineLater(@ModelAttribute ResourceForm startForm, HttpServletRequest request)
+    private String defineLater(@ModelAttribute("startForm") ResourceForm startForm, HttpServletRequest request)
 	    throws ServletException {
 
 	Long contentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
@@ -544,7 +543,7 @@
      */
 
     @RequestMapping("/init")
-    private String initPage(@ModelAttribute ResourceForm startForm, HttpServletRequest request)
+    private String initPage(@ModelAttribute("startForm") ResourceForm startForm, HttpServletRequest request)
 	    throws ServletException {
 	String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
@@ -576,7 +575,7 @@
      * @throws ServletException
      */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
-    private String updateContent(@ModelAttribute ResourceForm authoringForm, HttpServletRequest request)
+    private String updateContent(@ModelAttribute("authoringForm") ResourceForm authoringForm, HttpServletRequest request)
 	    throws Exception {
 
 	// get back sessionMAP
@@ -689,7 +688,6 @@
 	authoringForm.setResource(resourcePO);
 
 	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
-	request.setAttribute("authoringForm", authoringForm);
 
 	return "pages/authoring/authoring";
     }
Index: lams_tool_larsrc/web/pages/monitoring/userlist.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r50e67f677a0db400bbd8eeba754c0e31971d05fb
--- lams_tool_larsrc/web/pages/monitoring/userlist.jsp	(.../userlist.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/pages/monitoring/userlist.jsp	(.../userlist.jsp)	(revision 50e67f677a0db400bbd8eeba754c0e31971d05fb)
@@ -15,7 +15,7 @@
  	<!-- ********************  javascript ********************** -->
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="<c:url page='/includes/javascript/rsrccommon.js'/>"></script>
+	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/rsrccommon.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script> 
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script> 
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-pager.js"></script>