diff --git a/packages/clients/dish/src/externMapConfiguration.ts b/packages/clients/dish/src/externMapConfiguration.ts
index bd62504f8..727ae96ba 100644
--- a/packages/clients/dish/src/externMapConfiguration.ts
+++ b/packages/clients/dish/src/externMapConfiguration.ts
@@ -7,7 +7,9 @@ import {
   denkmaelerWMS,
   hintergrundkarte,
   dishBaseUrl,
+  dishCloudBaseUrl,
   alkisWfs,
+  // dop20,
 } from './services'
 
 export const exportMapConfiguration = {
@@ -23,6 +25,12 @@ export const exportMapConfiguration = {
       type: 'background',
       name: 'Basemap Graustufen',
     },
+    // {
+    //   id: dop20,
+    //   visibility: true,
+    //   type: 'background',
+    //   name: 'DOP 20',
+    // },
     {
       id: denkmaelerWfsExtern,
       visibility: false,
@@ -132,6 +140,17 @@ export const exportMapConfiguration = {
           topic: null,
         },
       },
+      {
+        groupId: 'groupDenkmalsuche',
+        categoryId: 'categoryBkgSuche',
+        queryParameters: {
+          filter: {
+            bundesland: 'Schleswig-Holstein',
+          },
+        },
+        type: 'bkg',
+        url: `${dishCloudBaseUrl}/bkg/search/geosearch.json`,
+      },
     ],
     groupProperties: {
       groupDenkmalsuche: {
@@ -151,6 +170,9 @@ export const exportMapConfiguration = {
       categoryDenkmalsucheDish: {
         label: 'Denkmalsuche Treffer',
       },
+      categoryBkgSuche: {
+        label: 'Adresssuche Treffer',
+      },
     },
     minLength: 3,
   },
diff --git a/packages/clients/dish/src/internMapConfiguration.ts b/packages/clients/dish/src/internMapConfiguration.ts
index ca941671c..1ccd8b280 100644
--- a/packages/clients/dish/src/internMapConfiguration.ts
+++ b/packages/clients/dish/src/internMapConfiguration.ts
@@ -6,6 +6,7 @@ import {
   denkmaelerWmsIntern,
   denkmaelerWFSIntern,
   kontrollbedarfIntern,
+  alkisWfs,
 } from './services'
 import { shBlue } from './colors'
 
@@ -21,13 +22,21 @@ export const internMapConfiguration = {
       type: 'background',
       name: 'Basemap Graustufen',
     },
+    {
+      id: alkisWfs,
+      visibility: false,
+      gfiMode: 'bboxDot',
+      type: 'mask',
+      name: 'ALKIS Katasterbezirke (WFS)',
+      minZoom: 7,
+    },
     {
       id: denkmaelerWFSIntern,
       visibility: false,
-      hideInMenu: true,
+      hideInMenu: false,
       type: 'mask',
       name: 'Denkmal (WFS) Intern',
-      minZoom: 7,
+      minZoom: 5,
     },
     {
       id: denkmaelerWmsIntern,
@@ -110,6 +119,7 @@ export const internMapConfiguration = {
   },
   gfi: {
     mode: 'intersects',
+    activeLayerPath: 'plugin/layerChooser/activeMaskIds',
     layers: {
       [denkmaelerWFSIntern]: {
         geometry: true,
@@ -118,6 +128,12 @@ export const internMapConfiguration = {
         geometryName: 'app:geometry',
         exportProperty: 'Export',
       },
+      [alkisWfs]: {
+        geometry: true,
+        window: true,
+        maxFeatures: 10,
+        geometryName: 'geometry',
+      },
     },
     coordinateSources: [
       'plugin/pins/transformedCoordinate',
diff --git a/packages/clients/dish/src/services.ts b/packages/clients/dish/src/services.ts
index 2307ba081..7419d53ff 100644
--- a/packages/clients/dish/src/services.ts
+++ b/packages/clients/dish/src/services.ts
@@ -7,6 +7,7 @@ export const denkmaelerWmsIntern = 'denkmaelerWmsIntern'
 export const denkmaelerWFSIntern = 'denkmaelerWFSIntern'
 export const kontrollbedarfIntern = 'kontrollbedarfIntern'
 export const alkisWfs = 'alkisWfS'
+export const dop20 = 'dop20'
 
 export const servicePrefix = 'https://stage.afm.schleswig-holstein.de/bkg/'
 
@@ -27,7 +28,7 @@ export const dishBaseUrl = isDevMode
 
 export const dishAutocompleteUrl = `${dishBaseUrl}/dish_suche/ergebnisse/json/alleBezeichnungenEindeutig.JSON`
 
-const dishCloudBaseUrl = 'https://dishreserveproxy.dsecurecloud.de/dish'
+export const dishCloudBaseUrl = 'https://dishreserveproxy.dsecurecloud.de/dish'
 
 // TODO
 const internServicesBaseUrl = isDevMode
@@ -97,6 +98,18 @@ const AlkisWfService = {
   featureType: 'ave:Flurstueck',
 }
 
+// const dop20Service = {
+//   id: dop20,
+//   name: 'DOP 20',
+//   url: `${dishCloudBaseUrl}/bkg/DOP`,
+//   typ: 'WMS',
+//   layers: 'DOP20COL',
+//   legendURL: 'ignore',
+//   format: 'image/png',
+//   version: '1.3.0',
+//   transparent: true,
+// }
+
 const servicesCommon = [
   {
     id: hintergrundkarte,
@@ -109,10 +122,14 @@ const servicesCommon = [
     singleTile: false,
     transparent: true,
   },
-  denkmaelerWmsService,
+  AlkisWfService,
 ]
 
-const servicesExtern = [AlkisWfService, denkmaelerWfsServiceExtern]
+const servicesExtern = [
+  denkmaelerWmsService,
+  denkmaelerWfsServiceExtern,
+  // dop20Service,
+]
 
 const servicesIntern = [
   denkmaelerWfsServiceIntern,