diff --git a/test/js/component/menu/__snapshots__/menu.test.jsx.snap b/test/js/component/menu/__snapshots__/menu.test.jsx.snap
index 17c551ca0..f76b239eb 100644
--- a/test/js/component/menu/__snapshots__/menu.test.jsx.snap
+++ b/test/js/component/menu/__snapshots__/menu.test.jsx.snap
@@ -69,6 +69,30 @@ exports[`menu component > should render menu 1`] = `
               </span>
             </button>
           </li>
+          <li>
+            <button
+              class="dropdown-item"
+            >
+              <span>
+                <i
+                  class="bi bi-check-square"
+                />
+                 menu.settings.show_real_estate
+              </span>
+            </button>
+          </li>
+          <li>
+            <button
+              class="dropdown-item"
+            >
+              <span>
+                <i
+                  class="bi bi-check-square"
+                />
+                 menu.settings.show_background_map
+              </span>
+            </button>
+          </li>
         </ul>
         <button
           aria-expanded="false"
@@ -178,6 +202,30 @@ exports[`search > should show GNSS coordinates 1`] = `
               </span>
             </button>
           </li>
+          <li>
+            <button
+              class="dropdown-item"
+            >
+              <span>
+                <i
+                  class="bi bi-check-square"
+                />
+                 menu.settings.show_real_estate
+              </span>
+            </button>
+          </li>
+          <li>
+            <button
+              class="dropdown-item"
+            >
+              <span>
+                <i
+                  class="bi bi-check-square"
+                />
+                 menu.settings.show_background_map
+              </span>
+            </button>
+          </li>
         </ul>
         <button
           aria-expanded="false"
@@ -286,6 +334,30 @@ exports[`search > should show LV95 coordinates 1`] = `
               </span>
             </button>
           </li>
+          <li>
+            <button
+              class="dropdown-item"
+            >
+              <span>
+                <i
+                  class="bi bi-check-square"
+                />
+                 menu.settings.show_real_estate
+              </span>
+            </button>
+          </li>
+          <li>
+            <button
+              class="dropdown-item"
+            >
+              <span>
+                <i
+                  class="bi bi-check-square"
+                />
+                 menu.settings.show_background_map
+              </span>
+            </button>
+          </li>
         </ul>
         <button
           aria-expanded="false"
@@ -416,6 +488,30 @@ exports[`search > should show results 1`] = `
               </span>
             </button>
           </li>
+          <li>
+            <button
+              class="dropdown-item"
+            >
+              <span>
+                <i
+                  class="bi bi-check-square"
+                />
+                 menu.settings.show_real_estate
+              </span>
+            </button>
+          </li>
+          <li>
+            <button
+              class="dropdown-item"
+            >
+              <span>
+                <i
+                  class="bi bi-check-square"
+                />
+                 menu.settings.show_background_map
+              </span>
+            </button>
+          </li>
         </ul>
         <button
           aria-expanded="false"
diff --git a/test/js/reducer/extract.test.js b/test/js/reducer/extract.test.js
index 58a0b9f50..91cbcf6cb 100644
--- a/test/js/reducer/extract.test.js
+++ b/test/js/reducer/extract.test.js
@@ -4,7 +4,9 @@ import reducer, {
   setInformationPanelTab,
   showError,
   showExtract,
+  toggleBackground,
   toggleCollapsed,
+  toggleHighlight,
   toggleInformationPanel} from '../../../oereb_client/static/src/reducer/extract';
 
 describe('extract reducer', () => {
@@ -21,7 +23,9 @@ describe('extract reducer', () => {
       number: null,
       information: false,
       tab: 0,
-      data: {}
+      data: {},
+      highlight: true,
+      background: true
     });
   });
 
@@ -45,7 +49,9 @@ describe('extract reducer', () => {
       number: '1234',
       information: false,
       tab: 0,
-      data: {}
+      data: {},
+      highlight: true,
+      background: true
     });
     expect(window.history.pushState).toHaveBeenCalled();
   });
@@ -74,7 +80,9 @@ describe('extract reducer', () => {
       tab: 0,
       data: {
         foo: 'bar'
-      }
+      },
+      highlight: true,
+      background: true
     });
   });
 
