diff --git a/meshuser.js b/meshuser.js
index db19aea3..9e4e3baf 100644
--- a/meshuser.js
+++ b/meshuser.js
@@ -4966,7 +4966,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                 if ((mesh == null) || (mesh.mtype != 1) || (parent.GetMeshRights(user, command.meshid) & MESHRIGHT_EDITMESH) == 0) return null; // This user must have mesh rights to edit the device group
                 var amtDevices = [];
 
-                // Decode a JSON file from the Intel EMA migration tool
+                // Decode a JSON file from the Intel SCS migration tool
                 if ((typeof command.amtdevices == 'object') && (typeof command.amtdevices.ApplicationData == 'object') && (command.amtdevices.ApplicationData.Application == 'Intel EMA Migration Tool') && (Array.isArray(command.amtdevices['Managed Systems']))) {
                     for (var i in command.amtdevices['Managed Systems']) {
                         const importDev = command.amtdevices['Managed Systems'][i];
diff --git a/views/default.handlebars b/views/default.handlebars
index 6254e752..5d19d59a 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -5413,8 +5413,10 @@
             for (var i = 0; i < elements.length; i++) { elements[i].checked = (checkcount == 0); }
             checkedNodeids = {};
             if (checkcount == 0) {
+                checkedNodeids = {};
                 var devdivs = document.getElementsByName('xxdevice' + Q('viewselect').value);
-                for (var i = 0; i < devdivs.length; i++) { checkedNodeids[devdivs[i].id.substring(3)] = 1; }
+                // Checking that the parent style is null will insure that "select all" does not select any devices in collapsed groups
+                for (var i = 0; i < devdivs.length; i++) { if ((devdivs[i].parentElement.attributes.style == null) || (devdivs[i].parentElement.attributes.style.value.indexOf('display') < 0)) { checkedNodeids[devdivs[i].id.substring(3)] = 1; } }
             }
             p1updateInfo();
         }