diff --git a/editor.js b/editor.js
index d86abdd..0330a2b 100644
--- a/editor.js
+++ b/editor.js
@@ -93,7 +93,7 @@ workflow.states.forEach(st => {
 
 initState.stateData.viewerNames = initiators;
 
-const ALL_VIEW = "All Roles";
+const ALL_VIEW = "Not explicitly specified";
 if (viewableByAll.length > 0) {
   viewers.push(ALL_VIEW);
   var viewerNames = []
@@ -325,8 +325,10 @@ function getNodeColour(node) {
 
 function isHighlightedEdge(edge) {
   var data = edge.actionData
-  var selectedRole = data.mode != 'automatic' && (data.actorNames.includes(selectedActor.value) || data.viewerNames.includes(selectedViewer.value))
-  return selectedRole || (data.mode === 'automatic' && highlightedTargets.includes(edge.source.id));
+  var isViewer    = data.viewerNames.includes(selectedViewer.value)
+  var isActor     = data.mode != 'automatic' && data.actorNames.includes(selectedActor.value)
+  var isActorAuto = data.mode == 'automatic' && highlightedTargets.includes(edge.source.id)
+  return isViewer || isActor || isActorAuto;
 }
 
 function getEdgeColour(edge) {