diff --git a/assets/layers/bicycle_library/bicycle_library.json b/assets/layers/bicycle_library/bicycle_library.json
index ac01b7ee21..21e478e7b5 100644
--- a/assets/layers/bicycle_library/bicycle_library.json
+++ b/assets/layers/bicycle_library/bicycle_library.json
@@ -160,6 +160,7 @@
             "id": "bicycle_library-charge"
         },
         {
+            "id": "bicycle-library-target-group",
             "question": {
                 "en": "Who can lend bicycles here?",
                 "nl": "Voor wie worden hier fietsen aangeboden?",
diff --git a/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json b/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json
index 2f2f97f4e4..665a759427 100644
--- a/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json
+++ b/assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json
@@ -165,6 +165,7 @@
             "id": "bicycle_tube_vending_machine-charge"
         },
         {
+            "id": "vending-machine-payment-methods",
             "question": "How can one pay at this tube vending machine?",
             "mappings": [
                 {
@@ -223,6 +224,7 @@
             "id": "bicycle_tube_vending_machine-operator"
         },
         {
+            "id": "bicycle_tube_vending_maching-other-items",
             "question": "Are other bicycle bicycle accessories sold here?",
             "mappings": [
                 {
diff --git a/assets/layers/bike_cafe/bike_cafe.json b/assets/layers/bike_cafe/bike_cafe.json
index c4b2822c46..3619c70689 100644
--- a/assets/layers/bike_cafe/bike_cafe.json
+++ b/assets/layers/bike_cafe/bike_cafe.json
@@ -101,6 +101,7 @@
             "id": "bike_cafe-name"
         },
         {
+            "id": "bike_cafe-bike-pump",
             "question": {
                 "en": "Does this bike cafe offer a bike pump for use by anyone?",
                 "nl": "Biedt dit fietscafé een fietspomp aan voor iedereen?",
@@ -144,6 +145,7 @@
             ]
         },
         {
+            "id": "bike_cafe-repair-tools",
             "question": {
                 "en": "Are there tools here to repair your own bike?",
                 "nl": "Biedt dit fietscafé gereedschap aan om je fiets zelf te herstellen?",
@@ -190,6 +192,7 @@
             ]
         },
         {
+            "id": "bike_cafe-repair-service",
             "question": {
                 "en": "Does this bike cafe repair bikes?",
                 "nl": "Herstelt dit fietscafé fietsen?",
diff --git a/assets/layers/bike_monitoring_station/bike_monitoring_station.json b/assets/layers/bike_monitoring_station/bike_monitoring_station.json
deleted file mode 100644
index a20942f964..0000000000
--- a/assets/layers/bike_monitoring_station/bike_monitoring_station.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-    "id": "bike_monitoring_station",
-    "name": {
-        "en": "Monitoring stations",
-        "nl": "Telstation",
-        "fr": "Stations de contrôle",
-        "it": "Stazioni di monitoraggio",
-        "zh_Hant": "監視站",
-        "ru": "Станции мониторинга",
-        "pt_BR": "Estações de monitoramento"
-    },
-    "minzoom": 12,
-    "source": {
-        "osmTags": {
-            "and": [
-                "man_made=monitoring_station",
-                "monitoring:bicycle=yes"
-            ]
-        }
-    },
-    "title": {
-        "render": {
-            "nl": "Fietstelstation",
-            "en": "Bicycle counting station",
-            "fr": "Station de comptage de vélo",
-            "it": "Contabiciclette",
-            "de": "Fahrradzählstation",
-            "zh_Hant": "單車計數站",
-            "pt_BR": "Estação de contagem de bicicletas"
-        },
-        "mappings": [
-            {
-                "if": "name~*",
-                "then": {
-                    "en": "Bicycle counting station {name}",
-                    "nl": "Fietstelstation {name}",
-                    "fr": "Station de comptage de vélo {name}",
-                    "it": "Contabiciclette {name}",
-                    "de": "Fahrradzählstation {name}",
-                    "zh_Hant": "單車計數站 {name}",
-                    "pl": "Stacja liczenia rowerów {name}",
-                    "pt_BR": "Estação de contagem de bicicletas {name}"
-                }
-            },
-            {
-                "if": "ref~*",
-                "then": {
-                    "en": "Bicycle counting station {ref}",
-                    "nl": "Fietstelstation {ref}",
-                    "fr": "Station de comptage de vélo {ref}",
-                    "it": "Contabiciclette {ref}",
-                    "de": "Fahrradzählstation {ref}",
-                    "zh_Hant": "單車計數站 {ref}",
-                    "pl": "Stacja liczenia rowerów {ref}",
-                    "pt_BR": "Estação de contagem de bicicletas {ref}"
-                }
-            }
-        ]
-    },
-    "tagRenderings": [
-        "images",
-        {
-            "render": "<b>{live({url},{url:format},hour)}</b> cyclists last hour<br/><b>{live({url},{url:format},day)}</b> cyclists today<br/><b>{live({url},{url:format},year)}</b> cyclists this year<br/>",
-            "condition": {
-                "and": [
-                    "url~*",
-                    "url:format~*"
-                ]
-            }
-        }
-    ],
-    "icon": {
-        "render": "./assets/layers/bike_monitoring_station/monitoring_station.svg"
-    },
-    "width": {
-        "render": "8"
-    },
-    "iconSize": {
-        "render": "40,40,center"
-    },
-    "color": {
-        "render": "#00f"
-    },
-    "presets": []
-}
\ No newline at end of file
diff --git a/assets/layers/bike_monitoring_station/license_info.json b/assets/layers/bike_monitoring_station/license_info.json
deleted file mode 100644
index 45abb1c69b..0000000000
--- a/assets/layers/bike_monitoring_station/license_info.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "path": "monitoring_station.svg",
-    "license": "CC-BY-SA 3.0",
-    "authors": [
-      "Fabián Alexis"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Antu_chronometer-reset.svg"
-    ]
-  }
-]
\ No newline at end of file
diff --git a/assets/layers/bike_monitoring_station/monitoring_station.svg b/assets/layers/bike_monitoring_station/monitoring_station.svg
deleted file mode 100644
index a780b4ea8f..0000000000
--- a/assets/layers/bike_monitoring_station/monitoring_station.svg
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-        xmlns:dc="http://purl.org/dc/elements/1.1/"
-        xmlns:cc="http://creativecommons.org/ns#"
-        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-        xmlns="http://www.w3.org/2000/svg"
-        id="svg27"
-        version="1.1"
-        fill="none"
-        viewBox="0 0 97 123"
-        height="123"
-        width="97">
-    <metadata
-            id="metadata31">
-        <rdf:RDF>
-            <cc:Work
-                    rdf:about="">
-                <dc:format>image/svg+xml</dc:format>
-                <dc:type
-                        rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-                <dc:title></dc:title>
-            </cc:Work>
-        </rdf:RDF>
-    </metadata>
-    <path
-            style="fill:#ffd42a"
-            id="path2"
-            fill="#5675DF"
-            d="M52.1412 111.419C50.4633 115.605 44.5366 115.605 42.8588 111.419L24.7014 66.1099C23.385 62.8252 25.8039 59.25 29.3426 59.25L65.6574 59.25C69.1962 59.25 71.615 62.8252 70.2986 66.11L52.1412 111.419Z"/>
-    <ellipse
-            style="fill:#ffd42a"
-            id="ellipse4"
-            fill="#5675DF"
-            ry="47.5"
-            rx="48.5"
-            cy="47.5"
-            cx="48.5"/>
-    <defs
-            id="defs25">
-        <filter
-                color-interpolation-filters="sRGB"
-                filterUnits="userSpaceOnUse"
-                height="53.5"
-                width="40.7188"
-                y="25.5"
-                x="32.2812"
-                id="filter0_d">
-            <feFlood
-                    id="feFlood10"
-                    result="BackgroundImageFix"
-                    flood-opacity="0"/>
-            <feColorMatrix
-                    id="feColorMatrix12"
-                    values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
-                    type="matrix"
-                    in="SourceAlpha"/>
-            <feOffset
-                    id="feOffset14"
-                    dy="4"/>
-            <feGaussianBlur
-                    id="feGaussianBlur16"
-                    stdDeviation="2"/>
-            <feColorMatrix
-                    id="feColorMatrix18"
-                    values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
-                    type="matrix"/>
-            <feBlend
-                    id="feBlend20"
-                    result="effect1_dropShadow"
-                    in2="BackgroundImageFix"
-                    mode="normal"/>
-            <feBlend
-                    id="feBlend22"
-                    result="shape"
-                    in2="effect1_dropShadow"
-                    in="SourceGraphic"
-                    mode="normal"/>
-        </filter>
-    </defs>
-    <g
-            style="fill:#ffffff"
-            transform="matrix(0.1210062,0,0,0.1210062,13.583344,11.282657)"
-            id="g844">
-        <path
-                d="m 464.99,141.27 c 0,0 8.996,9.05 15.346,0.017 l 12.1,-17.349 c 4.225,-6.103 -1.231,-10.327 -1.796,-10.744 l -73.41,-51.29 h -0.017 c -4.52,-3.145 -7.521,-1.236 -9.1,0.533 l -1.311,1.891 -11.181,16.01 c -0.053,0.061 -6.315,9.937 3.695,15.16 v 0.013 c 14.295,7.03 40.526,21.868 65.66,45.814 l 0.018,-0.051"
-                id="path838"/>
-        <path
-                d="M 341.45,0 H 225.76 c -8.978,0 -16.334,7.213 -16.334,16.338 v 13.484 c 0,9.112 7.356,16.468 16.334,16.468 h 5.725 v 9.521 c 0.009,13.688 8.648,14.825 12.985,14.534 0.737,-0.109 1.501,-0.226 2.308,-0.33 0.009,0 0.122,-0.026 0.122,-0.026 h -0.009 c 15.397,-2.108 40.9,-4.125 70.15,-0.403 l 0.017,-0.026 c 0,0 18.737,3.474 18.686,-13.758 v -9.52 h 5.725 c 8.987,0 16.325,-7.348 16.325,-16.473 V 16.338 C 357.7939,7.221 350.437,0 341.45,0"
-                id="path840"/>
-        <path
-                d="m 11,5.563 c -3.71,0 -6.719,3.01 -6.719,6.719 0,3.71 3.01,6.719 6.719,6.719 3.71,0 6.719,-3.01 6.719,-6.719 0,-3.711 -3.01,-6.719 -6.719,-6.719 m 0.1,2.938 c 0.542,0 1.06,0.107 1.553,0.318 0.493,0.212 0.918,0.496 1.275,0.854 0.358,0.358 0.644,0.782 0.855,1.275 0.212,0.493 0.316,1.011 0.316,1.553 0,0.542 -0.105,1.06 -0.316,1.553 -0.212,0.493 -0.498,0.918 -0.855,1.275 -0.358,0.358 -0.782,0.642 -1.275,0.854 -0.493,0.212 -1.011,0.318 -1.553,0.318 -0.597,0 -1.165,-0.125 -1.703,-0.377 C 8.859,15.872 8.401,15.516 8.022,15.058 7.998,15.023 7.987,14.984 7.989,14.941 7.991,14.898 8.006,14.863 8.034,14.836 l 0.713,-0.719 c 0.035,-0.031 0.079,-0.047 0.131,-0.047 0.056,0.007 0.095,0.028 0.119,0.063 0.253,0.33 0.564,0.585 0.932,0.766 0.368,0.181 0.759,0.27 1.172,0.27 0.361,0 0.707,-0.07 1.035,-0.211 0.328,-0.141 0.612,-0.331 0.852,-0.57 0.24,-0.24 0.43,-0.523 0.57,-0.852 0.141,-0.328 0.211,-0.672 0.211,-1.033 0,-0.361 -0.07,-0.705 -0.211,-1.033 -0.141,-0.328 -0.331,-0.612 -0.57,-0.852 -0.24,-0.24 -0.523,-0.43 -0.852,-0.57 -0.328,-0.141 -0.674,-0.211 -1.035,-0.211 -0.34,0 -0.666,0.06 -0.979,0.184 -0.312,0.123 -0.591,0.3 -0.834,0.529 l 0.715,0.719 c 0.108,0.104 0.131,0.224 0.072,0.359 -0.059,0.139 -0.161,0.209 -0.307,0.209 H 7.434 c -0.09,0 -0.168,-0.034 -0.234,-0.1 C 7.134,11.671 7.1,11.593 7.1,11.503 V 9.169 C 7.1,9.023 7.17,8.921 7.309,8.862 7.444,8.803 7.564,8.827 7.668,8.934 L 8.346,9.606 C 8.718,9.255 9.142,8.984 9.619,8.792 c 0.477,-0.193 0.97,-0.289 1.48,-0.289"
-                transform="matrix(35.45144,0,0,35.45144,-106.35,-106.35)"
-                id="path842"/>
-    </g>
-</svg>
diff --git a/assets/themes/bike_monitoring_station/bike_monitoring_stations.json b/assets/themes/bike_monitoring_station/bike_monitoring_stations.json
deleted file mode 100644
index 5703e2ed50..0000000000
--- a/assets/themes/bike_monitoring_station/bike_monitoring_stations.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "id": "bike_monitoring_stations",
-  "title": {
-    "en": "Bike Monitoring stations",
-    "nl": "Fietstelstations",
-    "it": "Stazioni di monitoraggio biciclette",
-    "ru": "Станции мониторинга велосипедов",
-    "ja": "自転車監視ステーション",
-    "zh_Hant": "自行車監視站",
-    "fr": "Station de comptage vélo",
-    "pt_BR": "Estações de monitoramento de bicicletas"
-  },
-  "shortDescription": {
-    "en": "Bike monitoring stations with live data from Brussels Mobility",
-    "nl": "Fietstelstations met live data van Brussel Mobiliteit",
-    "it": "Stazioni di monitoraggio bici con dati in tempo reale forniti da Bruxelles Mobility",
-    "ru": "Станции мониторинга велосипедов с оперативными данными от Brussels Mobility",
-    "ja": "Brussels Mobilityのライブデータを使用した自転車モニタリングステーション",
-    "zh_Hant": "布魯塞爾車行資料的即時單車監視站資料",
-    "fr": "Station de comptage vélo avec données en temps réel par Bruxelles Mobilités",
-    "pt_BR": "Estações de monitoramento de bicicletas com dados ao vivo da Mobilidade de Bruxelas"
-  },
-  "description": {
-    "en": "This theme shows bike monitoring stations with live data",
-    "nl": "Dit thema toont fietstelstations met live data",
-    "it": "Questo tema mostra le stazioni di monitoraggio bici con dati dal vivo",
-    "ru": "В этой теме показаны станции мониторинга велосипедов с данными в реальном времени",
-    "ja": "このテーマでは、ライブデータのある自転車監視ステーションを示します",
-    "zh_Hant": "這個主題顯示單車監視站的即時資料",
-    "fr": "Ce thème montre les données des compteurs en temps réel",
-    "pt_BR": "Este tema mostra as estações de monitoramento de bicicletas com dados ao vivo"
-  },
-  "language": [
-    "en",
-    "nl",
-    "it",
-    "ru",
-    "ja",
-    "zh_Hant",
-    "fr",
-    "pt_BR"
-  ],
-  "hideFromOverview": true,
-  "maintainer": "",
-  "icon": "./assets/layers/bike_monitoring_station/monitoring_station.svg",
-  "version": "0",
-  "startLat": 50.8435,
-  "startLon": 4.3688,
-  "startZoom": 14,
-  "widenFactor": 0.05,
-  "socialImage": "",
-  "layers": [
-    "bike_monitoring_station"
-  ],
-  "roamingRenderings": [],
-  "defaultBackgroundId": "Stadia.AlidadeSmoothDark"
-}
\ No newline at end of file