diff --git a/assets/layers/atm/atm.json b/assets/layers/atm/atm.json
index 1f85c02cd1..eda4cbc349 100644
--- a/assets/layers/atm/atm.json
+++ b/assets/layers/atm/atm.json
@@ -192,58 +192,41 @@
       }
     },
     {
-      "id": "operator",
-      "question": {
-        "en": "What company operates this ATM?",
-        "de": "Welches Unternehmen betreibt den Geldautomaten?",
-        "fr": "Quelle société exploite ce DAB ?",
-        "nl": "Welk bedrijf beheert deze geldautomaat?",
-        "nb_NO": "Hvilket selskap driver denne minibanken?",
-        "ca": "Quina companyia opera aquest caixer?",
-        "cs": "Která společnost provozuje tento bankomat?",
-        "he": "איזו חברה מפעילה את הכספומט הזה?",
-        "pl": "Jaka firma obsługuje ten bankomat?",
-        "pt_BR": "Qual companhia opera esse caixa eletrônico?",
-        "es": "¿Qué empresa opera este cajero automático?",
-        "pt": "Qual companhia opera este multibanco?",
-        "it": "Quale azienda gestisce questo sportello bancomat?"
-      },
-      "render": {
-        "en": "The ATM is operated by {operator}",
-        "de": "Der Geldautomat wird betrieben von {operator}",
-        "fr": "Ce DAB est exploité par {operator}",
-        "nl": "Deze geldautomaat wordt beheerd door {operator}",
-        "nb_NO": "Minibanken drives av {operator}",
-        "ca": "{operator} opera aquest caixer",
-        "cs": "Bankomat provozuje {operator}",
-        "he": "הכספומט מופעל על ידי {operator}",
-        "pl": "Ten bankomat jest obsługiwany przez {operator}",
-        "pt_BR": "O caixa eletrônico é operado por {operator}",
-        "es": "El cajero automático es operado por {operator}",
-        "pt": "O multibanco é operado por {operator}",
-        "sl": "Ta bankomat upravlja {operator}",
-        "it": "Lo sportello bancomat è gestito da {operator}"
-      },
-      "freeform": {
-        "key": "operator",
-        "type": "string",
-        "placeholder": {
-          "en": "Operator",
-          "de": "Betreiber",
-          "fr": "Opérateur",
-          "nl": "Beheerder",
-          "ca": "Operador",
-          "cs": "Operátor",
-          "he": "מפעיל",
-          "eu": "Operadorea",
-          "pt_BR": "Operador",
-          "es": "Operador",
-          "pt": "Operador",
-          "it": "Operatore",
-          "cy": "Gweithredwr"
+      "builtin": "operator",
+      "override": {
+        "condition": "amenity!=bank",
+        "question": {
+          "en": "What company operates this ATM?",
+          "de": "Welches Unternehmen betreibt den Geldautomaten?",
+          "fr": "Quelle société exploite ce DAB ?",
+          "nl": "Welk bedrijf beheert deze geldautomaat?",
+          "nb_NO": "Hvilket selskap driver denne minibanken?",
+          "ca": "Quina companyia opera aquest caixer?",
+          "cs": "Která společnost provozuje tento bankomat?",
+          "he": "איזו חברה מפעילה את הכספומט הזה?",
+          "pl": "Jaka firma obsługuje ten bankomat?",
+          "pt_BR": "Qual companhia opera esse caixa eletrônico?",
+          "es": "¿Qué empresa opera este cajero automático?",
+          "pt": "Qual companhia opera este multibanco?",
+          "it": "Quale azienda gestisce questo sportello bancomat?"
+        },
+        "render": {
+          "en": "The ATM is operated by {operator}",
+          "de": "Der Geldautomat wird betrieben von {operator}",
+          "fr": "Ce DAB est exploité par {operator}",
+          "nl": "Deze geldautomaat wordt beheerd door {operator}",
+          "nb_NO": "Minibanken drives av {operator}",
+          "ca": "{operator} opera aquest caixer",
+          "cs": "Bankomat provozuje {operator}",
+          "he": "הכספומט מופעל על ידי {operator}",
+          "pl": "Ten bankomat jest obsługiwany przez {operator}",
+          "pt_BR": "O caixa eletrônico é operado por {operator}",
+          "es": "El cajero automático es operado por {operator}",
+          "pt": "O multibanco é operado por {operator}",
+          "sl": "Ta bankomat upravlja {operator}",
+          "it": "Lo sportello bancomat è gestito da {operator}"
         }
-      },
-      "condition": "amenity!=bank"
+      }
     },
     "opening_hours_24_7",
     {
diff --git a/assets/layers/fitness_station/fitness_station.json b/assets/layers/fitness_station/fitness_station.json
index 72db0d2004..ba87844aa0 100644
--- a/assets/layers/fitness_station/fitness_station.json
+++ b/assets/layers/fitness_station/fitness_station.json
@@ -535,37 +535,37 @@
       "multiAnswer": true
     },
     {
-      "id": "operator",
-      "question": {
-        "en": "Who maintains this fitness station?",
-        "de": "Wer betreibt die Fitness-Station?",
-        "nl": "Wie beheert dit fitness-toestel?",
-        "ca": "Qui manté l'estació de fitness?",
-        "cs": "Kdo spravuje tuto fitness stanici?",
-        "es": "¿Quién mantiene esta estación de fitness?",
-        "it": "Chi mantiene questa stazione fitness?"
-      },
-      "render": {
-        "en": "The fitness station is maintained by {operator}.",
-        "de": "Die Fitness-Station wird betrieben von {operator}.",
-        "nl": "Dit fitness-toestel wordt beheerd door {operator}",
-        "ca": "{operator} manté l'estació de fitness.",
-        "cs": "Fitness stanici spravuje {operator}.",
-        "es": "La estación de fitness es mantenida por {operator}.",
-        "it": "La stazione fitness è mantenuta da {operator}."
-      },
-      "freeform": {
-        "key": "operator",
-        "placeholder": {
-          "en": "Operator of the fitness station",
-          "de": "Betreiber der Fitness-Station",
-          "nl": "Beheerder van het fitness-toestel",
-          "cs": "Provozovatel fitness stanice",
-          "es": "Operador de la estación de fitness",
-          "ca": "Operador de l'estació de fitness",
-          "it": "Gestore della stazione fitness"
+      "builtin": "operator",
+      "override": {
+        "question": {
+          "en": "Who maintains this fitness station?",
+          "de": "Wer betreibt die Fitness-Station?",
+          "nl": "Wie beheert dit fitness-toestel?",
+          "ca": "Qui manté l'estació de fitness?",
+          "cs": "Kdo spravuje tuto fitness stanici?",
+          "es": "¿Quién mantiene esta estación de fitness?",
+          "it": "Chi mantiene questa stazione fitness?"
         },
-        "type": "string"
+        "render": {
+          "en": "The fitness station is maintained by {operator}.",
+          "de": "Die Fitness-Station wird betrieben von {operator}.",
+          "nl": "Dit fitness-toestel wordt beheerd door {operator}",
+          "ca": "{operator} manté l'estació de fitness.",
+          "cs": "Fitness stanici spravuje {operator}.",
+          "es": "La estación de fitness es mantenida por {operator}.",
+          "it": "La stazione fitness è mantenuta da {operator}."
+        },
+        "freeform": {
+          "placeholder": {
+            "en": "Operator of the fitness station",
+            "de": "Betreiber der Fitness-Station",
+            "nl": "Beheerder van het fitness-toestel",
+            "cs": "Provozovatel fitness stanice",
+            "es": "Operador de la estación de fitness",
+            "ca": "Operador de l'estació de fitness",
+            "it": "Gestore della stazione fitness"
+          }
+        }
       }
     },
     "opening_hours_24_7"
@@ -578,4 +578,4 @@
     "enableImproveAccuracy": true
   },
   "allowCopy": true
-}
+}
\ No newline at end of file
diff --git a/assets/layers/parcel_lockers/parcel_lockers.json b/assets/layers/parcel_lockers/parcel_lockers.json
index 903aec5dea..d34eccaa61 100644
--- a/assets/layers/parcel_lockers/parcel_lockers.json
+++ b/assets/layers/parcel_lockers/parcel_lockers.json
@@ -146,44 +146,30 @@
       }
     },
     {
-      "id": "operator",
-      "question": {
-        "en": "What is the operator of the parcel locker?",
-        "de": "Was ist der Betreiber des Paketschließfachs?",
-        "nl": "Wie is de beheerder van deze pakketautomaat?",
-        "ca": "Qui gestiona aquesta bústia intel·ligent?",
-        "fr": "Quel est l'exploitant de ce casier à colis ?",
-        "cs": "Kdo je provozovatelem schránky na balíky?",
-        "es": "¿Cuál es el operador de la taquilla de paquetes?",
-        "it": "Chi è l'operatore dell'armadietto per pacchi?",
-        "uk": "Який оператор поштомату?"
-      },
-      "render": {
-        "en": "This parcel locker is operated by {operator}",
-        "de": "Dieses Paketschließfach wird von {operator} betrieben",
-        "nl": "Deze pakketautomaat wordt beheerd door {operator}",
-        "ca": "Aquesta bústia intel·ligent la gestiona {operator}",
-        "fr": "Ce casier à colis est exploité par {operator}",
-        "pl": "Ten paczkomat jest obsługiwany przez {operator}",
-        "cs": "Tuto schránku na balíky provozuje {operator}",
-        "es": "Esta taquilla de paquetes es operada por {operator}",
-        "it": "Questo armadietto per pacchi è gestito da {operator}",
-        "uk": "Цей посилкова шафка обслуговується компанією {operator}"
-      },
-      "freeform": {
-        "key": "operator",
-        "type": "string",
-        "placeholder": {
-          "en": "Operator",
-          "de": "Betreiber",
-          "nl": "Beheerder",
-          "ca": "Gestor",
-          "fr": "Exploitant",
-          "pl": "Operator",
-          "cs": "Operátor",
-          "es": "Operador",
-          "cy": "Gweithredwr",
-          "it": "Operatore"
+      "builtin": "operator",
+      "override": {
+        "question": {
+          "en": "What is the operator of the parcel locker?",
+          "de": "Was ist der Betreiber des Paketschließfachs?",
+          "nl": "Wie is de beheerder van deze pakketautomaat?",
+          "ca": "Qui gestiona aquesta bústia intel·ligent?",
+          "fr": "Quel est l'exploitant de ce casier à colis ?",
+          "cs": "Kdo je provozovatelem schránky na balíky?",
+          "es": "¿Cuál es el operador de la taquilla de paquetes?",
+          "it": "Chi è l'operatore dell'armadietto per pacchi?",
+          "uk": "Який оператор поштомату?"
+        },
+        "render": {
+          "en": "This parcel locker is operated by {operator}",
+          "de": "Dieses Paketschließfach wird von {operator} betrieben",
+          "nl": "Deze pakketautomaat wordt beheerd door {operator}",
+          "ca": "Aquesta bústia intel·ligent la gestiona {operator}",
+          "fr": "Ce casier à colis est exploité par {operator}",
+          "pl": "Ten paczkomat jest obsługiwany przez {operator}",
+          "cs": "Tuto schránku na balíky provozuje {operator}",
+          "es": "Esta taquilla de paquetes es operada por {operator}",
+          "it": "Questo armadietto per pacchi è gestito da {operator}",
+          "uk": "Цей посилкова шафка обслуговується компанією {operator}"
         }
       }
     },
@@ -339,4 +325,4 @@
     "enableImproveAccuracy": true
   },
   "allowCopy": true
-}
+}
\ No newline at end of file
diff --git a/assets/layers/postboxes/postboxes.json b/assets/layers/postboxes/postboxes.json
index 32f7466766..6a1894de43 100644
--- a/assets/layers/postboxes/postboxes.json
+++ b/assets/layers/postboxes/postboxes.json
@@ -145,25 +145,24 @@
       "render": "{minimap(18): height: 5rem; overflow: hidden; border-radius:3rem; }"
     },
     {
-      "id": "operator",
-      "question": {
-        "en": "Who operates this postbox?",
-        "de": "Wer betreibt diesen Briefkasten?",
-        "es": "¿Quién gestiona este buzón?",
-        "ca": "Qui opera aquesta bústia?",
-        "cs": "Kdo provozuje tuto poštovní schránku?",
-        "it": "Chi gestisce questa cassetta postale?"
-      },
-      "render": {
-        "en": "This postbox is operated by <b>{operator}</b>",
-        "de": "Dieser Briefkasten wird von <b>{operator}</b> betrieben",
-        "es": "Este buzón es operado por <b>{operator}</b>.",
-        "ca": "Aquesta bústia està operada per <b>{operator}</b>",
-        "cs": "Tuto poštovní schránku provozuje <b>{operator}</b>",
-        "it": "Questa cassetta postale è gestita da <b>{operator}</b>"
-      },
-      "freeform": {
-        "key": "operator"
+      "builtin": "operator",
+      "override": {
+        "question": {
+          "en": "Who operates this postbox?",
+          "de": "Wer betreibt diesen Briefkasten?",
+          "es": "¿Quién gestiona este buzón?",
+          "ca": "Qui opera aquesta bústia?",
+          "cs": "Kdo provozuje tuto poštovní schránku?",
+          "it": "Chi gestisce questa cassetta postale?"
+        },
+        "render": {
+          "en": "This postbox is operated by <b>{operator}</b>",
+          "de": "Dieser Briefkasten wird von <b>{operator}</b> betrieben",
+          "es": "Este buzón es operado por <b>{operator}</b>.",
+          "ca": "Aquesta bústia està operada per <b>{operator}</b>",
+          "cs": "Tuto poštovní schránku provozuje <b>{operator}</b>",
+          "it": "Questa cassetta postale è gestita da <b>{operator}</b>"
+        }
       }
     }
   ],
