diff --git a/assets/layers/defibrillator/defibrillator.json b/assets/layers/defibrillator/defibrillator.json
index 5315a9040..829a52d6d 100644
--- a/assets/layers/defibrillator/defibrillator.json
+++ b/assets/layers/defibrillator/defibrillator.json
@@ -688,37 +688,7 @@
       ],
       "id": "defibrillator-survey:date"
     },
-    {
-      "render": {
-        "en": "Extra information for OpenStreetMap experts: {fixme}",
-        "nl": "Extra informatie voor OpenStreetMap experts: {fixme}",
-        "fr": "Informations supplémentaires pour les experts d'OpenStreetMap : {fixme}",
-        "it": "Informazioni aggiuntive per gli esperti di OpenStreetMap: {fixme}",
-        "de": "Zusätzliche Informationen für OpenStreetMap-Experten: {fixme}",
-        "ru": "Дополнительная информация для экспертов OpenStreetMap: {fixme}",
-        "sl": "Dodatne informacije za OpenStreetMap strokovnjake: {fixme}",
-        "es": "Información adicional para expertos de OpenStreetMap: {fixme}",
-        "ca": "Informació addicional per als experts en OpenStreetMap: {fixme}",
-        "pl": "Więcej informacji dla doświadczonych użytkowników OpenStreetMap: {fixme}",
-        "cs": "Další informace pro experty OpenStreetMap: {fixme}"
-      },
-      "question": {
-        "en": "Is there something wrong with how this is mapped, that you weren't able to fix here? (leave a note to OpenStreetMap experts)",
-        "nl": "Is er iets mis met de informatie over deze defibrillator dat je hier niet opgelost kreeg? (laat hier een berichtje achter voor OpenStreetMap experts)",
-        "fr": "Y a-t-il quelque chose qui ne va pas dans la manière dont ça a été cartographié, et que vous n'avez pas pu réparer ici ? (laisser une note pour les experts d'OpenStreetMap)",
-        "it": "C'è qualcosa di sbagliato nel modo in cui è mappato, che non sei riuscito a correggere qui? (lascia una nota agli esperti di OpenStreetMap)",
-        "de": "Gibt es einen Fehler in der Kartierung, den Sie hier nicht beheben konnten? (hinterlasse eine Notiz für OpenStreetMap-Experten)",
-        "sl": "Ali je kaj narobe s tem vnosom na zemljevid, in tega niste mogli sami popraviti tu? (pustite opombo OpenStreetMap strokovnjakom)",
-        "es": "¿Hay algo mal en cómo está mapeado esto, que no hayas podido arreglar aquí? (deja una nota para los expertos de OpenStreetMap)",
-        "ca": "Hi ha alguna cosa malament en la manera de com està mapejat això, que no heu pogut solucionar aquí? (deixeu una nota als experts d'OpenStreetMap)",
-        "cs": "Je na tom, jak je to zmapováno, něco v nepořádku, co jste zde nedokázali opravit? (zanechte poznámku odborníkům na OpenStreetMap)"
-      },
-      "freeform": {
-        "key": "fixme",
-        "type": "text"
-      },
-      "id": "defibrillator-fixme"
-    }
+    "fixme"
   ],
   "filter": [
     "has_image",
diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json
index a85373e64..ff566ac8a 100644
--- a/assets/layers/questions/questions.json
+++ b/assets/layers/questions/questions.json
@@ -765,6 +765,36 @@
         "cs": "Neopakujte již uvedená fakta"
       }
     },
+    {
+      "render": {
+        "en": "Extra information for OpenStreetMap experts: {fixme}",
+        "nl": "Extra informatie voor OpenStreetMap experts: {fixme}",
+        "fr": "Informations supplémentaires pour les experts d'OpenStreetMap : {fixme}",
+        "it": "Informazioni aggiuntive per gli esperti di OpenStreetMap: {fixme}",
+        "de": "Zusätzliche Informationen für OpenStreetMap-Experten: {fixme}",
+        "ru": "Дополнительная информация для экспертов OpenStreetMap: {fixme}",
+        "sl": "Dodatne informacije za OpenStreetMap strokovnjake: {fixme}",
+        "es": "Información adicional para expertos de OpenStreetMap: {fixme}",
+        "ca": "Informació addicional per als experts en OpenStreetMap: {fixme}",
+        "pl": "Więcej informacji dla doświadczonych użytkowników OpenStreetMap: {fixme}",
+        "cs": "Další informace pro experty OpenStreetMap: {fixme}"
+      },
+      "question": {
+        "en": "Is there something wrong with how this is mapped, that you weren't able to fix here? (leave a note to OpenStreetMap experts)",
+        "fr": "Y a-t-il quelque chose qui ne va pas dans la manière dont ça a été cartographié, et que vous n'avez pas pu réparer ici ? (laisser une note pour les experts d'OpenStreetMap)",
+        "it": "C'è qualcosa di sbagliato nel modo in cui è mappato, che non sei riuscito a correggere qui? (lascia una nota agli esperti di OpenStreetMap)",
+        "de": "Gibt es einen Fehler in der Kartierung, den Sie hier nicht beheben konnten? (hinterlasse eine Notiz für OpenStreetMap-Experten)",
+        "sl": "Ali je kaj narobe s tem vnosom na zemljevid, in tega niste mogli sami popraviti tu? (pustite opombo OpenStreetMap strokovnjakom)",
+        "es": "¿Hay algo mal en cómo está mapeado esto, que no hayas podido arreglar aquí? (deja una nota para los expertos de OpenStreetMap)",
+        "ca": "Hi ha alguna cosa malament en la manera de com està mapejat això, que no heu pogut solucionar aquí? (deixeu una nota als experts d'OpenStreetMap)",
+        "cs": "Je na tom, jak je to zmapováno, něco v nepořádku, co jste zde nedokázali opravit? (zanechte poznámku odborníkům na OpenStreetMap)"
+      },
+      "freeform": {
+        "key": "fixme",
+        "type": "text"
+      },
+      "id": "fixme"
+    },
     {
       "id": "opening_hours",
       "question": {
diff --git a/assets/layers/sauna/sauna.json b/assets/layers/sauna/sauna.json
index c941ae593..bf1c3b555 100644
--- a/assets/layers/sauna/sauna.json
+++ b/assets/layers/sauna/sauna.json
@@ -87,7 +87,7 @@
       ]
     },
     "contact",
-    "defibrillator.defibrillator-fixme"
+    "fixme"
   ],
   "lineRendering": [
     {
diff --git a/assets/layers/sauna/sauna_at_leisure.json b/assets/layers/sauna/sauna_at_leisure.json
index 9b824f739..47200c442 100644
--- a/assets/layers/sauna/sauna_at_leisure.json
+++ b/assets/layers/sauna/sauna_at_leisure.json
@@ -189,7 +189,7 @@
       ]
     },
     "contact",
-    "defibrillator.defibrillator-fixme"
+    "fixme"
   ],
   "lineRendering": [
     {