Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java
===================================================================
diff -u -rc856a18bf4731ff3a9ba197b01e278b65549acb0 -r777fe5cc6b9431c87be6665efdd098d3bda5af88
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java	(.../LearningAction.java)	(revision c856a18bf4731ff3a9ba197b01e278b65549acb0)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java	(.../LearningAction.java)	(revision 777fe5cc6b9431c87be6665efdd098d3bda5af88)
@@ -471,10 +471,10 @@
 			errors.add(SurveyConstants.ERROR_MSG_KEY+ question.getUid(),new ActionMessage(SurveyConstants.ERROR_MSG_MANDATORY_QUESTION));
 		}
 		if(question.getType() == SurveyConstants.QUESTION_TYPE_SINGLE_CHOICE
-				&& question.isAppendText()){
+				&& question.isAppendText() && answer != null){
 			//for single choice, user only can choose one option or open text (if it has)
-			if(!StringUtils.isBlank(question.getAnswer().getAnswerChoices())
-				&& !StringUtils.isBlank(question.getAnswer().getAnswerText())){
+			if(!StringUtils.isBlank(answer.getAnswerChoices())
+				&& !StringUtils.isBlank(answer.getAnswerText())){
 				errors.add(SurveyConstants.ERROR_MSG_KEY+ question.getUid(),new ActionMessage(SurveyConstants.ERROR_MSG_SINGLE_CHOICE));
 			}
 		}
Index: lams_tool_survey/web/pages/authoring/definelater.jsp
===================================================================
diff -u -r7edc98d2bd39271f55fdde6980e1ad9c165c3f8a -r777fe5cc6b9431c87be6665efdd098d3bda5af88
--- lams_tool_survey/web/pages/authoring/definelater.jsp	(.../definelater.jsp)	(revision 7edc98d2bd39271f55fdde6980e1ad9c165c3f8a)
+++ lams_tool_survey/web/pages/authoring/definelater.jsp	(.../definelater.jsp)	(revision 777fe5cc6b9431c87be6665efdd098d3bda5af88)
@@ -76,8 +76,6 @@
 			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=SurveyConstants.TOOL_SIGNATURE%>" 
 				toolContentID="${formBean.survey.contentId}"  accessMode="teacher" defineLater="yes"  
 				customiseSessionID="${formBean.sessionMapID}" contentFolderID="${formBean.contentFolderID}"/>
-
-			<lams:HTMLEditor />
 		</div>
 
 
Index: lams_tool_survey/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -r777fe5cc6b9431c87be6665efdd098d3bda5af88
--- lams_tool_survey/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 0020cbe23ed34775811ceab0779d065243444dcb)
+++ lams_tool_survey/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 777fe5cc6b9431c87be6665efdd098d3bda5af88)
@@ -30,6 +30,7 @@
 				<c:when test='${isPageEditable == "true"}'>
 					<c:url  var="authoringUrl" value="/definelater.do">
 						<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
+						<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
 					</c:url>
 					<html:link href="${authoringUrl}" styleClass="button" target="_blank">
 						<fmt:message key="label.monitoring.edit.activity.edit" />
Index: lams_tool_survey/web/pages/monitoring/statistic.jsp
===================================================================
diff -u -r103eacc68afe9e0df0c7bae49c482eb34873165a -r777fe5cc6b9431c87be6665efdd098d3bda5af88
--- lams_tool_survey/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision 103eacc68afe9e0df0c7bae49c482eb34873165a)
+++ lams_tool_survey/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision 777fe5cc6b9431c87be6665efdd098d3bda5af88)
@@ -1,6 +1,5 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
-<c:set var="summaryList" value="${sessionMap.summaryList}"/>
 <c:set var="tool"><lams:WebAppURL/></c:set>
 
 <table  class="alternative-color">
@@ -12,13 +11,11 @@
 			<fmt:message key="label.number.learners"/>
 		</th>
 	</tr>
-	<c:forEach var="entry" items="${statistic}">
+	<c:forEach var="entry" items="${sessionMap.statistic}">
 		<c:set var="session" value="${entry.key}"/>
 		<c:set var="usersInSession" value="${entry.value}"/>
 		<tr>
 			<td>${session.sessionName}</td>
-		</tr>
-		<tr>
 			<td>${usersInSession}</td>
 		</tr>
 	</c:forEach>