@@ -194,4 +193,4 @@
       "pakjes"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/assets/layers/public_bookcase/public_bookcase.json b/assets/layers/public_bookcase/public_bookcase.json
index 404d51060e..84f3e2b2e1 100644
--- a/assets/layers/public_bookcase/public_bookcase.json
+++ b/assets/layers/public_bookcase/public_bookcase.json
@@ -410,34 +410,32 @@
       "condition": "indoor=yes"
     },
     {
-      "id": "public_bookcase-operator",
-      "question": {
-        "en": "Who maintains this public bookcase?",
-        "nl": "Wie is verantwoordelijk voor dit boekenruilkastje?",
-        "de": "Wer betreibt den Bücherschrank?",
-        "fr": "Qui entretien cette microbibliothèque ?",
-        "it": "Chi mantiene questa libreria pubblica?",
-        "hu": "Ki tartja fenn ezt a nyilvános könyvespolcot?",
-        "ca": "Qui gestiona aquesta prestatgeria pública?",
-        "cs": "Kdo tuto veřejnou knihobudku spravuje?",
-        "es": "¿Quién mantiene este librero público?",
-        "da": "Hvem står for at vedligeholde dette bogbytteskab?"
-      },
-      "render": {
-        "en": "Operated by {operator}",
-        "nl": "Onderhouden door {operator}",
-        "de": "Betrieben von {operator}",
-        "fr": "Entretenue par {operator}",
-        "it": "Gestita da {operator}",
-        "hu": "Üzemeltető: {operator}",
-        "ca": "Gestionant per {operator}",
-        "cs": "Provozuje {operator}",
-        "es": "Operado por {operator}",
-        "da": "Drevet af {operator}"
-      },
-      "freeform": {
-        "type": "string",
-        "key": "operator"
+      "builtin": "operator",
+      "override": {
+        "question": {
+          "en": "Who maintains this public bookcase?",
+          "nl": "Wie is verantwoordelijk voor dit boekenruilkastje?",
+          "de": "Wer betreibt den Bücherschrank?",
+          "fr": "Qui entretien cette microbibliothèque ?",
+          "it": "Chi mantiene questa libreria pubblica?",
+          "hu": "Ki tartja fenn ezt a nyilvános könyvespolcot?",
+          "ca": "Qui gestiona aquesta prestatgeria pública?",
+          "cs": "Kdo tuto veřejnou knihobudku spravuje?",
+          "es": "¿Quién mantiene este librero público?",
+          "da": "Hvem står for at vedligeholde dette bogbytteskab?"
+        },
+        "render": {
+          "en": "This public bookcase is operated by {operator}",
+          "nl": "Onderhouden door {operator}",
+          "de": "Betrieben von {operator}",
+          "fr": "Entretenue par {operator}",
+          "it": "Gestita da {operator}",
+          "hu": "Üzemeltető: {operator}",
+          "ca": "Gestionant per {operator}",
+          "cs": "Provozuje {operator}",
+          "es": "Operado por {operator}",
+          "da": "Drevet af {operator}"
+        }
       }
     },
     {
@@ -735,4 +733,4 @@
     "neededChangesets": 5
   },
   "allowMove": true
-}
+}
\ No newline at end of file
diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json
index d52140615f..93eca0fc0e 100644
--- a/assets/layers/questions/questions.json
+++ b/assets/layers/questions/questions.json
@@ -3390,6 +3390,35 @@
         "key": "ref"
       }
     },
+    {
+      "id": "operator",
+      "question": {
+        "en": "What company operates this place?"
+      },
+      "render": {
+        "en": "This place is operated by <b>{operator}</b>"
+      },
+      "freeform": {
+        "key": "operator",
+        "type": "string",
+        "placeholder": {
+          "en": "Operator",
+          "de": "Betreiber",
+          "fr": "Opérateur",
+          "nl": "Beheerder",
+          "ca": "Operador",
+          "cs": "Operátor",
+          "he": "מפעיל",
+          "eu": "Operadorea",
+          "pt_BR": "Operador",
+          "pl": "Operator",
+          "es": "Operador",
+          "pt": "Operador",
+          "it": "Operatore",
+          "cy": "Gweithredwr"
+        }
+      }
+    },
     {
       "id": "child_highchair",
       "question": {
@@ -3529,4 +3558,4 @@
       }
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/assets/layers/recycling/recycling.json b/assets/layers/recycling/recycling.json
index 52758d5c6d..6348f4a922 100644
--- a/assets/layers/recycling/recycling.json
+++ b/assets/layers/recycling/recycling.json
@@ -1328,30 +1328,28 @@
       "multiAnswer": true
     },
     {
-      "id": "operator",
-      "question": {
-        "en": "What company operates this recycling facility?",
-        "nl": "Wat is de beheerder van deze recyclingfaciliteit?",
-        "de": "Welches Unternehmen betreibt diese Recyclinganlage?",
-        "es": "¿Qué empresa opera esta instalación de reciclaje?",
-        "it": "Quale azienda gestisce questa struttura di riciclaggio?",
-        "ca": "Quina empresa opera aquesta infraestructura de reciclatge?",
-        "fr": "Quelle entreprise gère ce point de recyclage ?",
-        "cs": "Jaká společnost provozuje toto recyklační zařízení?"
-      },
-      "render": {
-        "en": "This recycling facility is operated by {operator}",
-        "nl": "Deze recyclingfaciliteit wordt beheerd door {operator}",
-        "de": "Die Recyclingeinrichtung wird betrieben von {operator}",
-        "es": "Esta instalación de reciclaje está operada por {operator}",
-        "it": "Questa struttura di riciclaggio è gestita da {operator}",
-        "ca": "Aquesta infraestuctura de reciclatge està operada per {operator}",
-        "fr": "Ce point de recyclage est géré par {operator}",
-        "cs": "Toto recyklační zařízení provozuje {operator}"
-      },
-      "freeform": {
-        "key": "operator",
-        "type": "string"
+      "builtin": "operator",
+      "override": {
+        "question": {
+          "en": "What company operates this recycling facility?",
+          "nl": "Wat is de beheerder van deze recyclingfaciliteit?",
+          "de": "Welches Unternehmen betreibt diese Recyclinganlage?",
+          "es": "¿Qué empresa opera esta instalación de reciclaje?",
+          "it": "Quale azienda gestisce questa struttura di riciclaggio?",
+          "ca": "Quina empresa opera aquesta infraestructura de reciclatge?",
+          "fr": "Quelle entreprise gère ce point de recyclage ?",
+          "cs": "Jaká společnost provozuje toto recyklační zařízení?"
+        },
+        "render": {
+          "en": "This recycling facility is operated by {operator}",
+          "nl": "Deze recyclingfaciliteit wordt beheerd door {operator}",
+          "de": "Die Recyclingeinrichtung wird betrieben von {operator}",
+          "es": "Esta instalación de reciclaje está operada por {operator}",
+          "it": "Questa struttura di riciclaggio è gestita da {operator}",
+          "ca": "Aquesta infraestuctura de reciclatge està operada per {operator}",
+          "fr": "Ce point de recyclage est géré par {operator}",
+          "cs": "Toto recyklační zařízení provozuje {operator}"
+        }
       }
     },
     {
@@ -1906,4 +1904,4 @@
     "enableRelocation": true,
     "enableImproveAccuracy": true
   }
-}
+}
\ No newline at end of file
diff --git a/assets/layers/ticket_machine/ticket_machine.json b/assets/layers/ticket_machine/ticket_machine.json
index f1eee91732..339a9d4ae0 100644
--- a/assets/layers/ticket_machine/ticket_machine.json
+++ b/assets/layers/ticket_machine/ticket_machine.json
@@ -79,56 +79,45 @@
     "images",
     "level",
     {
-      "id": "operator",
-      "question": {
-        "en": "Who is the operator of this ticket machine?",
-        "de": "Wer ist der Betreiber dieses Fahrkartenautomaten?",
-        "nl": "Wie is de beheerder van deze kaartautomaat?",
-        "ca": "Qui és l'operador d'aquesta màquina de venda de bitllets?",
-        "cs": "Kdo je provozovatelem tohoto automatu na jízdenky?",
-        "es": "¿Quién es el operador de esta máquina expendedora de billetes?",
-        "it": "Chi è l'operatore di questa biglietteria automatica?"
-      },
-      "render": {
-        "en": "This ticket machine is operated by {operator}",
-        "de": "Dieser Fahrkartenautomat wird betrieben von {operator}",
-        "nl": "Deze kaartautomaat wordt beheerd door {operator}",
-        "ca": "{operator} opera aquesta màquina de bitllets",
-        "cs": "Tento automat na jízdenky provozuje {operator}",
-        "es": "Esta máquina expendedora de billetes está operada por {operator}",
-        "it": "Questa biglietteria automatica è gestita da {operator}"
-      },
-      "freeform": {
-        "key": "operator",
-        "type": "string",
-        "placeholder": {
-          "en": "Name of the operator",
-          "de": "Name des Betreibers",
-          "nl": "Naam van de beheerder",
-          "ca": "Nom de l'operador",
-          "cs": "Jméno operátora",
-          "es": "Nombre del operador",
-          "it": "Nome dell'operatore"
-        }
-      },
-      "mappings": [
-        {
-          "if": "operator=Nederlandse Spoorwegen",
-          "then": {
-            "en": "Dutch Railways (NS)",
-            "nl": "Nederlandse Spoorwegen (NS)",
-            "de": "Niederländische Eisenbahn (NS)",
-            "ca": "Ferrocarrils holandesos (NS)",
-            "cs": "Nizozemské dráhy (NS)",
-            "es": "Ferrocarriles Holandeses (NS)",
-            "it": "Ferrovie Olandesi (NS)"
-          },
-          "addExtraTags": [
-            "operator:wikidata=Q23076"
-          ],
-          "hideInAnswer": "_country!=nl"
-        }
-      ]
+      "builtin": "operator",
+      "override": {
+        "question": {
+          "en": "Who is the operator of this ticket machine?",
+          "de": "Wer ist der Betreiber dieses Fahrkartenautomaten?",
+          "nl": "Wie is de beheerder van deze kaartautomaat?",
+          "ca": "Qui és l'operador d'aquesta màquina de venda de bitllets?",
+          "cs": "Kdo je provozovatelem tohoto automatu na jízdenky?",
+          "es": "¿Quién es el operador de esta máquina expendedora de billetes?",
+          "it": "Chi è l'operatore di questa biglietteria automatica?"
+        },
+        "render": {
+          "en": "This ticket machine is operated by {operator}",
+          "de": "Dieser Fahrkartenautomat wird betrieben von {operator}",
+          "nl": "Deze kaartautomaat wordt beheerd door {operator}",
+          "ca": "{operator} opera aquesta màquina de bitllets",
+          "cs": "Tento automat na jízdenky provozuje {operator}",
+          "es": "Esta máquina expendedora de billetes está operada por {operator}",
+          "it": "Questa biglietteria automatica è gestita da {operator}"
+        },
+        "mappings+": [
+          {
+            "if": "operator=Nederlandse Spoorwegen",
+            "then": {
+              "en": "Dutch Railways (NS)",
+              "nl": "Nederlandse Spoorwegen (NS)",
+              "de": "Niederländische Eisenbahn (NS)",
+              "ca": "Ferrocarrils holandesos (NS)",
+              "cs": "Nizozemské dráhy (NS)",
+              "es": "Ferrocarriles Holandeses (NS)",
+              "it": "Ferrovie Olandesi (NS)"
+            },
+            "addExtraTags": [
+              "operator:wikidata=Q23076"
+            ],
+            "hideInAnswer": "_country!=nl"
+          }
+        ]
+      }
     },
     "payment-options-split",
     "denominations-coins",
