Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -r5c5f0b9b919241a47311827fff78276693cb7933 -re3f31032a79214a1a2d51cb28c89daaa7f9e01f1
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 5c5f0b9b919241a47311827fff78276693cb7933)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision e3f31032a79214a1a2d51cb28c89daaa7f9e01f1)
@@ -598,12 +598,13 @@
 		return (transObj.out == null) ? activityUIID : getLastActivityUIID(transObj.out.toUIID);
 	}
 	
-	public function getDownstreamToolActivities():Array {
+	public function getDownstreamActivities(_class):Array {
 		var _activity;
 		var _activityUIID:Number = selectedItem.activity.activityUIID;
 		var tActivities:Array = new Array();
 		
-		tActivities.addItem({label: "--Selection--", data: 0});
+		if(_class == ToolActivity)
+			tActivities.addItem({label: "--Selection--", data: 0});	 // TODO: Label required
 		
 		while(_activityUIID != null) {
 			
@@ -612,10 +613,12 @@
 			_activity = (transObj.into != null) ? _cv.ddm.getActivityByUIID(transObj.into.fromUIID) : null;
 			
 			if(_activity != null) {
-				if(_activity instanceof ToolActivity) {
-					tActivities.addItem({label: _activity.title, data: _activity.activityUIID});
+				if(_activity instanceof _class) {
+					if(_class == ToolActivity) tActivities.addItem({label: _activity.title, data: _activity.activityUIID});
+					else tActivities.addItem({label: _activity.title, data: _activity});
 				} else if(_activity instanceof ComplexActivity) {
-					getToolActivitiesFromComplex(_activity.activityUIID, tActivities);
+					if(!_activity.isOptionalActivity() && !_activity.isSequenceActivity())
+						getActivitiesFromComplexByClass(_activity.activityUIID, tActivities, _class);
 				}
 			}
 			
@@ -625,14 +628,16 @@
 		return tActivities;
 	}
 	
-	private function getToolActivitiesFromComplex(complexUIID, toolActs:Array):Void {
+	private function getActivitiesFromComplexByClass(complexUIID, tActs:Array, _class):Void {
 		var children:Array = getCanvas().ddm.getComplexActivityChildren(complexUIID);
 		
 		for(var i=0; i<children.length; i++) {
-			if(children[i] instanceof ToolActivity)
-				toolActs.addItem({label: children[i].title, data: children[i].activityUIID});
+			if(children[i] instanceof _class)
+				if(_class == ToolActivity) tActs.addItem({label: children[i].title, data: children[i].activityUIID});
+				else tActs.addItem({label: children[i].title, data: children[i]});
 			else if(children[i] instanceof ComplexActivity)
-				getToolActivitiesFromComplex(children[i].activityUIID, toolActs);
+				if(!children[i].isOptionalActivity() && !children[i].isSequenceActivity())
+					getActivitiesFromComplexByClass(children[i].activityUIID, tActs, _class);
 		}
 
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
diff -u -rae94dcab20b0633859c1e33b0b0a8aca29b83ec3 -re3f31032a79214a1a2d51cb28c89daaa7f9e01f1
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision ae94dcab20b0633859c1e33b0b0a8aca29b83ec3)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision e3f31032a79214a1a2d51cb28c89daaa7f9e01f1)
@@ -481,8 +481,9 @@
 			showToolBasedBranchingControls(v, e);
 			
 			if(toolActs_cmb.visible) {
-				toolActs_cmb.dataProvider = _canvasModel.getDownstreamToolActivities();
 				
+				toolActs_cmb.dataProvider = _canvasModel.getDownstreamActivities(ToolActivity);
+				
 				if(_canvasModel.selectedItem.activity.toolActivityUIID != null) {
 					var dp = toolActs_cmb.dataProvider;
 				
@@ -806,16 +807,18 @@
 	}
 	
 	private function getGroupingActivitiesDP(){
-		var gActs = _canvasModel.getCanvas().ddm.getGroupingActivities();
+		var gActs:Array = _canvasModel.getDownstreamActivities(GroupingActivity);
+		Debugger.log("grouping acts len: " + gActs.length, Debugger.CRITICAL, "getGroupingActivitiesDP", "PIC");
+		
 		var gActsDP = new Array();
 		var ga = _canvasModel.selectedItem.activity;
 		var g = _canvasModel.getCanvas().ddm.getGroupingByUIID(ga.createGroupingUIID);
 		
-		gActsDP.push({label:Dictionary.getValue('pi_no_grouping'),data:null});
+		gActsDP.push({label:Dictionary.getValue('pi_no_grouping'), data:null});
 		
 		for(var i=0; i<gActs.length;i++){
-			if (ga.createGroupingUIID != gActs[i].createGroupingUIID){
-				gActsDP.push({label:gActs[i].title,data:gActs[i]});
+			if (ga.createGroupingUIID != gActs[i].data.createGroupingUIID){
+				gActsDP.push({label:gActs[i].label, data:gActs[i].data});
 			}
 		}
 		
@@ -973,7 +976,7 @@
 			showAppliedGroupingControls(false);
 		
 			if(toolActs_cmb.visible) {
-				toolActs_cmb.dataProvider = _canvasModel.getDownstreamToolActivities();
+				toolActs_cmb.dataProvider = _canvasModel.getDownstreamActivities(ToolActivity);
 				for(var i=0; i < toolActs_cmb.dataProvider.length; i++)
 					selectToolActivityItem(i, toolActs_cmb.dataProvider[i].data);
 			}