Index: lams_central/web/includes/javascript/authoring/authoringProperty.js
===================================================================
diff -u -r3223802379916b7bb9eef32a8c9c3519b4c19acf -rbcd7980b62ca16ad230dee6712f7112bf9021c70
--- lams_central/web/includes/javascript/authoring/authoringProperty.js	(.../authoringProperty.js)	(revision 3223802379916b7bb9eef32a8c9c3519b4c19acf)
+++ lams_central/web/includes/javascript/authoring/authoringProperty.js	(.../authoringProperty.js)	(revision bcd7980b62ca16ad230dee6712f7112bf9021c70)
@@ -1106,7 +1106,7 @@
 		
 						this.toolActivityUIID = activity.input.uiid;
 						var option = $('<option />')
-									   .text(this.description + suffix)
+									   .text(this.description + ' ' + suffix)
 									   .data('output', this)
 									   .appendTo(outputSelect);
 						// select the output for which mappings were already defined
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rbcd7980b62ca16ad230dee6712f7112bf9021c70
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java	(.../BranchCondition.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java	(.../BranchCondition.java)	(revision bcd7980b62ca16ad230dee6712f7112bf9021c70)
@@ -20,7 +20,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.learningdesign;
 
 import org.apache.commons.lang.builder.CompareToBuilder;
@@ -29,6 +28,7 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.learningdesign.dto.BranchConditionDTO;
+import org.lamsfoundation.lams.tool.OutputType;
 import org.lamsfoundation.lams.tool.ToolOutput;
 import org.lamsfoundation.lams.tool.ToolOutputValue;
 
@@ -218,11 +218,13 @@
 
     /** Is this condition met? */
     public boolean isMet(ToolOutput output) {
-	if (output != null) {
+	ToolOutputValue value = output == null ? null : output.getValue();
+	if (value != null && OutputType.OUTPUT_COMPLEX != value.getType()
+		&& OutputType.OUTPUT_SET_BOOLEAN != value.getType()) {
 	    if (exactMatchValue != null) {
-		return exactMatchMet(output.getValue());
+		return exactMatchMet(value);
 	    } else if (startValue != null || endValue != null) {
-		return inRange(output.getValue());
+		return inRange(value);
 	    }
 	}
 	return false;
Index: lams_common/src/java/org/lamsfoundation/lams/tool/OutputFactory.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rbcd7980b62ca16ad230dee6712f7112bf9021c70
--- lams_common/src/java/org/lamsfoundation/lams/tool/OutputFactory.java	(.../OutputFactory.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/OutputFactory.java	(.../OutputFactory.java)	(revision bcd7980b62ca16ad230dee6712f7112bf9021c70)
@@ -20,7 +20,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool;
 
 import java.util.ArrayList;
@@ -328,7 +327,7 @@
      * using the getDescription() method and set the type to OUTPUT_COMPLEX.
      */
     protected ToolOutputDefinition buildComplexOutputDefinition(String definitionName, Class valueClass) {
-	return buildDefinition(definitionName, OutputType.OUTPUT_COMPLEX, null, null, null, Boolean.FALSE, valueClass);
+	return buildDefinition(definitionName, OutputType.OUTPUT_COMPLEX, null, null, null, Boolean.TRUE, valueClass);
     }
 
     /**
Index: lams_tool_chat/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r332347e8d9ce38f7c451e76818d4e68be9d2dd8c -rbcd7980b62ca16ad230dee6712f7112bf9021c70
--- lams_tool_chat/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 332347e8d9ce38f7c451e76818d4e68be9d2dd8c)
+++ lams_tool_chat/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision bcd7980b62ca16ad230dee6712f7112bf9021c70)
@@ -122,7 +122,8 @@
 monitor.summary.notification  =Notification
 monitor.summary.date.restriction.set  =Deadline has been set
 monitor.summary.date.restriction.removed  =Deadline has been removed
-output.desc.all.users.messages.output.definition.chat  =Each learner's messages sent in the Chat
+output.desc.all.users.messages.output.definition.chat  =All learners' messages sent in the Chat
+output.desc.user.messages.output.definition.chat =Current learner's messages sent in the Chat
 button.submit  =Finish
 label.reflections  =Reflections
 label.chat.options  =Chat options
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -rbcd7980b62ca16ad230dee6712f7112bf9021c70
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java	(.../ChatOutputFactory.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java	(.../ChatOutputFactory.java)	(revision bcd7980b62ca16ad230dee6712f7112bf9021c70)
@@ -20,7 +20,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.chat.service;
 
 import java.util.ArrayList;
@@ -54,19 +53,21 @@
     public SortedMap<String, ToolOutputDefinition> getToolOutputDefinitions(Object toolContentObject,
 	    int definitionType) throws ToolException {
 	SortedMap<String, ToolOutputDefinition> definitionMap = new TreeMap<String, ToolOutputDefinition>();
-	Class stringArrayClass = new String[] {}.getClass();
+
 	switch (definitionType) {
 	    case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_CONDITION:
+		break;
+	    case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_DATA_FLOW:
+		Class stringArrayClass = new String[] {}.getClass();
 		if (toolContentObject != null) {
 		    ToolOutputDefinition chatMessagesDefinition = buildComplexOutputDefinition(
 			    ChatConstants.USER_MESSAGES_DEFINITION_NAME, stringArrayClass);
 		    Chat chat = (Chat) toolContentObject;
 		    // adding all existing conditions
 		    chatMessagesDefinition.setDefaultConditions(new ArrayList<BranchCondition>(chat.getConditions()));
-		    chatMessagesDefinition.setShowConditionNameOnly(true);
 		    definitionMap.put(ChatConstants.USER_MESSAGES_DEFINITION_NAME, chatMessagesDefinition);
 		}
-	    case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_DATA_FLOW:
+
 		ToolOutputDefinition allUsersMessagesDefinition = buildComplexOutputDefinition(
 			ChatConstants.ALL_USERS_MESSAGES_DEFINITION_NAME, stringArrayClass);
 		definitionMap.put(ChatConstants.ALL_USERS_MESSAGES_DEFINITION_NAME, allUsersMessagesDefinition);
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -rbcd7980b62ca16ad230dee6712f7112bf9021c70
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java	(.../ForumOutputFactory.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java	(.../ForumOutputFactory.java)	(revision bcd7980b62ca16ad230dee6712f7112bf9021c70)
@@ -20,7 +20,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.forum.service;
 
 import java.util.ArrayList;
@@ -62,24 +61,24 @@
 	    int definitionType) throws ToolException {
 
 	SortedMap<String, ToolOutputDefinition> definitionMap = new TreeMap<String, ToolOutputDefinition>();
-	Class topicDatesToAnswersClass = (new HashMap<Date, Set<String>>()).getClass();
+
 	Class stringArrayClass = String[].class;
 
 	switch (definitionType) {
 	    case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_CONDITION:
-		if (toolContentObject != null) {
-		    ToolOutputDefinition chosenTopicAnswersDefinition = buildComplexOutputDefinition(
-			    ForumConstants.TOPIC_DATE_TO_ANSWERS_DEFINITION_NAME, topicDatesToAnswersClass);
-		    Forum forum = (Forum) toolContentObject;
-
-		    // adding all existing conditions
-		    chosenTopicAnswersDefinition
-			    .setDefaultConditions(new ArrayList<BranchCondition>(forum.getConditions()));
-
-		    chosenTopicAnswersDefinition.setShowConditionNameOnly(true);
-		    definitionMap.put(ForumConstants.TOPIC_DATE_TO_ANSWERS_DEFINITION_NAME,
-			    chosenTopicAnswersDefinition);
-		}
+//		if (toolContentObject != null) {
+//		    Class topicDatesToAnswersClass = (new HashMap<Date, Set<String>>()).getClass();
+//		    ToolOutputDefinition chosenTopicAnswersDefinition = buildComplexOutputDefinition(
+//			    ForumConstants.TOPIC_DATE_TO_ANSWERS_DEFINITION_NAME, topicDatesToAnswersClass);
+//		    Forum forum = (Forum) toolContentObject;
+//
+//		    // adding all existing conditions
+//		    chosenTopicAnswersDefinition
+//			    .setDefaultConditions(new ArrayList<BranchCondition>(forum.getConditions()));
+//
+//		    definitionMap.put(ForumConstants.TOPIC_DATE_TO_ANSWERS_DEFINITION_NAME,
+//			    chosenTopicAnswersDefinition);
+//		}
 		ToolOutputDefinition numberOfPostsDefinition = buildRangeDefinition(
 			ForumConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, new Long(0), null);
 		definitionMap.put(ForumConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, numberOfPostsDefinition);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rbcd7980b62ca16ad230dee6712f7112bf9021c70
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java	(.../QaOutputFactory.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java	(.../QaOutputFactory.java)	(revision bcd7980b62ca16ad230dee6712f7112bf9021c70)
@@ -20,7 +20,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.qa.service;
 
 import java.util.ArrayList;
@@ -68,26 +67,25 @@
 	    Class stringArrayClass = String[].class;
 	    Class arrayofStringArraysClass = String[][].class;
 	    switch (definitionType) {
-		case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_CONDITION: {
-		    ToolOutputDefinition userAnswersDefinition = buildComplexOutputDefinition(
-			    QaAppConstants.USER_ANSWERS_DEFINITION_NAME, stringArrayClass);
+		case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_CONDITION:
+//		    ToolOutputDefinition userAnswersDefinition = buildComplexOutputDefinition(
+//			    QaAppConstants.USER_ANSWERS_DEFINITION_NAME, stringArrayClass);
+//
+//		    // adding all existing conditions
+//		    userAnswersDefinition
+//			    .setDefaultConditions(new ArrayList<BranchCondition>(qaContent.getConditions()));
+//		    definitionMap.put(QaAppConstants.USER_ANSWERS_DEFINITION_NAME, userAnswersDefinition);
 
-		    // adding all existing conditions
-		    userAnswersDefinition
-			    .setDefaultConditions(new ArrayList<BranchCondition>(qaContent.getConditions()));
-		    userAnswersDefinition.setShowConditionNameOnly(true);
-		    definitionMap.put(QaAppConstants.USER_ANSWERS_DEFINITION_NAME, userAnswersDefinition);
-		}
 		    break;
-		case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_DATA_FLOW: {
+		case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_DATA_FLOW:
 		    ToolOutputDefinition groupAnswersDefinition = buildComplexOutputDefinition(
 			    QaAppConstants.GROUP_ANSWERS_DEFINITION_NAME, arrayofStringArraysClass);
 		    definitionMap.put(QaAppConstants.GROUP_ANSWERS_DEFINITION_NAME, groupAnswersDefinition);
 
 		    ToolOutputDefinition questionsDefinition = buildComplexOutputDefinition(
 			    QaAppConstants.QUESTIONS_DEFINITION_NAME, stringArrayClass);
 		    definitionMap.put(QaAppConstants.QUESTIONS_DEFINITION_NAME, questionsDefinition);
-		}
+
 		    break;
 	    }
 	}
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyOutputFactory.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rbcd7980b62ca16ad230dee6712f7112bf9021c70
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyOutputFactory.java	(.../SurveyOutputFactory.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyOutputFactory.java	(.../SurveyOutputFactory.java)	(revision bcd7980b62ca16ad230dee6712f7112bf9021c70)
@@ -20,7 +20,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.survey.service;
 
 import java.util.ArrayList;
@@ -58,17 +57,22 @@
     public SortedMap<String, ToolOutputDefinition> getToolOutputDefinitions(Object toolContentObject,
 	    int definitionType) throws ToolException {
 	SortedMap<String, ToolOutputDefinition> definitionMap = new TreeMap<String, ToolOutputDefinition>();
-	Class stringArrayClass = new String[] {}.getClass();
-	if (toolContentObject != null) {
-	    ToolOutputDefinition allAnswersDefinition = buildComplexOutputDefinition(
-		    SurveyConstants.TEXT_SEARCH_DEFINITION_NAME, stringArrayClass);
-	    Survey survey = (Survey) toolContentObject;
+	switch (definitionType) {
+	    case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_CONDITION:
+		break;
+	    case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_DATA_FLOW:
+		Class stringArrayClass = new String[] {}.getClass();
+		if (toolContentObject != null) {
+		    ToolOutputDefinition allAnswersDefinition = buildComplexOutputDefinition(
+			    SurveyConstants.TEXT_SEARCH_DEFINITION_NAME, stringArrayClass);
+		    Survey survey = (Survey) toolContentObject;
 
-	    // adding all existing conditions
-	    allAnswersDefinition.setDefaultConditions(new ArrayList<BranchCondition>(survey.getConditions()));
+		    // adding all existing conditions
+		    allAnswersDefinition.setDefaultConditions(new ArrayList<BranchCondition>(survey.getConditions()));
 
-	    allAnswersDefinition.setShowConditionNameOnly(true);
-	    definitionMap.put(SurveyConstants.TEXT_SEARCH_DEFINITION_NAME, allAnswersDefinition);
+		    definitionMap.put(SurveyConstants.TEXT_SEARCH_DEFINITION_NAME, allAnswersDefinition);
+		}
+		break;
 	}
 
 	return definitionMap;
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListOutputFactory.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rbcd7980b62ca16ad230dee6712f7112bf9021c70
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListOutputFactory.java	(.../TaskListOutputFactory.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListOutputFactory.java	(.../TaskListOutputFactory.java)	(revision bcd7980b62ca16ad230dee6712f7112bf9021c70)
@@ -85,8 +85,6 @@
 			condition.getName(), OutputType.OUTPUT_BOOLEAN.toString(), null, null, trueString));
 	    }
 
-	    definition.setShowConditionNameOnly(Boolean.TRUE);
-
 	    definitionMap.put(OUTPUT_NAME_TOOL_CONDITION, definition);
 	}
 
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteOutputFactory.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rbcd7980b62ca16ad230dee6712f7112bf9021c70
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteOutputFactory.java	(.../VoteOutputFactory.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteOutputFactory.java	(.../VoteOutputFactory.java)	(revision bcd7980b62ca16ad230dee6712f7112bf9021c70)
@@ -96,7 +96,6 @@
 			    VoteUtils.stripHTML(nomination.getQuestion()), OutputType.OUTPUT_BOOLEAN.toString(), null,
 			    null, trueString));
 		}
-		definition.setShowConditionNameOnly(Boolean.TRUE);
 
 		definitionMap.put(VoteOutputFactory.OUTPUT_NAME_NOMINATION_SELECTION, definition);
 	    }