@@ -136,4 +125,4 @@
   ],
   "deletion": true,
   "allowMove": true
-}
+}
\ No newline at end of file
diff --git a/assets/layers/ticket_validator/ticket_validator.json b/assets/layers/ticket_validator/ticket_validator.json
index 18daf5aa59..78f802ebd4 100644
--- a/assets/layers/ticket_validator/ticket_validator.json
+++ b/assets/layers/ticket_validator/ticket_validator.json
@@ -104,54 +104,25 @@
       "condition": "barrier~*"
     },
     {
-      "id": "validator-operator",
-      "question": {
-        "en": "Who is the operator of this ticket validator?",
-        "de": "Wer ist der Betreiber dieses Fahrkartenentwerters?",
-        "ca": "Qui és l'operador d'aquest validador de bitllets?",
-        "cs": "Kdo je provozovatelem tohoto validátoru jízdenek?",
-        "es": "¿Quién es el operador de este validador de billetes?",
-        "it": "Chi è l'operatore di questo validatore di biglietti?"
-      },
-      "render": {
-        "en": "This ticket validator is operated by {operator}",
-        "de": "Dieser Fahrkartenentwerter wird betrieben von {operator}",
-        "ca": "{operator} opera aquest validador de bitllets",
-        "cs": "Tento validátor jízdenek provozuje {operator}",
-        "es": "Este validador de billetes está operado por {operator}",
-        "it": "Questo validatore di biglietti è gestito da {operator}"
-      },
-      "freeform": {
-        "key": "operator",
-        "type": "string",
-        "placeholder": {
-          "en": "Name of the operator",
-          "de": "Name des Betreibers",
-          "nl": "Naam van de beheerder",
-          "ca": "Nom de l'operador",
-          "cs": "Jméno operátora",
-          "es": "Nombre del operador",
-          "it": "Nome dell'operatore"
+      "builtin": "operator",
+      "override": {
+        "question": {
+          "en": "Who is the operator of this ticket validator?",
+          "de": "Wer ist der Betreiber dieses Fahrkartenentwerters?",
+          "ca": "Qui és l'operador d'aquest validador de bitllets?",
+          "cs": "Kdo je provozovatelem tohoto validátoru jízdenek?",
+          "es": "¿Quién es el operador de este validador de billetes?",
+          "it": "Chi è l'operatore di questo validatore di biglietti?"
+        },
+        "render": {
+          "en": "This ticket validator is operated by {operator}",
+          "de": "Dieser Fahrkartenentwerter wird betrieben von {operator}",
+          "ca": "{operator} opera aquest validador de bitllets",
+          "cs": "Tento validátor jízdenek provozuje {operator}",
+          "es": "Este validador de billetes está operado por {operator}",
+          "it": "Questo validatore di biglietti è gestito da {operator}"
         }
-      },
-      "mappings": [
-        {
-          "if": "operator=Nederlandse Spoorwegen",
-          "then": {
-            "en": "Dutch Railways (NS)",
-            "nl": "Nederlandse Spoorwegen (NS)",
-            "de": "Niederländische Eisenbahn (NS)",
-            "ca": "Ferrocarrils holandesos (NS)",
-            "cs": "Nizozemské dráhy (NS)",
-            "es": "Ferrocarriles Holandeses (NS)",
-            "it": "Ferrovie Olandesi (NS)"
-          },
-          "addExtraTags": [
-            "operator:wikidata=Q23076"
-          ],
-          "hideInAnswer": "_country!=nl"
-        }
-      ]
+      }
     },
     {
       "builtin": "payment-options",
@@ -189,4 +160,4 @@
   ],
   "deletion": true,
   "allowMove": true
-}
+}
\ No newline at end of file
diff --git a/assets/layers/transit_routes/transit_routes.json b/assets/layers/transit_routes/transit_routes.json
index c756272cb6..2d1b1ca770 100644
--- a/assets/layers/transit_routes/transit_routes.json
+++ b/assets/layers/transit_routes/transit_routes.json
@@ -251,32 +251,30 @@
       }
     },
     {
-      "id": "operator",
-      "question": {
-        "en": "What company operates this bus line?",
-        "de": "Welches Unternehmen betreibt die Buslinie?",
-        "nl": "Welk bedrijf exploiteert deze buslijn?",
-        "da": "Hvilket selskab driver denne buslinje?",
-        "ca": "Quina companyia opera aquesta línia d'autobús?",
-        "cs": "Jaká společnost provozuje tuto autobusovou linku?",
-        "es": "¿Qué compañía opera esta línea de autobús?",
-        "it": "Quale azienda gestisce questa linea di autobus?"
-      },
-      "render": {
-        "en": "This bus line is operated by {operator}",
-        "de": "Die Buslinie wird betrieben von {operator}",
-        "nl": "Deze buslijn wordt geëxploiteerd door {operator}",
-        "da": "Denne buslinje drives af {operator}",
-        "ca": "{operator} opera aquesta línea d'autobús",
-        "fr": "Cette ligne de bus est gérée par {operator}",
-        "cs": "Tuto autobusovou linku provozuje {operator}",
-        "es": "Esta línea de autobús es operada por {operator}",
-        "it": "Questa linea di autobus è gestita da {operator}",
-        "uk": "Ця автобусна лінія обслуговується {operator}"
-      },
-      "freeform": {
-        "key": "operator",
-        "type": "string"
+      "builtin": "operator",
+      "override": {
+        "question": {
+          "en": "What company operates this bus line?",
+          "de": "Welches Unternehmen betreibt die Buslinie?",
+          "nl": "Welk bedrijf exploiteert deze buslijn?",
+          "da": "Hvilket selskab driver denne buslinje?",
+          "ca": "Quina companyia opera aquesta línia d'autobús?",
+          "cs": "Jaká společnost provozuje tuto autobusovou linku?",
+          "es": "¿Qué compañía opera esta línea de autobús?",
+          "it": "Quale azienda gestisce questa linea di autobus?"
+        },
+        "render": {
+          "en": "This bus line is operated by {operator}",
+          "de": "Die Buslinie wird betrieben von {operator}",
+          "nl": "Deze buslijn wordt geëxploiteerd door {operator}",
+          "da": "Denne buslinje drives af {operator}",
+          "ca": "{operator} opera aquesta línea d'autobús",
+          "fr": "Cette ligne de bus est gérée par {operator}",
+          "cs": "Tuto autobusovou linku provozuje {operator}",
+          "es": "Esta línea de autobús es operada por {operator}",
+          "it": "Questa linea di autobus è gestita da {operator}",
+          "uk": "Ця автобусна лінія обслуговується {operator}"
+        }
       }
     }
   ],
@@ -288,4 +286,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/assets/layers/vending_machine/vending_machine.json b/assets/layers/vending_machine/vending_machine.json
index e237571bea..1ba7341eac 100644
--- a/assets/layers/vending_machine/vending_machine.json
+++ b/assets/layers/vending_machine/vending_machine.json
@@ -908,40 +908,29 @@
     "denominations-coins",
     "denominations-notes",
     {
-      "id": "operator",
-      "question": {
-        "en": "Who operates this vending machine?",
-        "nl": "Wie beheert deze verkoopautomaat?",
-        "de": "Wer betreibt diesen Verkaufsautomaten?",
-        "fr": "Qui exploite ce distributeur ?",
-        "ca": "Qui opera aquesta màquina expenedora?",
-        "cs": "Kdo provozuje tento automat?",
-        "es": "¿Quién opera esta máquina expendedora?",
-        "uk": "Хто керує цим автоматом?",
-        "it": "Chi gestisce questo distributore automatico?"
-      },
-      "render": {
-        "en": "This vending machine is operated by {operator}",
-        "nl": "Deze verkoopautomaat wordt beheerd door {operator}",
-        "de": "Dieser Verkaufsautomat wird betrieben von {operator}",
-        "fr": "Ce distributeur est exploité par {operator}",
-        "ca": "{operator} gestiona aquesta màquina expenedora",
-        "cs": "Tento prodejní automat provozuje {operator}",
-        "es": "Esta máquina expendedora es operada por {operator}",
-        "uk": "Цим торговим автоматом керує {operator}",
-        "it": "Questo distributore automatico è gestito da {operator}"
-      },
-      "freeform": {
-        "key": "operator",
-        "placeholder": {
-          "en": "Name of operator",
-          "nl": "Naam van beheerder",
-          "de": "Name des Betreibers",
-          "fr": "Nom de l'exploitant",
-          "ca": "Nom de l'operadora",
-          "cs": "Jméno provozovatele",
-          "es": "Nombre del operador",
-          "it": "Nome dell'operatore"
+      "builtin": "operator",
+      "override": {
+        "question": {
+          "en": "Who operates this vending machine?",
+          "nl": "Wie beheert deze verkoopautomaat?",
+          "de": "Wer betreibt diesen Verkaufsautomaten?",
+          "fr": "Qui exploite ce distributeur ?",
+          "ca": "Qui opera aquesta màquina expenedora?",
+          "cs": "Kdo provozuje tento automat?",
+          "es": "¿Quién opera esta máquina expendedora?",
+          "uk": "Хто керує цим автоматом?",
+          "it": "Chi gestisce questo distributore automatico?"
+        },
+        "render": {
+          "en": "This vending machine is operated by {operator}",
+          "nl": "Deze verkoopautomaat wordt beheerd door {operator}",
+          "de": "Dieser Verkaufsautomat wird betrieben von {operator}",
+          "fr": "Ce distributeur est exploité par {operator}",
+          "ca": "{operator} gestiona aquesta màquina expenedora",
+          "cs": "Tento prodejní automat provozuje {operator}",
+          "es": "Esta máquina expendedora es operada por {operator}",
+          "uk": "Цим торговим автоматом керує {operator}",
+          "it": "Questo distributore automatico è gestito da {operator}"
         }
       }
     },
@@ -1598,4 +1587,4 @@
     "enableRelocation": true
   },
   "allowCopy": true
-}
+}
\ No newline at end of file
diff --git a/langs/layers/ca.json b/langs/layers/ca.json
index cf8c4a6dc0..54dd593b5c 100644
--- a/langs/layers/ca.json
+++ b/langs/layers/ca.json
@@ -751,11 +751,10 @@
                 "render": "El nom d'aquest caixer és {name}"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Operador"
