diff --git a/scripts/system/create/entityProperties/html/js/entityProperties.js b/scripts/system/create/entityProperties/html/js/entityProperties.js
index 5a20ae6f20..85c7b378da 100644
--- a/scripts/system/create/entityProperties/html/js/entityProperties.js
+++ b/scripts/system/create/entityProperties/html/js/entityProperties.js
@@ -3712,8 +3712,16 @@ function addZoneToZonesSelection(propertyId, id) {
         hiddenField.value = "[]";
     }
     let selectedZones = JSON.parse(hiddenField.value);
-    if (!selectedZones.includes(id)) {
-        selectedZones.push(id);
+    if (id === "ALL") {
+        for (let i = 0; i < zonesList.length; i++) {
+            if (!selectedZones.includes(zonesList[i].id)) {
+                selectedZones.push(zonesList[i].id);
+            }
+        }        
+    } else {
+        if (!selectedZones.includes(id)) {
+            selectedZones.push(id);
+        }
     }
     hiddenField.value = JSON.stringify(selectedZones);
     displaySelectedZones(propertyId, true);
@@ -3813,7 +3821,10 @@ function setZonesSelectionData(element, isEditable) {
     zoneSelector += "<input type='button' value = 'Add a Zone' id='zones-select-add-" + element.id + "' onClick='document.getElementById(";
     zoneSelector += '"' + "zones-select-selector-list-panel-" + element.id + '"' + ").style.display = " + '"' + "block" + '"' + ";'>";
     zoneSelector += "<div class = 'zoneSelectorListPanel' id='zones-select-selector-list-panel-" + element.id + "'>";
-    zoneSelector += "<div class='zoneSelectListHeader'>Select the Zone to add: </div>";
+    zoneSelector += "<div class='zoneSelectListHeader'>Select the Zone to add:";
+    zoneSelector += "<input type='button' id='zones-select-add-all-" + element.id + "' class='blue forceAlignRight' value = 'Add All Zones'";
+    zoneSelector += "onClick='addZoneToZonesSelection(" + '"' + element.id + '", "ALL"' + ");'>";
+    zoneSelector += "</div>";
     zoneSelector += "<div class='zoneSelectList' id = 'zones-select-selector-list-" + element.id + "'>";
     let i, name;
     for (i = 0; i < zonesList.length; i++) {
diff --git a/scripts/system/create/modules/brokenURLReport.js b/scripts/system/create/modules/brokenURLReport.js
index c3a6eba8cd..c04612bb27 100644
--- a/scripts/system/create/modules/brokenURLReport.js
+++ b/scripts/system/create/modules/brokenURLReport.js
@@ -31,7 +31,7 @@ function brokenURLReportRequestUrlValidityCheck(no) {
 function brokenURLReportGetResponseStatus() {
     if (brokenURLReportHttpRequest.status === 0 || brokenURLReportHttpRequest.status > 299) {
         if (brokenURLReportHttpRequest.status === 0) {
-            brokenURLReportUrlList[brokenURLReportProcessedUrlNo].validity = "0 - URL not well-formed";
+            brokenURLReportUrlList[brokenURLReportProcessedUrlNo].validity = "0 - Server not found";
         } else {
             brokenURLReportUrlList[brokenURLReportProcessedUrlNo].validity = brokenURLReportHttpRequest.status + " - " + brokenURLReportHttpRequest.statusText;
         }
diff --git a/scripts/system/html/css/edit-style.css b/scripts/system/html/css/edit-style.css
index d912cd5d4c..62c58a5676 100644
--- a/scripts/system/html/css/edit-style.css
+++ b/scripts/system/html/css/edit-style.css
@@ -2029,6 +2029,10 @@ div.zoneSelectListFooter {
     text-align: right;
 }
 
+.forceAlignRight {
+    float: right;
+}
+
 #menuBackgroundOverlay{
     background-color:transparent;
     position:fixed;