Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r5415f5a05320eb3f012acf7b04b3f233fcdce0a8 -r48128af9b0290850d39820855500d2958ee025e5
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r5415f5a05320eb3f012acf7b04b3f233fcdce0a8 -r48128af9b0290850d39820855500d2958ee025e5
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -r2e7ad0d4b63846a4e5d7cfaa7d6a8aaab327af65 -r48128af9b0290850d39820855500d2958ee025e5
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 2e7ad0d4b63846a4e5d7cfaa7d6a8aaab327af65)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 48128af9b0290850d39820855500d2958ee025e5)
@@ -1026,13 +1026,13 @@
 		
 		for(var i=0; i<bMappings.length; i++)
 			if(bMappings[i].branchingActivity.activityUIID == activityUIID || bMappings[i].sequenceActivity.activityUIID == activityUIID) {
-				if(bMappings[i] instanceof GroupBranchActivityEntry &&  bMappings[i].branchingActivity.activityTypeID == Activity.GROUP_BRANCHING_ACTIVITY_TYPE)	
+				if(bMappings[i] instanceof GroupBranchActivityEntry && bMappings[i].isGroupType)
 					myMappings.groupBased.push(bMappings[i]);
-				else if(bMappings[i] instanceof GroupBranchActivityEntry &&  bMappings[i].branchingActivity.activityTypeID == Activity.CHOSEN_BRANCHING_ACTIVITY_TYPE)
+				else if(bMappings[i] instanceof GroupBranchActivityEntry && !bMappings[i].isGroupType)
 					myMappings.choosenBased.push(bMappings[i]);
 				else if(bMappings[i] instanceof ToolOutputBranchActivityEntry)
 					myMappings.toolBased.push(bMappings[i]);
-				else 
+				else
 					myMappings.uncategorised.push(bMappings[i]);
 				
 				myMappings.all.push(bMappings[i]);
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GroupBranchActivityEntry.as
===================================================================
diff -u -r569040a69574de6e225967aed31288da54936850 -r48128af9b0290850d39820855500d2958ee025e5
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GroupBranchActivityEntry.as	(.../GroupBranchActivityEntry.as)	(revision 569040a69574de6e225967aed31288da54936850)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GroupBranchActivityEntry.as	(.../GroupBranchActivityEntry.as)	(revision 48128af9b0290850d39820855500d2958ee025e5)
@@ -31,13 +31,14 @@
 class GroupBranchActivityEntry extends BranchActivityEntry {
 	
 	private var _group:Group;
+	private var _isGroupType:Boolean;
 	
 	function GroupBranchActivityEntry(entryID:Number, entryUIID:Number, group:Group, sequenceActivity:SequenceActivity, branchingActivity:BranchingActivity){
 		this.entryID = entryID;
 		this.entryUIID = entryUIID;
 		this.sequenceActivity = sequenceActivity;
 		this.branchingActivity = branchingActivity;
-		
+		this.isGroupType = (branchingActivity.activityTypeID == Activity.GROUP_BRANCHING_ACTIVITY_TYPE);
 		this.group = group;
 	}
 	
@@ -64,6 +65,14 @@
 	
 	public function get groupName():String {
 		return _group.groupName;
+	}
+	
+	public function set isGroupType(a:Boolean) {
+		_isGroupType = a;
+	}
+	
+	public function get isGroupType():Boolean {
+		return _isGroupType;
 	}
 
 }
\ No newline at end of file