diff --git a/frontend/src/features/layersSelector/search/LayerFilters.tsx b/frontend/src/features/layersSelector/search/LayerFilters.tsx
index 1b51654a73..94115607e7 100644
--- a/frontend/src/features/layersSelector/search/LayerFilters.tsx
+++ b/frontend/src/features/layersSelector/search/LayerFilters.tsx
@@ -59,6 +59,7 @@ export function LayerFilters({
       </TagWrapper>
 
       <CheckPicker
+        isLabelHidden
         label="Type d'AMP"
         name="ampTypes"
         onChange={handleSetFilteredAmpTypes}
diff --git a/frontend/src/features/map/BaseMap.tsx b/frontend/src/features/map/BaseMap.tsx
index 6df8b6a4f4..0e061c6943 100644
--- a/frontend/src/features/map/BaseMap.tsx
+++ b/frontend/src/features/map/BaseMap.tsx
@@ -67,7 +67,9 @@ export function BaseMap({ children }: { children: Array<ReactElement<BaseMapChil
             layerFilter: layer => {
               const typedLayer = layer as VectorLayerWithName
 
-              return !!typedLayer.name && SelectableLayers.includes(typedLayer.name)
+              const layerName = typedLayer.name || typedLayer.get('name')
+
+              return !!layerName && SelectableLayers.includes(layerName)
             }
           }
         )
diff --git a/frontend/src/store/index.ts b/frontend/src/store/index.ts
index 596dea02d4..8ad8623d08 100644
--- a/frontend/src/store/index.ts
+++ b/frontend/src/store/index.ts
@@ -3,7 +3,7 @@ import { setupListeners } from '@reduxjs/toolkit/query'
 import { FLUSH, PAUSE, PERSIST, PURGE, REGISTER, REHYDRATE } from 'redux-persist'
 
 import { homeReducers } from './reducers'
-import { monitorenvPrivateApi, monitorenvPublicApi } from '../api/api'
+import { monitorenvPrivateApi, monitorenvPublicApi, geoserverApi } from '../api/api'
 import { regulatoryActionSanitizer } from '../domain/shared_slices/Regulatory'
 
 const homeStore = configureStore({
@@ -20,7 +20,7 @@ const homeStore = configureStore({
         isSerializable: (value: any) => isPlain(value) || value instanceof Date || value instanceof Error,
         serializableCheck: false
       }
-    }).concat(monitorenvPrivateApi.middleware, monitorenvPublicApi.middleware),
+    }).concat(monitorenvPrivateApi.middleware, monitorenvPublicApi.middleware, geoserverApi.middleware),
   reducer: combineReducers(homeReducers) as unknown as typeof homeReducers
 })
 
diff --git a/frontend/src/store/reducers.ts b/frontend/src/store/reducers.ts
index 596d67e25b..5a427fd3e2 100644
--- a/frontend/src/store/reducers.ts
+++ b/frontend/src/store/reducers.ts
@@ -1,12 +1,4 @@
-import { ampsAPI } from '../api/ampsAPI'
 import { geoserverApi, monitorenvPrivateApi, monitorenvPublicApi } from '../api/api'
-import { controlThemesAPI } from '../api/controlThemesAPI'
-import { infractionsAPI } from '../api/infractionsAPI'
-import { legacyControlUnitsAPI } from '../api/legacyControlUnitsAPI'
-import { missionsAPI } from '../api/missionsAPI'
-import { regulatoryLayersAPI } from '../api/regulatoryLayersAPI'
-import { reportingsAPI } from '../api/reportingsAPI'
-import { semaphoresAPI } from '../api/semaphoresAPI'
 import { administrativeSlicePersistedReducer } from '../domain/shared_slices/Administrative'
 import { drawReducer } from '../domain/shared_slices/Draw'
 import { globalReducer } from '../domain/shared_slices/Global'
@@ -60,15 +52,7 @@ export const homeReducers = {
   regulatoryMetadata: regulatoryMetadataSliceReducer,
   reporting: reportingSliceReducer,
   [layerSidebarSlice.name]: layerSidebarSlice.reducer,
-  [ampsAPI.reducerPath]: ampsAPI.reducer,
-  [regulatoryLayersAPI.reducerPath]: regulatoryLayersAPI.reducer,
-  [missionsAPI.reducerPath]: missionsAPI.reducer,
-  [controlThemesAPI.reducerPath]: controlThemesAPI.reducer,
-  [legacyControlUnitsAPI.reducerPath]: legacyControlUnitsAPI.reducer,
-  [infractionsAPI.reducerPath]: infractionsAPI.reducer,
-  [semaphoresAPI.reducerPath]: semaphoresAPI.reducer,
   reportingFilters: reportingFiltersPersistedReducer,
-  [reportingsAPI.reducerPath]: reportingsAPI.reducer,
   selectedAmp: selectedAmpSlicePersistedReducer,
   semaphoresSlice: semaphoresPersistedReducer,
   sideWindow: sideWindowReducer,