diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index 427f3ca95..46dc60fe2 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -426,8 +426,13 @@ RED.editor = (function() {
             }
         });
 
-        // Set the select value
-        select.val(nodeValue);
+        const optionCount = select.find("option").length
+        if (optionCount === 1) {
+            // We only have the 'add new...' option
+            select.val('_ADD_')
+        } else {
+            select.val(nodeValue);
+        }
     }
 
     /**
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js
index 7f2ed78be..bb9faa0a6 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js
@@ -103,7 +103,7 @@ RED.sidebar.info.outliner = (function() {
                 evt.stopPropagation();
                 RED.search.show("type:subflow:"+n.id);
             })
-            // RED.popover.tooltip(userCountBadge,function() { return RED._('editor.nodesUse',{count:n.users.length})});
+            RED.popover.tooltip(subflowInstanceBadge,function() { return RED._('subflow.subflowInstances',{count:n.instances.length})});
         }
         if (n._def.category === "config" && n.type !== "group") {
             var userCountBadge = $('<button type="button" class="red-ui-info-outline-item-control-users red-ui-button red-ui-button-small"><i class="fa fa-toggle-right"></i></button>').text(n.users.length).appendTo(controls).on("click",function(evt) {