-                },
-                "question": "Quina companyia opera aquest caixer?",
-                "render": "{operator} opera aquest caixer"
+                "override": {
+                    "question": "Quina companyia opera aquest caixer?",
+                    "render": "{operator} opera aquest caixer"
+                }
             },
             "speech_output": {
                 "mappings": {
@@ -5732,11 +5731,13 @@
                 "render": "L'estació de fitness es diu {name}"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Operador de l'estació de fitness"
-                },
-                "question": "Qui manté l'estació de fitness?",
-                "render": "{operator} manté l'estació de fitness."
+                "override": {
+                    "freeform": {
+                        "placeholder": "Operador de l'estació de fitness"
+                    },
+                    "question": "Qui manté l'estació de fitness?",
+                    "render": "{operator} manté l'estació de fitness."
+                }
             },
             "type": {
                 "mappings": {
@@ -7890,11 +7891,10 @@
                 "question": "Pots enviar paquets des d'aquesta bústia intel·ligent?"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Gestor"
-                },
-                "question": "Qui gestiona aquesta bústia intel·ligent?",
-                "render": "Aquesta bústia intel·ligent la gestiona {operator}"
+                "override": {
+                    "question": "Qui gestiona aquesta bústia intel·ligent?",
+                    "render": "Aquesta bústia intel·ligent la gestiona {operator}"
+                }
             },
             "pickup": {
                 "mappings": {
@@ -8501,8 +8501,10 @@
         },
         "tagRenderings": {
             "operator": {
-                "question": "Qui opera aquesta bústia?",
-                "render": "Aquesta bústia està operada per <b>{operator}</b>"
+                "override": {
+                    "question": "Qui opera aquesta bústia?",
+                    "render": "Aquesta bústia està operada per <b>{operator}</b>"
+                }
             }
         },
         "title": {
@@ -8770,6 +8772,12 @@
                 },
                 "question": "Aquesta prestatgeria es troba a l'exterior?"
             },
+            "operator": {
+                "override": {
+                    "question": "Qui gestiona aquesta prestatgeria pública?",
+                    "render": "Gestionant per {operator}"
+                }
+            },
             "public_bookcase-brand": {
                 "freeform": {
                     "placeholder": "Nom de la xarxa"
@@ -8795,10 +8803,6 @@
                 "question": "Com es diu aquesta prestatgeria pública?",
                 "render": "El nom d'aquesta prestatgeria és {name}"
             },
-            "public_bookcase-operator": {
-                "question": "Qui gestiona aquesta prestatgeria pública?",
-                "render": "Gestionant per {operator}"
-            },
             "public_bookcase-ref": {
                 "mappings": {
                     "0": {
@@ -9140,6 +9144,11 @@
                     }
                 }
             },
+            "operator": {
+                "freeform": {
+                    "placeholder": "Operador"
+                }
+            },
             "payment-options": {
                 "mappings": {
                     "0": {
@@ -9561,8 +9570,10 @@
                 }
             },
             "operator": {
-                "question": "Quina empresa opera aquesta infraestructura de reciclatge?",
-                "render": "Aquesta infraestuctura de reciclatge està operada per {operator}"
+                "override": {
+                    "question": "Quina empresa opera aquesta infraestructura de reciclatge?",
+                    "render": "Aquesta infraestuctura de reciclatge està operada per {operator}"
+                }
             },
             "recycling-accepts": {
                 "mappings": {
@@ -11854,16 +11865,15 @@
         },
         "tagRenderings": {
             "operator": {
-                "freeform": {
-                    "placeholder": "Nom de l'operador"
-                },
-                "mappings": {
-                    "0": {
-                        "then": "Ferrocarrils holandesos (NS)"
-                    }
-                },
-                "question": "Qui és l'operador d'aquesta màquina de venda de bitllets?",
-                "render": "{operator} opera aquesta màquina de bitllets"
+                "override": {
+                    "mappings+": {
+                        "0": {
+                            "then": "Ferrocarrils holandesos (NS)"
+                        }
+                    },
+                    "question": "Qui és l'operador d'aquesta màquina de venda de bitllets?",
+                    "render": "{operator} opera aquesta màquina de bitllets"
+                }
             }
         },
         "title": {
@@ -11888,6 +11898,12 @@
                 },
                 "render": "Aquest validador de bitllets forma part d'una barrera de tipus {barrier}"
             },
+            "operator": {
+                "override": {
+                    "question": "Qui és l'operador d'aquest validador de bitllets?",
+                    "render": "{operator} opera aquest validador de bitllets"
+                }
+            },
             "payment-options": {
                 "override": {
                     "mappings+": {
@@ -11899,18 +11915,6 @@
                         }
                     }
                 }
-            },
-            "validator-operator": {
-                "freeform": {
-                    "placeholder": "Nom de l'operador"
-                },
-                "mappings": {
-                    "0": {
-                        "then": "Ferrocarrils holandesos (NS)"
-                    }
-                },
-                "question": "Qui és l'operador d'aquest validador de bitllets?",
-                "render": "{operator} opera aquest validador de bitllets"
             }
         },
         "title": {
@@ -12419,8 +12423,10 @@
                 "render": "Aquesta línea d'autobús és part de la xarxa {network}"
             },
             "operator": {
-                "question": "Quina companyia opera aquesta línia d'autobús?",
-                "render": "{operator} opera aquesta línea d'autobús"
+                "override": {
+                    "question": "Quina companyia opera aquesta línia d'autobús?",
+                    "render": "{operator} opera aquesta línea d'autobús"
+                }
             },
             "to": {
                 "question": "Quin és el punt final d'aquesta línea d'autobús?",
@@ -13409,11 +13415,10 @@
                 "question": "Aquesta màquina expenedora encara funciona?"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Nom de l'operadora"
-                },
-                "question": "Qui opera aquesta màquina expenedora?",
-                "render": "{operator} gestiona aquesta màquina expenedora"
+                "override": {
+                    "question": "Qui opera aquesta màquina expenedora?",
+                    "render": "{operator} gestiona aquesta màquina expenedora"
+                }
             },
             "phone": {
                 "override": {
diff --git a/langs/layers/cs.json b/langs/layers/cs.json
index 2327a11460..319fb81956 100644
--- a/langs/layers/cs.json
+++ b/langs/layers/cs.json
@@ -836,11 +836,10 @@
                 "render": "Název tohoto bankomatu je {name}"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Operátor"
-                },
-                "question": "Která společnost provozuje tento bankomat?",
-                "render": "Bankomat provozuje {operator}"
+                "override": {
+                    "question": "Která společnost provozuje tento bankomat?",
+                    "render": "Bankomat provozuje {operator}"
+                }
             },
             "speech_output": {
                 "mappings": {
@@ -5994,11 +5993,13 @@
                 "render": "Tato fitness stanice se jmenuje {name}"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Provozovatel fitness stanice"
-                },
-                "question": "Kdo spravuje tuto fitness stanici?",
-                "render": "Fitness stanici spravuje {operator}."
+                "override": {
+                    "freeform": {
+                        "placeholder": "Provozovatel fitness stanice"
+                    },
+                    "question": "Kdo spravuje tuto fitness stanici?",
+                    "render": "Fitness stanici spravuje {operator}."
+                }
             },
             "type": {
                 "mappings": {
@@ -8426,11 +8427,10 @@
                 "question": "Lze z této schránky na balíky odesílat balíky?"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Operátor"
-                },
-                "question": "Kdo je provozovatelem schránky na balíky?",
-                "render": "Tuto schránku na balíky provozuje {operator}"
+                "override": {
+                    "question": "Kdo je provozovatelem schránky na balíky?",
+                    "render": "Tuto schránku na balíky provozuje {operator}"
+                }
             },
             "pickup": {
                 "mappings": {
@@ -9037,8 +9037,10 @@
         },
         "tagRenderings": {
             "operator": {
-                "question": "Kdo provozuje tuto poštovní schránku?",
-                "render": "Tuto poštovní schránku provozuje <b>{operator}</b>"
+                "override": {
+                    "question": "Kdo provozuje tuto poštovní schránku?",
+                    "render": "Tuto poštovní schránku provozuje <b>{operator}</b>"
+                }
             }
         },
         "title": {
@@ -9309,6 +9311,12 @@
                 },
                 "question": "Je tato knihobudka umístěna venku?"
             },
+            "operator": {
+                "override": {
+                    "question": "Kdo tuto veřejnou knihobudku spravuje?",
+                    "render": "Provozuje {operator}"
+                }
+            },
             "public_bookcase-brand": {
                 "freeform": {
                     "placeholder": "Název sítě"
@@ -9334,10 +9342,6 @@
                 "question": "Jak se jmenuje tato knihobudka?",
                 "render": "Název této knihobudky je {name}"
             },
-            "public_bookcase-operator": {
-                "question": "Kdo tuto veřejnou knihobudku spravuje?",
-                "render": "Provozuje {operator}"
-            },
             "public_bookcase-ref": {
                 "mappings": {
                     "0": {
@@ -9693,6 +9697,11 @@
                     }
                 }
             },
+            "operator": {
+                "freeform": {
+                    "placeholder": "Operátor"
+                }
+            },
             "payment-options": {
                 "mappings": {
                     "0": {
@@ -10148,8 +10157,10 @@
                 }
             },
             "operator": {
-                "question": "Jaká společnost provozuje toto recyklační zařízení?",
-                "render": "Toto recyklační zařízení provozuje {operator}"
+                "override": {
+                    "question": "Jaká společnost provozuje toto recyklační zařízení?",
+                    "render": "Toto recyklační zařízení provozuje {operator}"
+                }
             },
             "recycling-accepts": {
                 "mappings": {
@@ -12508,16 +12519,15 @@
         },
         "tagRenderings": {
             "operator": {
-                "freeform": {
-                    "placeholder": "Jméno operátora"
-                },
-                "mappings": {
-                    "0": {
-                        "then": "Nizozemské dráhy (NS)"
-                    }
-                },
-                "question": "Kdo je provozovatelem tohoto automatu na jízdenky?",
-                "render": "Tento automat na jízdenky provozuje {operator}"
+                "override": {
+                    "mappings+": {
+                        "0": {
+                            "then": "Nizozemské dráhy (NS)"
+                        }
+                    },
+                    "question": "Kdo je provozovatelem tohoto automatu na jízdenky?",
+                    "render": "Tento automat na jízdenky provozuje {operator}"
+                }
             }
         },
         "title": {
@@ -12542,6 +12552,12 @@
                 },
                 "render": "Tento validátor vstupenek je součástí bariéry typu {barrier}"
             },
+            "operator": {
+                "override": {
+                    "question": "Kdo je provozovatelem tohoto validátoru jízdenek?",
+                    "render": "Tento validátor jízdenek provozuje {operator}"
+                }
+            },
             "payment-options": {
                 "override": {
                     "mappings+": {
@@ -12553,18 +12569,6 @@
                         }
                     }
                 }
-            },
-            "validator-operator": {
-                "freeform": {
-                    "placeholder": "Jméno operátora"
-                },
-                "mappings": {
-                    "0": {
-                        "then": "Nizozemské dráhy (NS)"
-                    }
-                },
-                "question": "Kdo je provozovatelem tohoto validátoru jízdenek?",
-                "render": "Tento validátor jízdenek provozuje {operator}"
             }
         },
         "title": {
@@ -13205,8 +13209,10 @@
                 "render": "Tato autobusová linka je součástí sítě {network}"
             },
             "operator": {
-                "question": "Jaká společnost provozuje tuto autobusovou linku?",
-                "render": "Tuto autobusovou linku provozuje {operator}"
+                "override": {
+                    "question": "Jaká společnost provozuje tuto autobusovou linku?",
+                    "render": "Tuto autobusovou linku provozuje {operator}"
+                }
             },
             "to": {
                 "question": "Jaký je konečný bod této autobusové linky?",
@@ -14247,11 +14253,10 @@
                 "question": "Je tento automat stále v provozu?"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Jméno provozovatele"
-                },
-                "question": "Kdo provozuje tento automat?",
-                "render": "Tento prodejní automat provozuje {operator}"
+                "override": {
+                    "question": "Kdo provozuje tento automat?",
+                    "render": "Tento prodejní automat provozuje {operator}"
+                }
             },
             "phone": {
                 "override": {
diff --git a/langs/layers/cy.json b/langs/layers/cy.json
index eab8ab6502..54dbfc5059 100644
--- a/langs/layers/cy.json
+++ b/langs/layers/cy.json
@@ -96,13 +96,6 @@
     },
     "atm": {
         "name": "Peiriannau Codi Arian",
-        "tagRenderings": {
-            "operator": {
-                "freeform": {
-                    "placeholder": "Gweithredwr"
-                }
-            }
-        },
         "title": {
             "render": "Peiriant Codi Arian"
         }
@@ -534,11 +527,6 @@
                     "placeholder": "Masnach"
                 }
             },
