diff --git a/client/src/components/Map/Map.jsx b/client/src/components/Map/Map.jsx
index e35e57d..ff25607 100644
--- a/client/src/components/Map/Map.jsx
+++ b/client/src/components/Map/Map.jsx
@@ -434,7 +434,11 @@ class PraxisMap extends Component {
               </div>
             </Popup>
           )}
-          <Source id="zips" type="geojson" data={zips}>
+          <Source
+            id="zips"
+            type="geojson"
+            data={zips || { type: "FeatureCollection", features: [] }}
+          >
             <Layer key="zips-layer" {...zipsLayer} />
             <Layer key="zips-label" {...zipsLabel} />
           </Source>
diff --git a/client/src/reducers/search.js b/client/src/reducers/search.js
index eb63625..8cb93c4 100644
--- a/client/src/reducers/search.js
+++ b/client/src/reducers/search.js
@@ -50,7 +50,14 @@ export default function searchState(state = initialSearchState, action) {
     case UPDATE_SEARCH_PARAMS:
       return {
         ...state,
-        searchParams: { ...state.searchParams, ...action.payload },
+        searchParams: {
+          ...state.searchParams,
+          ...action.payload,
+          searchYear:
+            state.searchParams.searchYear ||
+            action.payload.searchYear ||
+            DEFAULT_YEAR,
+        },
       }
     case UPDATE_PRIMARY_SEARCH:
       return {
diff --git a/client/src/utils/helper.js b/client/src/utils/helper.js
index 9d44c8f..b3e35d2 100644
--- a/client/src/utils/helper.js
+++ b/client/src/utils/helper.js
@@ -56,7 +56,7 @@ export function createFilterFromParams(params) {
   if (layerFilter.length > 0) {
     return ["all", ...layerFilter]
   } else {
-    return ["none"]
+    return ["all"]
   }
 }
 
diff --git a/client/src/utils/parseURL.js b/client/src/utils/parseURL.js
index 95de17d..b7ed404 100644
--- a/client/src/utils/parseURL.js
+++ b/client/src/utils/parseURL.js
@@ -23,9 +23,6 @@ export function URLParamsToSearchParams(searchQuery) {
     case "address":
       searchTerm = place
       break
-    default:
-      console.error(`Unkown search type:${searchType}`)
-      break
   }
 
   return {