Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java
===================================================================
diff -u -ra2d72bee6029b7e05e8cd696c02db214f3049365 -r108298de22e3e3cb17e2cf409fca09ae68da8491
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java	(.../TaskListServiceImpl.java)	(revision a2d72bee6029b7e05e8cd696c02db214f3049365)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java	(.../TaskListServiceImpl.java)	(revision 108298de22e3e3cb17e2cf409fca09ae68da8491)
@@ -144,7 +144,7 @@
     @Override
     public TaskListItemAttachment uploadTaskListItemFile(MultipartFile uploadFile, TaskListUser user)
 	    throws UploadTaskListFileException {
-	if ((uploadFile == null) || StringUtils.isEmpty(uploadFile.getName())) {
+	if ((uploadFile == null) || StringUtils.isEmpty(uploadFile.getOriginalFilename())) {
 	    throw new UploadTaskListFileException(
 		    messageService.getMessage("error.msg.upload.file.not.found", new Object[] { uploadFile }));
 	}
@@ -156,7 +156,7 @@
 	TaskListItemAttachment file = new TaskListItemAttachment();
 	file.setFileUuid(nodeKey.getUuid());
 	file.setFileVersionId(nodeKey.getVersion());
-	file.setFileName(uploadFile.getName());
+	file.setFileName(uploadFile.getOriginalFilename());
 	file.setCreated(new Timestamp(new Date().getTime()));
 	file.setCreateBy(user);
 
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java
===================================================================
diff -u -rf33abf1a2f52fc5a168127033f927174d83a2124 -r108298de22e3e3cb17e2cf409fca09ae68da8491
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision f33abf1a2f52fc5a168127033f927174d83a2124)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 108298de22e3e3cb17e2cf409fca09ae68da8491)
@@ -566,7 +566,7 @@
 	return switchItem(request, false);
     }
 
-    public String switchItem(HttpServletRequest request, boolean up) {
+    private String switchItem(HttpServletRequest request, boolean up) {
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, TaskListConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java
===================================================================
diff -u -r579445ba580e31e063651a7d7aade5037c6262f8 -r108298de22e3e3cb17e2cf409fca09ae68da8491
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java	(.../LearningController.java)	(revision 579445ba580e31e063651a7d7aade5037c6262f8)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java	(.../LearningController.java)	(revision 108298de22e3e3cb17e2cf409fca09ae68da8491)
@@ -518,7 +518,7 @@
 
 	MultipartFile file = taskListItemForm.getUploadedFile();
 
-	if (file == null || StringUtils.isBlank(file.getName())) {
+	if (file == null || StringUtils.isBlank(file.getOriginalFilename())) {
 	    return "pages/learning/learning";
 	}
 
Index: lams_tool_task/web/common/messages.jsp
===================================================================
diff -u -rf33abf1a2f52fc5a168127033f927174d83a2124 -r108298de22e3e3cb17e2cf409fca09ae68da8491
--- lams_tool_task/web/common/messages.jsp	(.../messages.jsp)	(revision f33abf1a2f52fc5a168127033f927174d83a2124)
+++ lams_tool_task/web/common/messages.jsp	(.../messages.jsp)	(revision 108298de22e3e3cb17e2cf409fca09ae68da8491)
@@ -1,3 +1,5 @@
+ <%@include file="/common/taglibs.jsp"%>
+ 
  <c:set var="errorKey" value="GLOBAL" />
         <c:if test="${not empty errorMap and not empty errorMap[errorKey]}">
             <lams:Alert id="error" type="danger" close="false">
Index: lams_tool_task/web/pages/authoring/parts/addcondition.jsp
===================================================================
diff -u -r579445ba580e31e063651a7d7aade5037c6262f8 -r108298de22e3e3cb17e2cf409fca09ae68da8491
--- lams_tool_task/web/pages/authoring/parts/addcondition.jsp	(.../addcondition.jsp)	(revision 579445ba580e31e063651a7d7aade5037c6262f8)
+++ lams_tool_task/web/pages/authoring/parts/addcondition.jsp	(.../addcondition.jsp)	(revision 108298de22e3e3cb17e2cf409fca09ae68da8491)
@@ -37,8 +37,8 @@
 		    	<c:forEach var="itemE" items="${taskListConditionForm.possibleItems}">
 		    	<div class="checkbox">
 		    	<label>
-		    	<form:checkbox path="selectedItems" value="${itemE.value}"/>
-		    		<c:out value="${itemE.key}" />
+		    	<form:checkbox path="selectedItems" value="${itemE.key}"/>
+		    		<c:out value="${itemE.value}" />
 		    	</label>
 				</div>
 		    	</c:forEach>