-            "operator": {
-                "freeform": {
-                    "placeholder": "Gweithredwr"
-                }
-            },
             "ref": {
                 "freeform": {
                     "placeholder": "Cyfeirnod"
@@ -576,6 +564,15 @@
             "render": "Blwch Post"
         }
     },
+    "questions": {
+        "tagRenderings": {
+            "operator": {
+                "freeform": {
+                    "placeholder": "Gweithredwr"
+                }
+            }
+        }
+    },
     "railway_platforms": {
         "title": {
             "render": "Platfform"
diff --git a/langs/layers/da.json b/langs/layers/da.json
index a069da640b..d788ed1279 100644
--- a/langs/layers/da.json
+++ b/langs/layers/da.json
@@ -2439,6 +2439,12 @@
                 },
                 "question": "Er dette bogbytteskab placeret udendørs?"
             },
+            "operator": {
+                "override": {
+                    "question": "Hvem står for at vedligeholde dette bogbytteskab?",
+                    "render": "Drevet af {operator}"
+                }
+            },
             "public_bookcase-brand": {
                 "freeform": {
                     "placeholder": "Navn på netværket"
@@ -2464,10 +2470,6 @@
                 "question": "Hvad er navnet på dette bogbytteskab?",
                 "render": "Navnet på dette bogbytteskab er {name}"
             },
-            "public_bookcase-operator": {
-                "question": "Hvem står for at vedligeholde dette bogbytteskab?",
-                "render": "Drevet af {operator}"
-            },
             "public_bookcase-ref": {
                 "mappings": {
                     "0": {
@@ -3395,8 +3397,10 @@
                 "question": "Hvilket netværk tilhører denne buslinje?"
             },
             "operator": {
-                "question": "Hvilket selskab driver denne buslinje?",
-                "render": "Denne buslinje drives af {operator}"
+                "override": {
+                    "question": "Hvilket selskab driver denne buslinje?",
+                    "render": "Denne buslinje drives af {operator}"
+                }
             },
             "to": {
                 "question": "Hvad er endestationen for denne buslinje?",
diff --git a/langs/layers/de.json b/langs/layers/de.json
index 164c09ead2..7b8869eebf 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -751,11 +751,10 @@
                 "render": "Der Name des Geldautomaten ist {name}"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Betreiber"
-                },
-                "question": "Welches Unternehmen betreibt den Geldautomaten?",
-                "render": "Der Geldautomat wird betrieben von {operator}"
+                "override": {
+                    "question": "Welches Unternehmen betreibt den Geldautomaten?",
+                    "render": "Der Geldautomat wird betrieben von {operator}"
+                }
             },
             "speech_output": {
                 "mappings": {
@@ -5710,11 +5709,13 @@
                 "render": "Die Fitness-Station heißt {name}"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Betreiber der Fitness-Station"
-                },
-                "question": "Wer betreibt die Fitness-Station?",
-                "render": "Die Fitness-Station wird betrieben von {operator}."
+                "override": {
+                    "freeform": {
+                        "placeholder": "Betreiber der Fitness-Station"
+                    },
+                    "question": "Wer betreibt die Fitness-Station?",
+                    "render": "Die Fitness-Station wird betrieben von {operator}."
+                }
             },
             "type": {
                 "mappings": {
@@ -7854,11 +7855,10 @@
                 "question": "Können Sie von diesem Paketschließfach aus Pakete versenden?"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Betreiber"
-                },
-                "question": "Was ist der Betreiber des Paketschließfachs?",
-                "render": "Dieses Paketschließfach wird von {operator} betrieben"
+                "override": {
+                    "question": "Was ist der Betreiber des Paketschließfachs?",
+                    "render": "Dieses Paketschließfach wird von {operator} betrieben"
+                }
             },
             "pickup": {
                 "mappings": {
@@ -8465,8 +8465,10 @@
         },
         "tagRenderings": {
             "operator": {
-                "question": "Wer betreibt diesen Briefkasten?",
-                "render": "Dieser Briefkasten wird von <b>{operator}</b> betrieben"
+                "override": {
+                    "question": "Wer betreibt diesen Briefkasten?",
+                    "render": "Dieser Briefkasten wird von <b>{operator}</b> betrieben"
+                }
             }
         },
         "title": {
@@ -8734,6 +8736,12 @@
                 },
                 "question": "Befindet sich der Bücherschrank im Freien?"
             },
+            "operator": {
+                "override": {
+                    "question": "Wer betreibt den Bücherschrank?",
+                    "render": "Betrieben von {operator}"
+                }
+            },
             "public_bookcase-brand": {
                 "freeform": {
                     "placeholder": "Name des Netzwerks"
@@ -8759,10 +8767,6 @@
                 "question": "Wie lautet der Name des Bücherschranks?",
                 "render": "Der Name des Bücherschranks lautet {name}"
             },
-            "public_bookcase-operator": {
-                "question": "Wer betreibt den Bücherschrank?",
-                "render": "Betrieben von {operator}"
-            },
             "public_bookcase-ref": {
                 "mappings": {
                     "0": {
@@ -9104,6 +9108,11 @@
                     }
                 }
             },
+            "operator": {
+                "freeform": {
+                    "placeholder": "Betreiber"
+                }
+            },
             "payment-options": {
                 "mappings": {
                     "0": {
@@ -9525,8 +9534,10 @@
                 }
             },
             "operator": {
-                "question": "Welches Unternehmen betreibt diese Recyclinganlage?",
-                "render": "Die Recyclingeinrichtung wird betrieben von {operator}"
+                "override": {
+                    "question": "Welches Unternehmen betreibt diese Recyclinganlage?",
+                    "render": "Die Recyclingeinrichtung wird betrieben von {operator}"
+                }
             },
             "recycling-accepts": {
                 "mappings": {
@@ -11843,16 +11854,15 @@
         },
         "tagRenderings": {
             "operator": {
-                "freeform": {
-                    "placeholder": "Name des Betreibers"
-                },
-                "mappings": {
-                    "0": {
-                        "then": "Niederländische Eisenbahn (NS)"
-                    }
-                },
-                "question": "Wer ist der Betreiber dieses Fahrkartenautomaten?",
-                "render": "Dieser Fahrkartenautomat wird betrieben von {operator}"
+                "override": {
+                    "mappings+": {
+                        "0": {
+                            "then": "Niederländische Eisenbahn (NS)"
+                        }
+                    },
+                    "question": "Wer ist der Betreiber dieses Fahrkartenautomaten?",
+                    "render": "Dieser Fahrkartenautomat wird betrieben von {operator}"
+                }
             }
         },
         "title": {
@@ -11877,6 +11887,12 @@
                 },
                 "render": "Dieser Fahrkartenentwerter ist Teil einer Zugangsbarriere vom Typ {barrier}"
             },
+            "operator": {
+                "override": {
+                    "question": "Wer ist der Betreiber dieses Fahrkartenentwerters?",
+                    "render": "Dieser Fahrkartenentwerter wird betrieben von {operator}"
+                }
+            },
             "payment-options": {
                 "override": {
                     "mappings+": {
@@ -11888,18 +11904,6 @@
                         }
                     }
                 }
-            },
-            "validator-operator": {
-                "freeform": {
-                    "placeholder": "Name des Betreibers"
-                },
-                "mappings": {
-                    "0": {
-                        "then": "Niederländische Eisenbahn (NS)"
-                    }
-                },
-                "question": "Wer ist der Betreiber dieses Fahrkartenentwerters?",
-                "render": "Dieser Fahrkartenentwerter wird betrieben von {operator}"
             }
         },
         "title": {
@@ -12408,8 +12412,10 @@
                 "render": "Die Buslinie gehört zum Verkehrsverbund {network}"
             },
             "operator": {
-                "question": "Welches Unternehmen betreibt die Buslinie?",
-                "render": "Die Buslinie wird betrieben von {operator}"
+                "override": {
+                    "question": "Welches Unternehmen betreibt die Buslinie?",
+                    "render": "Die Buslinie wird betrieben von {operator}"
+                }
             },
             "to": {
                 "question": "Wo ist der Endpunkt der Buslinie?",
@@ -13388,11 +13394,10 @@
                 "question": "Ist dieser Automat in Betrieb?"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Name des Betreibers"
-                },
-                "question": "Wer betreibt diesen Verkaufsautomaten?",
-                "render": "Dieser Verkaufsautomat wird betrieben von {operator}"
+                "override": {
+                    "question": "Wer betreibt diesen Verkaufsautomaten?",
+                    "render": "Dieser Verkaufsautomat wird betrieben von {operator}"
+                }
             },
             "phone": {
                 "override": {
diff --git a/langs/layers/en.json b/langs/layers/en.json
index ee4c83d3e1..520abe13e1 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -836,11 +836,10 @@
                 "render": "The name of this ATM is {name}"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Operator"
-                },
-                "question": "What company operates this ATM?",
-                "render": "The ATM is operated by {operator}"
+                "override": {
+                    "question": "What company operates this ATM?",
+                    "render": "The ATM is operated by {operator}"
+                }
             },
             "speech_output": {
                 "mappings": {
@@ -6034,11 +6033,13 @@
                 "render": "This fitness station is called {name}"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Operator of the fitness station"
-                },
-                "question": "Who maintains this fitness station?",
-                "render": "The fitness station is maintained by {operator}."
+                "override": {
+                    "freeform": {
+                        "placeholder": "Operator of the fitness station"
+                    },
+                    "question": "Who maintains this fitness station?",
+                    "render": "The fitness station is maintained by {operator}."
+                }
             },
             "type": {
                 "mappings": {
@@ -8498,11 +8499,10 @@
                 "question": "Can you send packages from this parcel locker?"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Operator"
-                },
-                "question": "What is the operator of the parcel locker?",
-                "render": "This parcel locker is operated by {operator}"
+                "override": {
+                    "question": "What is the operator of the parcel locker?",
+                    "render": "This parcel locker is operated by {operator}"
+                }
             },
             "pickup": {
                 "mappings": {
@@ -9144,8 +9144,10 @@
         },
         "tagRenderings": {
             "operator": {
-                "question": "Who operates this postbox?",
-                "render": "This postbox is operated by <b>{operator}</b>"
+                "override": {
+                    "question": "Who operates this postbox?",
+                    "render": "This postbox is operated by <b>{operator}</b>"
+                }
             }
         },
         "title": {
@@ -9416,6 +9418,12 @@
                 },
                 "question": "Is this bookcase located outdoors?"
             },
+            "operator": {
+                "override": {
+                    "question": "Who maintains this public bookcase?",
+                    "render": "This public bookcase is operated by {operator}"
+                }
+            },
             "public_bookcase-brand": {
                 "freeform": {
                     "placeholder": "Name of the network"
@@ -9441,10 +9449,6 @@
                 "question": "What is the name of this public bookcase?",
                 "render": "The name of this bookcase is {name}"
             },
-            "public_bookcase-operator": {
-                "question": "Who maintains this public bookcase?",
-                "render": "Operated by {operator}"
-            },
             "public_bookcase-ref": {
                 "mappings": {
                     "0": {
@@ -9838,6 +9842,13 @@
                     }
                 }
             },
+            "operator": {
+                "freeform": {
+                    "placeholder": "Operator"
+                },
+                "question": "What company operates this place?",
+                "render": "This place is operated by <b>{operator}</b>"
+            },
             "payment-options": {
                 "mappings": {
                     "0": {
@@ -10293,8 +10304,10 @@
                 }
             },
             "operator": {
-                "question": "What company operates this recycling facility?",
-                "render": "This recycling facility is operated by {operator}"
+                "override": {
+                    "question": "What company operates this recycling facility?",
+                    "render": "This recycling facility is operated by {operator}"
+                }
             },
             "recycling-accepts": {
                 "mappings": {
@@ -12767,16 +12780,15 @@
         },
         "tagRenderings": {
             "operator": {
-                "freeform": {
-                    "placeholder": "Name of the operator"
-                },
-                "mappings": {
-                    "0": {
-                        "then": "Dutch Railways (NS)"
-                    }
-                },
-                "question": "Who is the operator of this ticket machine?",
-                "render": "This ticket machine is operated by {operator}"
+                "override": {
+                    "mappings+": {
+                        "0": {
+                            "then": "Dutch Railways (NS)"
+                        }
+                    },
+                    "question": "Who is the operator of this ticket machine?",
+                    "render": "This ticket machine is operated by {operator}"
+                }
             }
         },
         "title": {
@@ -12801,6 +12813,12 @@
                 },
                 "render": "This ticket validator is part of a barrier of type {barrier}"
             },
+            "operator": {
+                "override": {
+                    "question": "Who is the operator of this ticket validator?",
+                    "render": "This ticket validator is operated by {operator}"
+                }
+            },
             "payment-options": {
                 "override": {
                     "mappings+": {
@@ -12812,18 +12830,6 @@
                         }
                     }
                 }
-            },
-            "validator-operator": {
-                "freeform": {
-                    "placeholder": "Name of the operator"
-                },
-                "mappings": {
-                    "0": {
-                        "then": "Dutch Railways (NS)"
-                    }
-                },
-                "question": "Who is the operator of this ticket validator?",
-                "render": "This ticket validator is operated by {operator}"
             }
         },
         "title": {
@@ -13475,8 +13481,10 @@
                 "render": "This bus line is part of the {network} network"
             },
             "operator": {
-                "question": "What company operates this bus line?",
-                "render": "This bus line is operated by {operator}"
+                "override": {
+                    "question": "What company operates this bus line?",
+                    "render": "This bus line is operated by {operator}"
+                }
             },
             "to": {
                 "question": "What is the ending point for this bus line?",
@@ -14538,11 +14546,10 @@
                 "question": "Is this vending machine still operational?"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Name of operator"
-                },
-                "question": "Who operates this vending machine?",
-                "render": "This vending machine is operated by {operator}"
+                "override": {
+                    "question": "Who operates this vending machine?",
+                    "render": "This vending machine is operated by {operator}"
+                }
             },
             "phone": {
                 "override": {
diff --git a/langs/layers/es.json b/langs/layers/es.json
index b55f1b3646..bd188f450d 100644
--- a/langs/layers/es.json
+++ b/langs/layers/es.json
@@ -733,11 +733,10 @@
                 "render": "El nombre de este cajero automático es {name}"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Operador"
-                },
-                "question": "¿Qué empresa opera este cajero automático?",
-                "render": "El cajero automático es operado por {operator}"
+                "override": {
+                    "question": "¿Qué empresa opera este cajero automático?",
+                    "render": "El cajero automático es operado por {operator}"
+                }
             },
             "speech_output": {
                 "mappings": {
@@ -5374,11 +5373,13 @@
                 "render": "Esta estación de fitness se llama {name}"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Operador de la estación de fitness"
-                },
-                "question": "¿Quién mantiene esta estación de fitness?",
-                "render": "La estación de fitness es mantenida por {operator}."
+                "override": {
+                    "freeform": {
+                        "placeholder": "Operador de la estación de fitness"
+                    },
+                    "question": "¿Quién mantiene esta estación de fitness?",
+                    "render": "La estación de fitness es mantenida por {operator}."
+                }
             },
             "type": {
                 "mappings": {
@@ -7478,11 +7479,10 @@
                 "question": "¿Puedes enviar paquetes desde esta taquilla?"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Operador"
-                },
-                "question": "¿Cuál es el operador de la taquilla de paquetes?",
-                "render": "Esta taquilla de paquetes es operada por {operator}"
+                "override": {
+                    "question": "¿Cuál es el operador de la taquilla de paquetes?",
+                    "render": "Esta taquilla de paquetes es operada por {operator}"
+                }
             },
             "pickup": {
                 "mappings": {
@@ -8089,8 +8089,10 @@
         },
         "tagRenderings": {
             "operator": {
-                "question": "¿Quién gestiona este buzón?",
-                "render": "Este buzón es operado por <b>{operator}</b>."
+                "override": {
+                    "question": "¿Quién gestiona este buzón?",
+                    "render": "Este buzón es operado por <b>{operator}</b>."
+                }
             }
         },
         "title": {
@@ -8358,6 +8360,12 @@
                 },
                 "question": "¿Está este librero situado en el exterior?"
             },
