diff --git a/esp/src/package-lock.json b/esp/src/package-lock.json
index 42a17c1b2cc..578c7b1cbfa 100644
--- a/esp/src/package-lock.json
+++ b/esp/src/package-lock.json
@@ -18,7 +18,7 @@
         "@hpcc-js/chart": "2.83.4",
         "@hpcc-js/codemirror": "2.62.1",
         "@hpcc-js/common": "2.71.18",
-        "@hpcc-js/comms": "2.93.0",
+        "@hpcc-js/comms": "2.94.0",
         "@hpcc-js/dataflow": "8.1.7",
         "@hpcc-js/eclwatch": "2.74.8",
         "@hpcc-js/graph": "2.85.16",
@@ -1862,13 +1862,12 @@
       }
     },
     "node_modules/@hpcc-js/comms": {
-      "version": "2.93.0",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/comms/-/comms-2.93.0.tgz",
-      "integrity": "sha512-FZBiLiraUFGoSnYB6PUv5zMIHcDbdT2TOzRjHl8CF84UK9C9G6G5L19mYwvVOWKTeuSvwaOyOqeOZ6ELcQObrA==",
-      "license": "Apache-2.0",
+      "version": "2.94.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/comms/-/comms-2.94.0.tgz",
+      "integrity": "sha512-+AfJsqj648638hTUeLYd0Thvu1QMHX9zLflrep2xVtz7Wo1OmOiI/mrjClMqK8A8drMa3AduKuQS1R2rL15wZw==",
       "dependencies": {
-        "@hpcc-js/ddl-shim": "^2.20.7",
-        "@hpcc-js/util": "^2.51.1",
+        "@hpcc-js/ddl-shim": "^2.21.0",
+        "@hpcc-js/util": "^2.52.0",
         "@xmldom/xmldom": "0.8.10",
         "abort-controller": "3.0.0",
         "node-fetch": "2.7.0",
@@ -1877,6 +1876,14 @@
         "undici": "5.28.4"
       }
     },
+    "node_modules/@hpcc-js/comms/node_modules/@hpcc-js/util": {
+      "version": "2.52.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/util/-/util-2.52.0.tgz",
+      "integrity": "sha512-WHm/0ApEdWktpPCUG+AFuMnnrDHOTqKXK2oVgyRUAAQJhSWMFxTJxbqIQG7SM9myK58tXzNJrKsP8huzt8X2dg==",
+      "dependencies": {
+        "tslib": "2.6.3"
+      }
+    },
     "node_modules/@hpcc-js/comms/node_modules/safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -1896,6 +1903,11 @@
         }
       ]
     },
+    "node_modules/@hpcc-js/comms/node_modules/tslib": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ=="
+    },
     "node_modules/@hpcc-js/dataflow": {
       "version": "8.1.7",
       "resolved": "https://registry.npmjs.org/@hpcc-js/dataflow/-/dataflow-8.1.7.tgz",
@@ -1903,9 +1915,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/@hpcc-js/ddl-shim": {
-      "version": "2.20.7",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/ddl-shim/-/ddl-shim-2.20.7.tgz",
-      "integrity": "sha512-n+MQBW9zgfhN6zCTaZSiZfMAJfhR6bw4Fuo4fMhQdF2x17Yu/DbN8MReNvyq2OOBmxkwcp28/VxYnsJeppWMQw==",
+      "version": "2.21.0",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/ddl-shim/-/ddl-shim-2.21.0.tgz",
+      "integrity": "sha512-Q66GJqvmTNysmgj/Du8/6+1xIhKgylNu8XVbx1ovNLcLoCxJIhtfWBhCYx0aY2aFHN+QnjC0BGXWyn3xCyxpnw==",
       "hasInstallScript": true,
       "dependencies": {
         "ajv": "6.12.6"
diff --git a/esp/src/package.json b/esp/src/package.json
index bd8daf99417..c109114e36a 100644
--- a/esp/src/package.json
+++ b/esp/src/package.json
@@ -44,7 +44,7 @@
     "@hpcc-js/chart": "2.83.4",
     "@hpcc-js/codemirror": "2.62.1",
     "@hpcc-js/common": "2.71.18",
-    "@hpcc-js/comms": "2.93.0",
+    "@hpcc-js/comms": "2.94.0",
     "@hpcc-js/dataflow": "8.1.7",
     "@hpcc-js/eclwatch": "2.74.8",
     "@hpcc-js/graph": "2.85.16",
diff --git a/esp/src/src-react/components/forms/Fields.tsx b/esp/src/src-react/components/forms/Fields.tsx
index 73986e9b95e..cb97c9079aa 100644
--- a/esp/src/src-react/components/forms/Fields.tsx
+++ b/esp/src/src-react/components/forms/Fields.tsx
@@ -828,7 +828,7 @@ export const CloudContainerNameField: React.FunctionComponent<CloudContainerName
                 text: row
             };
         }) || [];
-        setOptions(options);
+        setOptions([{ key: "", text: "" }, ...options]);
     }, [cloudContainerNames]);
 
     return <ComboBox {...props} allowFreeform={true} autoComplete={"on"} options={options} />;
@@ -1340,6 +1340,7 @@ export function createInputs(fields: Fields, onChange?: (id: string, newValue: a
                     label: field.label,
                     field: <CloudContainerNameField
                         key={fieldID}
+                        selectedKey={field.value}
                         onChange={(ev, row) => {
                             onChange(fieldID, row.key);
                             setDropzone(row.key as string);