diff --git a/appv2/src/UI/Map/OnHoverActivity.tsx b/appv2/src/UI/Map/OnHoverActivity.tsx
index 05eee2573..f55a69a8d 100644
--- a/appv2/src/UI/Map/OnHoverActivity.tsx
+++ b/appv2/src/UI/Map/OnHoverActivity.tsx
@@ -37,7 +37,7 @@ export const OnHoverActivity = (props: any) => {
       popupRef?.current?.remove();
       return;
     } else {
-      if (row.short_id) {
+      if (row.short_id && centerPointGeometry !== null) {
         popupRef.current?.bindPopup(row?.short_id);
       } else {
         popupRef.current?.bindPopup(row?.id);
@@ -53,5 +53,5 @@ export const OnHoverActivity = (props: any) => {
     map.panTo(map.unproject(px),{animate: true}); // pan to new center
 });
 
-  return centerPointGeometry !== null ? <GeoJSON ref={popupRef} key={'asdf'} data={centerPointGeometry} /> : null;
+  return centerPointGeometry !== null ? <GeoJSON ref={popupRef} key={Math.random()} data={centerPointGeometry} /> : null;
 };
diff --git a/appv2/src/UI/Overlay/Records/RecordSet.tsx b/appv2/src/UI/Overlay/Records/RecordSet.tsx
index de5b584a9..d5fc63867 100644
--- a/appv2/src/UI/Overlay/Records/RecordSet.tsx
+++ b/appv2/src/UI/Overlay/Records/RecordSet.tsx
@@ -275,7 +275,7 @@ const Filter = (props) => {
               }
             });
           }}>
-          {serverBoundariesToDisplay.map((option) => {
+          {serverBoundariesToDisplay?.map((option) => {
             return (
               <option key={option.value + option.label} value={option.value}>
                 {option.label}
@@ -298,15 +298,21 @@ const Filter = (props) => {
           key={'filterTypeSelect' + props.name}
           value={filterTypeInState}
           onChange={(e) => {
-            console.dir(e.target.value);
 
-            dispatch({
-              type: RECORDSET_UPDATE_FILTER,
-              payload: {
+            let payload = {
                 filterType: e.target.value,
                 setID: props.setID,
                 filterID: props.id
-                //operator: e.target.value
+            } as any
+
+            if(e.target.value === 'spatialFilterUploaded'){
+              payload.filter = serverBoundariesToDisplay[0].value
+            }
+
+            dispatch({
+              type: RECORDSET_UPDATE_FILTER,
+              payload: {
+                ...payload
               }
             });
           }}>