+            "operator": {
+                "override": {
+                    "question": "¿Quién mantiene este librero público?",
+                    "render": "Operado por {operator}"
+                }
+            },
             "public_bookcase-brand": {
                 "freeform": {
                     "placeholder": "Nombre de la red"
@@ -8383,10 +8391,6 @@
                 "question": "¿Cuál es el nombre de este librero público?",
                 "render": "El nombre de este librero es {name}"
             },
-            "public_bookcase-operator": {
-                "question": "¿Quién mantiene este librero público?",
-                "render": "Operado por {operator}"
-            },
             "public_bookcase-ref": {
                 "mappings": {
                     "0": {
@@ -8716,6 +8720,11 @@
                     }
                 }
             },
+            "operator": {
+                "freeform": {
+                    "placeholder": "Operador"
+                }
+            },
             "payment-options": {
                 "mappings": {
                     "0": {
@@ -9119,8 +9128,10 @@
                 }
             },
             "operator": {
-                "question": "¿Qué empresa opera esta instalación de reciclaje?",
-                "render": "Esta instalación de reciclaje está operada por {operator}"
+                "override": {
+                    "question": "¿Qué empresa opera esta instalación de reciclaje?",
+                    "render": "Esta instalación de reciclaje está operada por {operator}"
+                }
             },
             "recycling-accepts": {
                 "mappings": {
@@ -10740,16 +10751,15 @@
         },
         "tagRenderings": {
             "operator": {
-                "freeform": {
-                    "placeholder": "Nombre del operador"
-                },
-                "mappings": {
-                    "0": {
-                        "then": "Ferrocarriles Holandeses (NS)"
-                    }
-                },
-                "question": "¿Quién es el operador de esta máquina expendedora de billetes?",
-                "render": "Esta máquina expendedora de billetes está operada por {operator}"
+                "override": {
+                    "mappings+": {
+                        "0": {
+                            "then": "Ferrocarriles Holandeses (NS)"
+                        }
+                    },
+                    "question": "¿Quién es el operador de esta máquina expendedora de billetes?",
+                    "render": "Esta máquina expendedora de billetes está operada por {operator}"
+                }
             }
         },
         "title": {
@@ -10774,6 +10784,12 @@
                 },
                 "render": "Este validador de billetes forma parte de una barrera de tipo {barrier}"
             },
+            "operator": {
+                "override": {
+                    "question": "¿Quién es el operador de este validador de billetes?",
+                    "render": "Este validador de billetes está operado por {operator}"
+                }
+            },
             "payment-options": {
                 "override": {
                     "mappings+": {
@@ -10785,18 +10801,6 @@
                         }
                     }
                 }
-            },
-            "validator-operator": {
-                "freeform": {
-                    "placeholder": "Nombre del operador"
-                },
-                "mappings": {
-                    "0": {
-                        "then": "Ferrocarriles Holandeses (NS)"
-                    }
-                },
-                "question": "¿Quién es el operador de este validador de billetes?",
-                "render": "Este validador de billetes está operado por {operator}"
             }
         },
         "title": {
@@ -11287,8 +11291,10 @@
                 "render": "Esta línea de autobús es parte de la red {network}"
             },
             "operator": {
-                "question": "¿Qué compañía opera esta línea de autobús?",
-                "render": "Esta línea de autobús es operada por {operator}"
+                "override": {
+                    "question": "¿Qué compañía opera esta línea de autobús?",
+                    "render": "Esta línea de autobús es operada por {operator}"
+                }
             },
             "to": {
                 "question": "¿Cuál es el punto final de esta línea de autobús?",
@@ -12241,11 +12247,10 @@
                 "question": "¿Esta máquina expendedora sigue operativa?"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Nombre del operador"
-                },
-                "question": "¿Quién opera esta máquina expendedora?",
-                "render": "Esta máquina expendedora es operada por {operator}"
+                "override": {
+                    "question": "¿Quién opera esta máquina expendedora?",
+                    "render": "Esta máquina expendedora es operada por {operator}"
+                }
             },
             "phone": {
                 "override": {
diff --git a/langs/layers/eu.json b/langs/layers/eu.json
index fd964cae02..30ad60b234 100644
--- a/langs/layers/eu.json
+++ b/langs/layers/eu.json
@@ -145,13 +145,6 @@
     },
     "atm": {
         "name": "kutxazainak",
-        "tagRenderings": {
-            "operator": {
-                "freeform": {
-                    "placeholder": "Operadorea"
-                }
-            }
-        },
         "title": {
             "render": "Kutxazaina"
         }
@@ -358,6 +351,15 @@
             }
         }
     },