@@ -101,7 +109,9 @@ describe('extract reducer', () => {
       number: null,
       information: false,
       tab: 0,
-      data: {}
+      data: {},
+      highlight: true,
+      background: true
     });
   });
 
@@ -127,7 +137,9 @@ describe('extract reducer', () => {
       number: '1234',
       information: false,
       tab: 0,
-      data: {}
+      data: {},
+      highlight: true,
+      background: true
     });
     expect(window.history.pushState).toHaveBeenCalled();
   });
@@ -146,7 +158,9 @@ describe('extract reducer', () => {
       number: null,
       information: false,
       tab: 0,
-      data: {}
+      data: {},
+      highlight: true,
+      background: true
     });
     state = reducer(state, toggleCollapsed());
     expect(state).toEqual({
@@ -160,7 +174,9 @@ describe('extract reducer', () => {
       number: null,
       information: false,
       tab: 0,
-      data: {}
+      data: {},
+      highlight: true,
+      background: true
     });
   });
 
@@ -179,7 +195,9 @@ describe('extract reducer', () => {
       number: null,
       information: true,
       tab: 0,
-      data: {}
+      data: {},
+      highlight: true,
+      background: true
     });
     state = reducer(state, toggleInformationPanel());
     expect(state).toEqual({
@@ -193,7 +211,81 @@ describe('extract reducer', () => {
       number: null,
       information: false,
       tab: 0,
-      data: {}
+      data: {},
+      highlight: true,
+      background: true
+    });
+  });
+
+  it('should toggle real estate highlight', () => {
+    let state = reducer(undefined, {});
+    state = reducer(state, toggleHighlight());
+    expect(state).toEqual({
+      loading: false,
+      zoom: false,
+      visible: false,
+      collapsed: false,
+      error: false,
+      egrid: null,
+      identdn: null,
+      number: null,
+      information: false,
+      tab: 0,
+      data: {},
+      highlight: false,
+      background: true
+    });
+    state = reducer(state, toggleHighlight());
+    expect(state).toEqual({
+      loading: false,
+      zoom: false,
+      visible: false,
+      collapsed: false,
+      error: false,
+      egrid: null,
+      identdn: null,
+      number: null,
+      information: false,
+      tab: 0,
+      data: {},
+      highlight: true,
+      background: true
+    });
+  });
+
+  it('should toggle background map', () => {
+    let state = reducer(undefined, {});
+    state = reducer(state, toggleBackground());
+    expect(state).toEqual({
+      loading: false,
+      zoom: false,
+      visible: false,
+      collapsed: false,
+      error: false,
+      egrid: null,
+      identdn: null,
+      number: null,
+      information: false,
+      tab: 0,
+      data: {},
+      highlight: true,
+      background: false
+    });
+    state = reducer(state, toggleBackground());
+    expect(state).toEqual({
+      loading: false,
+      zoom: false,
+      visible: false,
+      collapsed: false,
+      error: false,
+      egrid: null,
+      identdn: null,
+      number: null,
+      information: false,
+      tab: 0,
+      data: {},
+      highlight: true,
+      background: true
     });
   });
 
@@ -211,7 +303,9 @@ describe('extract reducer', () => {
       number: null,
       information: false,
       tab: 1,
-      data: {}
+      data: {},
+      highlight: true,
+      background: true
     });
   });
 
diff --git a/test/js/reducer/map.test.js b/test/js/reducer/map.test.js
index b610fd5e7..82783b322 100644
--- a/test/js/reducer/map.test.js
+++ b/test/js/reducer/map.test.js
@@ -5,7 +5,8 @@ describe('map reducer', () => {
   it('should return the initial state', () => {
     expect(reducer(undefined, {})).toEqual({
       map: null,
-      topicLayers: null
+      topicLayers: null,
+      baseLayer: null
     });
   });
 
@@ -13,11 +14,13 @@ describe('map reducer', () => {
     let state = reducer(undefined, {});
     state = reducer(state, initMap({
       map: 'foo',
-      topicLayers: 'bar'
+      topicLayers: 'bar',
+      baseLayer: 'baz'
     }));
     expect(state).toEqual({
       map: 'foo',
-      topicLayers: 'bar'
+      topicLayers: 'bar',
+      baseLayer: 'baz'
     });
   });