Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/ContributeActivitiesProcessor.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/ContributeActivitiesProcessor.java,v
diff -u -r1.7 -r1.8
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/ContributeActivitiesProcessor.java	28 Apr 2014 12:05:55 -0000	1.7
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/ContributeActivitiesProcessor.java	29 Jul 2014 19:16:55 -0000	1.8
@@ -98,8 +98,9 @@
 	ContributeActivityDTO dto = null;
 	// always attempt to get a dto, as some branching activities require contribution.
 	dto = ContributeDTOFactory.getContributeActivityDTO(lessonID, activity, toolService, currentActivityList);
-
-	currentActivityList = (Vector<ContributeActivityDTO>) activityListStack.pop();
+	Vector<ContributeActivityDTO> topActivityList = (Vector<ContributeActivityDTO>) activityListStack.pop();
+	topActivityList.addAll(currentActivityList);
+	currentActivityList = topActivityList;
 	if (dto != null) {
 	    currentActivityList.add(dto);
 	}
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v
diff -u -r1.118 -r1.119
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	20 Jun 2014 17:35:21 -0000	1.118
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	29 Jul 2014 19:16:55 -0000	1.119
@@ -1100,7 +1100,25 @@
 	responseJSON.put("activities", new JSONArray(activitiesMap.values()));
 	responseJSON.put("numberPossibleLearners", lessonDetails.getNumberPossibleLearners());
 	List<ContributeActivityDTO> contributeActivities = getContributeActivities(lessonId, true);
+	// remove "attention required" marker for hidden activities in Flash Authoring
 	if (contributeActivities != null) {
+	    Iterator<ContributeActivityDTO> activityIterator = contributeActivities.iterator();
+	    while (activityIterator.hasNext()) {
+		ContributeActivityDTO contributeActivityDTO = activityIterator.next();
+		Activity contributeActivity = monitoringService.getActivityById(contributeActivityDTO.getActivityID());
+		Activity topParentActivity = contributeActivity.getParentActivity() == null ? null : contributeActivity
+			.getParentActivity().getParentActivity();
+
+		if ((branchingActivityId == null)
+			&& (topParentActivity != null)
+			&& (topParentActivity.isBranchingActivity() || topParentActivity
+				.isOptionsWithSequencesActivity())) {
+		    JSONObject topContributeActivityJSON = activitiesMap.get(topParentActivity.getActivityId());
+		    if (!Boolean.TRUE.equals(JsonUtil.opt(topContributeActivityJSON, "flaFormat"))) {
+			activityIterator.remove();
+		    }
+		}
+	    }
 	    Gson gson = new GsonBuilder().create();
 	    responseJSON.put("contributeActivities", new JSONArray(gson.toJson(contributeActivities)));
 	}
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/includes/javascript/monitorLesson.js,v
diff -u -r1.44 -r1.45
--- lams_monitoring/web/includes/javascript/monitorLesson.js	30 Jun 2014 09:23:37 -0000	1.44
+++ lams_monitoring/web/includes/javascript/monitorLesson.js	29 Jul 2014 19:16:55 -0000	1.45
@@ -816,7 +816,8 @@
 			$.each(response.activities, function(activityIndex, activity){
 				addActivityIconsHandlers(activity);
 				
-				if (activity.url || (activity.isBranching && !activity.flaFormat)) {
+				var isBranching = [10,11,12,13].indexOf(activity.type) > -1;
+				if (activity.url || (isBranching && !activity.flaFormat)) {
 					// find the activity in SVG
 					var coord = getActivityCoordinates(activity);
 					if (!coord || !coord.elem) {
@@ -826,7 +827,7 @@
 					var activityElems = [coord.elem],
 						dblClickFunction = 
 							// different behaviour for regular/branching activities
-							activity.isBranching ? 
+							isBranching ? 
 							function(){ showBranchingSequence(activity.id); }
 							:
 							function(){