Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
===================================================================
diff -u -r9012873415698350686bf05ac1ddb1ee5b8fe154 -re560e8fb05ce0177944509fedc06275ba2d2a060
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java	(.../EditQbQuestionController.java)	(revision 9012873415698350686bf05ac1ddb1ee5b8fe154)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java	(.../EditQbQuestionController.java)	(revision e560e8fb05ce0177944509fedc06275ba2d2a060)
@@ -227,18 +227,16 @@
 	}
 
 	if (isRequestCameFromTool) {
-	    //forward to Assessment controller
-	    String params = "?qbQuestionUid=" + qbQuestion.getUid();
-	    params += "&questionModificationStatus=" + questionModificationStatus;
+	    //redirect to Assessment controller
+	    String url = "redirect:" + Configuration.get(ConfigurationKeys.SERVER_URL)
+		    + "tool/laasse10/authoring/saveOrUpdateReference.do";
+	    url = WebUtil.appendParameterToURL(url, "uid", String.valueOf(form.getUid()));
+	    url = WebUtil.appendParameterToURL(url, "sessionMapID", String.valueOf(form.getSessionMapID()));
+	    url = WebUtil.appendParameterToURL(url, "qbQuestionUid", String.valueOf(qbQuestion.getUid()));
+	    url = WebUtil.appendParameterToURL(url, "questionModificationStatus",
+		    String.valueOf(questionModificationStatus));
 
-	    String serverURLContextPath = Configuration.get(ConfigurationKeys.SERVER_URL_CONTEXT_PATH);
-	    serverURLContextPath = serverURLContextPath.startsWith("/") ? serverURLContextPath
-		    : "/" + serverURLContextPath;
-	    serverURLContextPath += serverURLContextPath.endsWith("/") ? "" : "/";
-	    applicationcontext.getServletContext().getContext(serverURLContextPath + "tool/laasse10/")
-		    .getRequestDispatcher("/authoring/saveOrUpdateReference.do" + params).forward(request, response);
-	    return null;
-
+	    return url;
 	} else {
 	    return "forward:returnQuestionUid.do?qbQuestionUid=" + qbQuestion.getUid();
 	}