Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r0d2b62ff5f1e06568936567798a8e53c1c15eeec -r2e7ad0d4b63846a4e5d7cfaa7d6a8aaab327af65
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r0d2b62ff5f1e06568936567798a8e53c1c15eeec -r2e7ad0d4b63846a4e5d7cfaa7d6a8aaab327af65
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -r4ae57947df368bd25c092641c8f657428315bf5e -r2e7ad0d4b63846a4e5d7cfaa7d6a8aaab327af65
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 4ae57947df368bd25c092641c8f657428315bf5e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 2e7ad0d4b63846a4e5d7cfaa7d6a8aaab327af65)
@@ -1125,7 +1125,7 @@
 			
 			if(target != null && hub != null){
 					break;
-			}else{
+			} else {
 				if(br[i].targetUIID == UIID){
 					target = br[i];
 				}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
diff -u -r0e358cf18fdd575332dd032561ac08416f5e7a6e -r2e7ad0d4b63846a4e5d7cfaa7d6a8aaab327af65
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 0e358cf18fdd575332dd032561ac08416f5e7a6e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 2e7ad0d4b63846a4e5d7cfaa7d6a8aaab327af65)
@@ -1159,19 +1159,11 @@
 	}
 	
 	private function groupMatchDialogLoaded(evt:Object) {
-		var branches:Object = _canvasModel.getCanvas().ddm.getBranchesForActivityUIID(_canvasModel.selectedItem.activity.activityUIID);
 		var grouping = _canvasModel.getCanvas().ddm.getGroupingByUIID(_canvasModel.selectedItem.activity.groupingUIID);
 		
 		evt.target.scrollContent.branchingActivity = BranchingActivity(_canvasModel.selectedItem.activity);
-		evt.target.scrollContent.groups = grouping.getGroups(_canvasModel.getCanvas().ddm);
-		
-		var validBranches:Array = getValidBranches(branches.myBranches);
-		
-		if(validBranches.length > 0)
-			evt.target.scrollContent.branches = validBranches;
-		else
-			evt.target.scrollContent.sequences = getValidSequences(_canvasModel.getCanvas().ddm.getComplexActivityChildren(_canvasModel.selectedItem.activity.activityUIID));
-			
+		evt.target.scrollContent.groups = grouping.getGroups(_canvasModel.getCanvas().ddm);
+		evt.target.scrollContent.sequences = getValidSequences(_canvasModel.getCanvas().ddm.getComplexActivityChildren(_canvasModel.selectedItem.activity.activityUIID));
 		evt.target.scrollContent.loadLists();
 		
 	}
@@ -1187,22 +1179,15 @@
 	}
 	
 	private function ConditionMatchDialogLoaded(evt:Object) {
-		var branches:Object = _canvasModel.getCanvas().ddm.getBranchesForActivityUIID(_canvasModel.selectedItem.activity.activityUIID);
 		var conditions:Array = _canvasModel.getCanvas().ddm.getAllConditionsForToolOutput(BranchingActivity(_canvasModel.selectedItem.activity));
 		
 		evt.target.scrollContent.branchingActivity = BranchingActivity(_canvasModel.selectedItem.activity);
 		evt.target.scrollContent.conditions = conditions;
-		
-		var validBranches:Array = getValidBranches(branches.myBranches);
-		
-		if(validBranches.length > 0)
-			evt.target.scrollContent.branches = validBranches;
-		else
-			evt.target.scrollContent.sequences = getValidSequences(_canvasModel.getCanvas().ddm.getComplexActivityChildren(_canvasModel.selectedItem.activity.activityUIID));
-			
+		evt.target.scrollContent.sequences = getValidSequences(_canvasModel.getCanvas().ddm.getComplexActivityChildren(_canvasModel.selectedItem.activity.activityUIID));
 		evt.target.scrollContent.loadLists();
 	}
-	
+	
+	/**
 	private function getValidBranches(branches:Array):Array {
 		Debugger.log("validating br len: " + branches.length, Debugger.CRITICAL, "getvalidbranches", "PIC*");
 		
@@ -1218,6 +1203,7 @@
 		
 		return branches;
 	}
+	*/
 	
 	private function getValidSequences(seqs:Array):Array {
 		Debugger.log("validating seqs len: " + seqs.length, Debugger.CRITICAL, "getvalidsequences", "PIC*");
@@ -1229,6 +1215,9 @@
 			if(sequence.isDefault && sequence.empty) {
 				seqs.splice(i, 1);
 				i=i-1;
+			} else if(!sequence.empty && sequence.firstActivityUIID == null) {
+				seqs.splice(i, 1);
+				i=i-1;
 			}
 		}