+    "questions": {
+        "tagRenderings": {
+            "operator": {
+                "freeform": {
+                    "placeholder": "Operadorea"
+                }
+            }
+        }
+    },
     "unit": {
         "units": {
             "3": {
diff --git a/langs/layers/fr.json b/langs/layers/fr.json
index b5ac4101c8..7098d2a0e8 100644
--- a/langs/layers/fr.json
+++ b/langs/layers/fr.json
@@ -516,11 +516,10 @@
                 "render": "Le nom de ce DAB est {name}"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Opérateur"
-                },
-                "question": "Quelle société exploite ce DAB ?",
-                "render": "Ce DAB est exploité par {operator}"
+                "override": {
+                    "question": "Quelle société exploite ce DAB ?",
+                    "render": "Ce DAB est exploité par {operator}"
+                }
             }
         },
         "title": {
@@ -4726,11 +4725,10 @@
                 "question": "Peut-on envoyer des colis depuis ce casier ?"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Exploitant"
-                },
-                "question": "Quel est l'exploitant de ce casier à colis ?",
-                "render": "Ce casier à colis est exploité par {operator}"
+                "override": {
+                    "question": "Quel est l'exploitant de ce casier à colis ?",
+                    "render": "Ce casier à colis est exploité par {operator}"
+                }
             },
             "pickup": {
                 "mappings": {
@@ -5131,6 +5129,12 @@
                 },
                 "question": "Cette microbiliothèque est-elle en extérieur ?"
             },
