diff --git a/source/frontend/src/components/propertySelector/search/LayerFilter.scss b/source/frontend/src/components/propertySelector/search/LayerFilter.scss
index a579313588..0184d0f556 100644
--- a/source/frontend/src/components/propertySelector/search/LayerFilter.scss
+++ b/source/frontend/src/components/propertySelector/search/LayerFilter.scss
@@ -18,7 +18,7 @@
   left: 12.2rem;
 }
 
-.suggestionList option {
+.suggestionList li {
   padding: 1rem 0.5rem;
   word-wrap: break-word;
   width: 25rem;
@@ -27,7 +27,7 @@
   color: var(--typography-color-secondary);
 
   &:hover {
-    background-color: var(--typography-color-secondary-hover);
+    background-color: var(--surface-color-primary-button-hover);
     color: #fff;
   }
 }
diff --git a/source/frontend/src/features/properties/components/GeocoderAutoComplete.tsx b/source/frontend/src/features/properties/components/GeocoderAutoComplete.tsx
index 7f27b4b3f1..15e1e7c96e 100644
--- a/source/frontend/src/features/properties/components/GeocoderAutoComplete.tsx
+++ b/source/frontend/src/features/properties/components/GeocoderAutoComplete.tsx
@@ -99,13 +99,13 @@ export const GeocoderAutoComplete: React.FC<
     }
     if (options !== undefined) {
       return (
-        <div className="suggestionList">
+        <ul className="suggestionList">
           {options.map((x: IGeocoderResponse, index: number) => (
-            <option key={index} onClick={() => suggestionSelected(x)}>
+            <li key={index} onClick={() => suggestionSelected(x)}>
               {x.fullAddress}
-            </option>
+            </li>
           ))}
-        </div>
+        </ul>
       );
     }
     return null;
diff --git a/source/frontend/src/features/properties/filter/PropertyFilter.tsx b/source/frontend/src/features/properties/filter/PropertyFilter.tsx
index 1deb060204..05e3005e0a 100644
--- a/source/frontend/src/features/properties/filter/PropertyFilter.tsx
+++ b/source/frontend/src/features/properties/filter/PropertyFilter.tsx
@@ -126,7 +126,10 @@ export const PropertyFilter: React.FC<React.PropsWithChildren<IPropertyFilterPro
                   placeholder="Enter an address"
                   onSelectionChanged={async val => {
                     const geocoderPidResponse = await getSitePids(val.siteId);
-                    if (geocoderPidResponse?.pids?.length === 1) {
+                    if (
+                      geocoderPidResponse?.pids?.length === 1 &&
+                      geocoderPidResponse?.pids[0] !== ''
+                    ) {
                       setFieldValue('pinOrPid', geocoderPidResponse?.pids[0]);
                     } else {
                       if (geocoderPidResponse?.pids?.length > 1) {