diff --git a/src/background/analysis/classModels.js b/src/background/analysis/classModels.js
index f66319d3..a26ae8bf 100644
--- a/src/background/analysis/classModels.js
+++ b/src/background/analysis/classModels.js
@@ -270,7 +270,7 @@ export const keywordTypes = Object.freeze({
     placeholder: {
       streetAddress: "45 Wyllys Ave",
       city: "Middletown",
-      region: "Conneticut",
+      region: "Connecticut",
       zipCode: "06459",
     },
     toolTip:
diff --git a/src/options/views/watchlist-view/components/edit-modal/components/input-validators.js b/src/options/views/watchlist-view/components/edit-modal/components/input-validators.js
index 0c4c2468..20455548 100644
--- a/src/options/views/watchlist-view/components/edit-modal/components/input-validators.js
+++ b/src/options/views/watchlist-view/components/edit-modal/components/input-validators.js
@@ -97,7 +97,7 @@ const validate = ({
       badInput("city");
       return false;
     }
-    if (!inputValidator.city_address.test(address)) {
+    if (!inputValidator.city_address.test(address) && (address.length != 0)) {
       badInput("address");
       return false;
     }
diff --git a/src/options/views/watchlist-view/components/edit-modal/index.js b/src/options/views/watchlist-view/components/edit-modal/index.js
index a277edc8..a593ff88 100644
--- a/src/options/views/watchlist-view/components/edit-modal/index.js
+++ b/src/options/views/watchlist-view/components/edit-modal/index.js
@@ -56,7 +56,7 @@ export const EditModal = ({ passKeywordType, passKeyword, edit, id, updateList }
   );
   const [keyword, setKeyword] = useState(edit ? passKeyword : "");
   const [address, setAddress] = useState(
-    edit ? keyword[typeEnum.streetAddress] ?? null : ""
+    edit ? keyword[typeEnum.streetAddress] ?? "" : ""
   );
   const [city, setCity] = useState(edit ? keyword[typeEnum.city] ?? null : "");
   const [region, setRegionloc] = useState(
@@ -203,11 +203,11 @@ export const EditModal = ({ passKeywordType, passKeyword, edit, id, updateList }
                 let key;
                 if (keywordType == permissionEnum.location) {
                   key = {
-                    [typeEnum.streetAddress]: address,
+                    [typeEnum.streetAddress]: (address == "" ? null : address),
                     [typeEnum.zipCode]: zip,
                     [typeEnum.region]: region,
                     [typeEnum.city]: city,
-                    display: `${address}, ${city}, ${region} ${zip}`,
+                    display: (address != "") ? `${address}, ${city}, ${region} ${zip}` : ` ${city}, ${region} ${zip}`,
                   };
                 } else {
                   key = keyword;