+            "operator": {
+                "override": {
+                    "question": "Qui entretien cette microbibliothèque ?",
+                    "render": "Entretenue par {operator}"
+                }
+            },
             "public_bookcase-brand": {
                 "mappings": {
                     "0": {
@@ -5153,10 +5157,6 @@
                 "question": "Quel est le nom de cette microbibliothèque ?",
                 "render": "Le nom de cette microbibliothèque est {name}"
             },
-            "public_bookcase-operator": {
-                "question": "Qui entretien cette microbibliothèque ?",
-                "render": "Entretenue par {operator}"
-            },
             "public_bookcase-ref": {
                 "mappings": {
                     "0": {
@@ -5380,6 +5380,11 @@
                     }
                 }
             },
+            "operator": {
+                "freeform": {
+                    "placeholder": "Opérateur"
+                }
+            },
             "payment-options": {
                 "mappings": {
                     "0": {
@@ -5713,8 +5718,10 @@
                 "question": "Où ce conteneur est-il situé ?"
             },
             "operator": {
-                "question": "Quelle entreprise gère ce point de recyclage ?",
-                "render": "Ce point de recyclage est géré par {operator}"
+                "override": {
+                    "question": "Quelle entreprise gère ce point de recyclage ?",
+                    "render": "Ce point de recyclage est géré par {operator}"
+                }
             },
             "recycling-accepts": {
                 "mappings": {
@@ -6816,7 +6823,9 @@
                 "render": "Cette ligne de bus fait partie du réseau {network}"
             },
             "operator": {
-                "render": "Cette ligne de bus est gérée par {operator}"
+                "override": {
+                    "render": "Cette ligne de bus est gérée par {operator}"
+                }
             },
             "to": {
                 "render": "Cette ligne de bus termine à {to}"
@@ -7394,11 +7403,10 @@
                 "question": "Cette machine est-elle encore opérationelle ?"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Nom de l'exploitant"
-                },
-                "question": "Qui exploite ce distributeur ?",
-                "render": "Ce distributeur est exploité par {operator}"
+                "override": {
+                    "question": "Qui exploite ce distributeur ?",
+                    "render": "Ce distributeur est exploité par {operator}"
+                }
             },
             "vending": {
                 "mappings": {
diff --git a/langs/layers/he.json b/langs/layers/he.json
index 4e7c4736ef..b2bc753b84 100644
--- a/langs/layers/he.json
+++ b/langs/layers/he.json
@@ -263,11 +263,10 @@
                 "render": "שמו של כספומט זה הוא {name}"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "מפעיל"
-                },
-                "question": "איזו חברה מפעילה את הכספומט הזה?",
-                "render": "הכספומט מופעל על ידי {operator}"
+                "override": {
+                    "question": "איזו חברה מפעילה את הכספומט הזה?",
+                    "render": "הכספומט מופעל על ידי {operator}"
+                }
             },
             "speech_output": {
                 "mappings": {
@@ -486,5 +485,14 @@
                 }
             }
         }
+    },
+    "questions": {
+        "tagRenderings": {
+            "operator": {
+                "freeform": {
+                    "placeholder": "מפעיל"
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/langs/layers/hu.json b/langs/layers/hu.json
index 764978c823..d1e1287f38 100644
--- a/langs/layers/hu.json
+++ b/langs/layers/hu.json
@@ -822,6 +822,12 @@
                 },
                 "question": "A szabadban van-e ez a könyvespolc?"
             },
+            "operator": {
+                "override": {
+                    "question": "Ki tartja fenn ezt a nyilvános könyvespolcot?",
+                    "render": "Üzemeltető: {operator}"
+                }
+            },
             "public_bookcase-brand": {
                 "mappings": {
                     "0": {
@@ -844,10 +850,6 @@
                 "question": "Mi a neve ennek a nyilvános könyvespolcnak?",
                 "render": "Ennek a könyvespolcnak a neve: {name}"
             },
-            "public_bookcase-operator": {
-                "question": "Ki tartja fenn ezt a nyilvános könyvespolcot?",
-                "render": "Üzemeltető: {operator}"
-            },
             "public_bookcase-ref": {
                 "mappings": {
                     "0": {
diff --git a/langs/layers/it.json b/langs/layers/it.json
index c1d395f1f6..d01597f118 100644
--- a/langs/layers/it.json
+++ b/langs/layers/it.json
@@ -836,11 +836,10 @@
                 "render": "Il nome di questo sportello bancomat è {name}"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Operatore"
-                },
-                "question": "Quale azienda gestisce questo sportello bancomat?",
-                "render": "Lo sportello bancomat è gestito da {operator}"
+                "override": {
+                    "question": "Quale azienda gestisce questo sportello bancomat?",
+                    "render": "Lo sportello bancomat è gestito da {operator}"
+                }
             },
             "speech_output": {
                 "mappings": {
@@ -5980,11 +5979,13 @@
                 "render": "Questa stazione fitness si chiama {name}"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Gestore della stazione fitness"
-                },
-                "question": "Chi mantiene questa stazione fitness?",
-                "render": "La stazione fitness è mantenuta da {operator}."
+                "override": {
+                    "freeform": {
+                        "placeholder": "Gestore della stazione fitness"
+                    },
+                    "question": "Chi mantiene questa stazione fitness?",
+                    "render": "La stazione fitness è mantenuta da {operator}."
+                }
             },
             "type": {
                 "mappings": {
@@ -8353,11 +8354,10 @@
                 "question": "Puoi inviare pacchi da questo armadietto per pacchi?"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Operatore"
-                },
-                "question": "Chi è l'operatore dell'armadietto per pacchi?",
-                "render": "Questo armadietto per pacchi è gestito da {operator}"
+                "override": {
+                    "question": "Chi è l'operatore dell'armadietto per pacchi?",
+                    "render": "Questo armadietto per pacchi è gestito da {operator}"
+                }
             },
             "pickup": {
                 "mappings": {
@@ -8964,8 +8964,10 @@
         },
         "tagRenderings": {
             "operator": {
-                "question": "Chi gestisce questa cassetta postale?",
-                "render": "Questa cassetta postale è gestita da <b>{operator}</b>"
+                "override": {
+                    "question": "Chi gestisce questa cassetta postale?",
+                    "render": "Questa cassetta postale è gestita da <b>{operator}</b>"
+                }
             }
         },
         "title": {
@@ -9236,6 +9238,12 @@
                 },
                 "question": "Questa libreria pubblica si trova all'aperto?"
             },
+            "operator": {
+                "override": {
+                    "question": "Chi mantiene questa libreria pubblica?",
+                    "render": "Gestita da {operator}"
+                }
+            },
             "public_bookcase-brand": {
                 "freeform": {
                     "placeholder": "Nome della rete"
@@ -9261,10 +9269,6 @@
                 "question": "Qual è il nome di questa libreria pubblica?",
                 "render": "Il nome di questa libreria pubblica è {name}"
             },
-            "public_bookcase-operator": {
-                "question": "Chi mantiene questa libreria pubblica?",
-                "render": "Gestita da {operator}"
-            },
             "public_bookcase-ref": {
                 "mappings": {
                     "0": {
@@ -9620,6 +9624,11 @@
                     }
                 }
             },
+            "operator": {
+                "freeform": {
+                    "placeholder": "Operatore"
+                }
+            },
             "payment-options": {
                 "mappings": {
                     "0": {
@@ -10071,8 +10080,10 @@
                 }
             },
             "operator": {
-                "question": "Quale azienda gestisce questa struttura di riciclaggio?",
-                "render": "Questa struttura di riciclaggio è gestita da {operator}"
+                "override": {
+                    "question": "Quale azienda gestisce questa struttura di riciclaggio?",
+                    "render": "Questa struttura di riciclaggio è gestita da {operator}"
+                }
             },
             "recycling-accepts": {
                 "mappings": {
@@ -12407,16 +12418,15 @@
         },
         "tagRenderings": {
             "operator": {
-                "freeform": {
-                    "placeholder": "Nome dell'operatore"
-                },
-                "mappings": {
-                    "0": {
-                        "then": "Ferrovie Olandesi (NS)"
-                    }
-                },
-                "question": "Chi è l'operatore di questa biglietteria automatica?",
-                "render": "Questa biglietteria automatica è gestita da {operator}"
+                "override": {
+                    "mappings+": {
+                        "0": {
+                            "then": "Ferrovie Olandesi (NS)"
+                        }
+                    },
+                    "question": "Chi è l'operatore di questa biglietteria automatica?",
+                    "render": "Questa biglietteria automatica è gestita da {operator}"
+                }
             }
         },
         "title": {
@@ -12441,6 +12451,12 @@
                 },
                 "render": "Questo validatore di biglietti fa parte di una barriera di tipo {barrier}"
             },
+            "operator": {
+                "override": {
+                    "question": "Chi è l'operatore di questo validatore di biglietti?",
+                    "render": "Questo validatore di biglietti è gestito da {operator}"
+                }
+            },
             "payment-options": {
                 "override": {
                     "mappings+": {
@@ -12452,18 +12468,6 @@
                         }
                     }
                 }
-            },
-            "validator-operator": {
-                "freeform": {
-                    "placeholder": "Nome dell'operatore"
-                },
-                "mappings": {
-                    "0": {
-                        "then": "Ferrovie Olandesi (NS)"
-                    }
-                },
-                "question": "Chi è l'operatore di questo validatore di biglietti?",
-                "render": "Questo validatore di biglietti è gestito da {operator}"
             }
         },
         "title": {
@@ -13104,8 +13108,10 @@
                 "render": "Questa linea di autobus fa parte della rete {network}"
             },
             "operator": {
-                "question": "Quale azienda gestisce questa linea di autobus?",
-                "render": "Questa linea di autobus è gestita da {operator}"
+                "override": {
+                    "question": "Quale azienda gestisce questa linea di autobus?",
+                    "render": "Questa linea di autobus è gestita da {operator}"
+                }
             },
             "to": {
                 "question": "Qual è il punto di arrivo di questa linea di autobus?",
@@ -14130,11 +14136,10 @@
                 "question": "Questo distributore automatico è ancora operativo?"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Nome dell'operatore"
-                },
-                "question": "Chi gestisce questo distributore automatico?",
-                "render": "Questo distributore automatico è gestito da {operator}"
+                "override": {
+                    "question": "Chi gestisce questo distributore automatico?",
+                    "render": "Questo distributore automatico è gestito da {operator}"
+                }
             },
             "phone": {
                 "override": {
diff --git a/langs/layers/nb_NO.json b/langs/layers/nb_NO.json
index f80fc7c4f1..2879f7599a 100644
--- a/langs/layers/nb_NO.json
+++ b/langs/layers/nb_NO.json
@@ -187,8 +187,10 @@
                 "render": "Navnet på denne minibanken er {name}"
             },
             "operator": {
-                "question": "Hvilket selskap driver denne minibanken?",
-                "render": "Minibanken drives av {operator}"
+                "override": {
+                    "question": "Hvilket selskap driver denne minibanken?",
+                    "render": "Minibanken drives av {operator}"
+                }
             }
         },
         "title": {
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 46a9ad167a..2bc4aafa81 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -814,11 +814,10 @@
                 "render": "De naam van deze geldautomaat is {name}"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Beheerder"
-                },
-                "question": "Welk bedrijf beheert deze geldautomaat?",
-                "render": "Deze geldautomaat wordt beheerd door {operator}"
+                "override": {
+                    "question": "Welk bedrijf beheert deze geldautomaat?",
+                    "render": "Deze geldautomaat wordt beheerd door {operator}"
+                }
             },
             "speech_output": {
                 "mappings": {
@@ -5505,11 +5504,13 @@
                 "render": "Dit fitness-toestel heet {name}"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Beheerder van het fitness-toestel"
-                },
-                "question": "Wie beheert dit fitness-toestel?",
-                "render": "Dit fitness-toestel wordt beheerd door {operator}"
+                "override": {
+                    "freeform": {
+                        "placeholder": "Beheerder van het fitness-toestel"
+                    },
+                    "question": "Wie beheert dit fitness-toestel?",
+                    "render": "Dit fitness-toestel wordt beheerd door {operator}"
+                }
             }
         }
     },
@@ -7147,11 +7148,10 @@
                 "question": "Kan je pakketten versturen vanuit deze pakketautomaat?"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Beheerder"
-                },
-                "question": "Wie is de beheerder van deze pakketautomaat?",
-                "render": "Deze pakketautomaat wordt beheerd door {operator}"
+                "override": {
+                    "question": "Wie is de beheerder van deze pakketautomaat?",
+                    "render": "Deze pakketautomaat wordt beheerd door {operator}"
+                }
             },
             "pickup": {
                 "mappings": {
@@ -7859,6 +7859,12 @@
                 },
                 "question": "Staat dit boekenruilkastje binnen of buiten?"
             },
+            "operator": {
+                "override": {
+                    "question": "Wie is verantwoordelijk voor dit boekenruilkastje?",
+                    "render": "Onderhouden door {operator}"
+                }
+            },
             "public_bookcase-brand": {
                 "mappings": {
                     "0": {
@@ -7881,10 +7887,6 @@
                 "question": "Wat is de naam van dit boekenruilkastje?",
                 "render": "De naam van dit boekenruilkastje is {name}"
             },
-            "public_bookcase-operator": {
-                "question": "Wie is verantwoordelijk voor dit boekenruilkastje?",
-                "render": "Onderhouden door {operator}"
-            },
             "public_bookcase-ref": {
                 "mappings": {
                     "0": {
@@ -8192,6 +8194,11 @@
                     }
                 }
             },
+            "operator": {
+                "freeform": {
+                    "placeholder": "Beheerder"
+                }
+            },
             "payment-options": {
                 "mappings": {
                     "0": {
@@ -8573,8 +8580,10 @@
                 }
             },
             "operator": {
-                "question": "Wat is de beheerder van deze recyclingfaciliteit?",
-                "render": "Deze recyclingfaciliteit wordt beheerd door {operator}"
+                "override": {
+                    "question": "Wat is de beheerder van deze recyclingfaciliteit?",
+                    "render": "Deze recyclingfaciliteit wordt beheerd door {operator}"
+                }
             },
             "recycling-accepts": {
                 "mappings": {
@@ -10025,36 +10034,21 @@
         },
         "tagRenderings": {
             "operator": {
-                "freeform": {
-                    "placeholder": "Naam van de beheerder"
-                },
-                "mappings": {
-                    "0": {
-                        "then": "Nederlandse Spoorwegen (NS)"
-                    }
-                },
-                "question": "Wie is de beheerder van deze kaartautomaat?",
-                "render": "Deze kaartautomaat wordt beheerd door {operator}"
+                "override": {
+                    "mappings+": {
+                        "0": {
+                            "then": "Nederlandse Spoorwegen (NS)"
+                        }
+                    },
+                    "question": "Wie is de beheerder van deze kaartautomaat?",
+                    "render": "Deze kaartautomaat wordt beheerd door {operator}"
+                }
             }
         },
         "title": {
             "render": "Kaartautomaat"
         }
     },
-    "ticket_validator": {
-        "tagRenderings": {
-            "validator-operator": {
-                "freeform": {
-                    "placeholder": "Naam van de beheerder"
-                },
-                "mappings": {
-                    "0": {
-                        "then": "Nederlandse Spoorwegen (NS)"
-                    }
-                }
-            }
-        }
-    },
     "toilet": {
         "description": "Een laag die publieke toiletten toont",
         "filter": {
@@ -10593,8 +10587,10 @@
                 "render": "Deze buslijn is onderdeel van het {network} netwerk"
             },
             "operator": {
-                "question": "Welk bedrijf exploiteert deze buslijn?",
-                "render": "Deze buslijn wordt geëxploiteerd door {operator}"
+                "override": {
+                    "question": "Welk bedrijf exploiteert deze buslijn?",
+                    "render": "Deze buslijn wordt geëxploiteerd door {operator}"
+                }
             },
             "to": {
                 "question": "Wat is het eindpunt van deze buslijn?",
@@ -11373,11 +11369,10 @@
                 "question": "Is deze verkoopsautomaat nog steeds werkende?"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Naam van beheerder"
-                },
-                "question": "Wie beheert deze verkoopautomaat?",
-                "render": "Deze verkoopautomaat wordt beheerd door {operator}"
+                "override": {
+                    "question": "Wie beheert deze verkoopautomaat?",
+                    "render": "Deze verkoopautomaat wordt beheerd door {operator}"
+                }
             },
             "vending": {
                 "mappings": {
diff --git a/langs/layers/pl.json b/langs/layers/pl.json
index 7ee6363ed8..6622991a80 100644
--- a/langs/layers/pl.json
+++ b/langs/layers/pl.json
@@ -537,8 +537,10 @@
                 "render": "Nazwa tego bankomatu to {name}"
             },
             "operator": {
-                "question": "Jaka firma obsługuje ten bankomat?",
-                "render": "Ten bankomat jest obsługiwany przez {operator}"
+                "override": {
+                    "question": "Jaka firma obsługuje ten bankomat?",
+                    "render": "Ten bankomat jest obsługiwany przez {operator}"
+                }
             }
         },
         "title": {
@@ -2883,10 +2885,9 @@
                 "question": "Czy z tego paczkomatu można wysyłać przesyłki?"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Operator"
-                },
-                "render": "Ten paczkomat jest obsługiwany przez {operator}"
+                "override": {
+                    "render": "Ten paczkomat jest obsługiwany przez {operator}"
+                }
             },
             "pickup": {
                 "mappings": {
@@ -3331,6 +3332,11 @@
                     }
                 }
             },
+            "operator": {
+                "freeform": {
+                    "placeholder": "Operator"
+                }
+            },
             "payment-options": {
                 "mappings": {
                     "0": {
diff --git a/langs/layers/pt.json b/langs/layers/pt.json
index bc310fff42..d3d1dace71 100644
--- a/langs/layers/pt.json
+++ b/langs/layers/pt.json
@@ -479,11 +479,10 @@
                 "render": "O nome deste multibanco é {name}"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Operador"
-                },
-                "question": "Qual companhia opera este multibanco?",
-                "render": "O multibanco é operado por {operator}"
+                "override": {
+                    "question": "Qual companhia opera este multibanco?",
+                    "render": "O multibanco é operado por {operator}"
+                }
             },
             "speech_output": {
                 "mappings": {
@@ -1601,6 +1600,11 @@
                 "question": "Qual é o horário de funcionamento de {title()}?",
                 "render": "<h3>Horário de funcionamento</h3>{opening_hours_table(opening_hours)}"
             },
+            "operator": {
+                "freeform": {
+                    "placeholder": "Operador"
+                }
+            },
             "payment-options": {
                 "mappings": {
                     "0": {
diff --git a/langs/layers/pt_BR.json b/langs/layers/pt_BR.json
index c0f273d328..1bb85c2151 100644
--- a/langs/layers/pt_BR.json
+++ b/langs/layers/pt_BR.json
@@ -468,11 +468,10 @@
                 "render": "O nome desse caixa eletrônico é {name}"
             },
             "operator": {
-                "freeform": {
-                    "placeholder": "Operador"
-                },
-                "question": "Qual companhia opera esse caixa eletrônico?",
-                "render": "O caixa eletrônico é operado por {operator}"
+                "override": {
+                    "question": "Qual companhia opera esse caixa eletrônico?",
+                    "render": "O caixa eletrônico é operado por {operator}"
+                }
             },
             "speech_output": {
                 "mappings": {
@@ -1518,6 +1517,11 @@
                 "question": "Qual o horário de funcionamento de {title()}?",
                 "render": "<h3>Horário de funcionamento</h3>{opening_hours_table(opening_hours)}"
             },
+            "operator": {
+                "freeform": {
+                    "placeholder": "Operador"
+                }
+            },
             "payment-options": {
                 "mappings": {
                     "0": {
diff --git a/langs/layers/sl.json b/langs/layers/sl.json
index e2f5d6083e..daf572de18 100644
--- a/langs/layers/sl.json
+++ b/langs/layers/sl.json
@@ -11,7 +11,9 @@
     "atm": {
         "tagRenderings": {
             "operator": {
-                "render": "Ta bankomat upravlja {operator}"
+                "override": {
+                    "render": "Ta bankomat upravlja {operator}"
+                }
             }
         },
         "title": {
diff --git a/langs/layers/uk.json b/langs/layers/uk.json
index 961b9b505b..da167fd201 100644
--- a/langs/layers/uk.json
+++ b/langs/layers/uk.json
@@ -1805,8 +1805,10 @@
                 "question": "Чи можете ви відправляти посилки з цього поштомату?"
             },
             "operator": {
-                "question": "Який оператор поштомату?",
-                "render": "Цей посилкова шафка обслуговується компанією {operator}"
+                "override": {
+                    "question": "Який оператор поштомату?",
+                    "render": "Цей посилкова шафка обслуговується компанією {operator}"
+                }
             },
             "ref": {
                 "question": "Який ідентифікаційний номер цього поштомату?",
@@ -2958,7 +2960,9 @@
                 "render": "Ця автобусна лінія є частиною {network} мережі"
             },
             "operator": {
-                "render": "Ця автобусна лінія обслуговується {operator}"
+                "override": {
+                    "render": "Ця автобусна лінія обслуговується {operator}"
+                }
             },
             "to": {
                 "render": "Ця автобусна лінія закінчується в {to}"
@@ -3322,8 +3326,10 @@
                 "question": "Чи працює цей торговий автомат досі?"
             },
             "operator": {
-                "question": "Хто керує цим автоматом?",
-                "render": "Цим торговим автоматом керує {operator}"
+                "override": {
+                    "question": "Хто керує цим автоматом?",
+                    "render": "Цим торговим автоматом керує {operator}"
+                }
             },
             "phone": {
                 "override": {