diff --git a/assets/layers/bike_cafe/bike_cafe.json b/assets/layers/bike_cafe/bike_cafe.json
index a92b67723a..7b80b281b9 100644
--- a/assets/layers/bike_cafe/bike_cafe.json
+++ b/assets/layers/bike_cafe/bike_cafe.json
@@ -266,94 +266,26 @@
         }
       ]
     },
+    "website",
+    "phone",
+    "email",
     {
-      "question": {
-        "en": "What is the website of {name}?",
-        "nl": "Wat is de website van {name}?",
-        "fr": "Quel est le site web de {name} ?",
-        "gl": "Cal é a páxina web de {name}?",
-        "de": "Wie lautet die Webseite von {name}?",
-        "it": "Qual è il sito web di {name}?",
-        "ru": "Какой сайт у {name}?",
-        "zh_Hans": "{name}的网站是什么？",
-        "zh_Hant": "{name} 的網站是？",
-        "pt_BR": "Qual o website de {name}?",
-        "pt": "Qual o website de {name}?",
-        "da": "Hvad er webstedet for {name}?",
-        "es": "¿Cual es el sitio web de {name}?"
-      },
-      "render": "<a href='{website}' target='_blank'>{website}</a>",
-      "freeform": {
-        "key": "website"
-      },
-      "id": "bike_cafe-website"
-    },
-    {
-      "question": {
-        "en": "What is the phone number of {name}?",
-        "nl": "Wat is het telefoonnummer van {name}?",
-        "fr": "Quel est le numéro de téléphone de {name} ?",
-        "gl": "Cal é o número de teléfono de {name}?",
-        "de": "Wie lautet die Telefonnummer von {name}?",
-        "it": "Qual è il numero di telefono di {name}?",
-        "ru": "Какой номер телефона у {name}?",
-        "zh_Hans": "{name}的电话号码是什么？",
-        "zh_Hant": "{name} 的電話號碼是？",
-        "pt_BR": "Qual o número de telefone de {name}?",
-        "pt": "Qual é o número de telefone de {name}?",
-        "es": "¿Cual es el número de teléfono de {name}?",
-        "da": "Hvad er telefonnummeret til {name}?"
-      },
-      "render": "<a href='tel:{phone}'>{phone}</a>",
-      "freeform": {
-        "key": "phone",
-        "type": "phone"
-      },
-      "id": "bike_cafe-phone"
-    },
-    {
-      "question": {
-        "en": "What is the email address of {name}?",
-        "nl": "Wat is het email-adres van {name}?",
-        "fr": "Quelle est l'adresse électronique de {name} ?",
-        "gl": "Cal é o enderezo de correo electrónico de {name}?",
-        "de": "Wie lautet die E-Mail-Adresse von {name}?",
-        "it": "Qual è l’indirizzo email di {name}?",
-        "ru": "Какой адрес электронной почты у {name}?",
-        "zh_Hans": "{name}的电子邮箱是什么？",
-        "zh_Hant": "{name} 的電子郵件地址是？",
-        "pt_BR": "Qual o endereço de email de {name}?",
-        "pt": "Qual o endereço de email de {name}?",
-        "es": "¿Cual es la dirección de correo electrónico de {name}?",
-        "da": "Hvad er e-mailadressen på {name}?"
-      },
-      "render": "<a href='mailto:{email}' target='_blank'>{email}</a>",
-      "freeform": {
-        "key": "email",
-        "type": "email"
-      },
-      "id": "bike_cafe-email"
-    },
-    {
-      "question": {
-        "en": "When it this bike café opened?",
-        "nl": "Wanneer is dit fietscafé geopend?",
-        "fr": "Quand ce Café vélo est-t-il ouvert ?",
-        "it": "Quando è aperto questo caffè in bici?",
-        "zh_Hans": "这家自行车咖啡什么时候开门营业？",
-        "zh_Hant": "何時這個單車咖啡廳營運？",
-        "ru": "Каков режим работы этого велосипедного кафе?",
-        "pt_BR": "Quando este café de bicicleta abre?",
-        "de": "Wann ist dieses Fahrradcafé geöffnet?",
-        "pt": "Quando este café de bicicleta abre?",
-        "da": "Hvornår er denne cykelcafé åbent?"
-      },
-      "render": "{opening_hours_table(opening_hours)}",
-      "freeform": {
-        "key": "opening_hours",
-        "type": "opening_hours"
-      },
-      "id": "bike_cafe-opening_hours"
+      "builtin": "opening_hours",
+      "override": {
+        "question": {
+          "en": "When it this bike café opened?",
+          "nl": "Wanneer is dit fietscafé geopend?",
+          "fr": "Quand ce Café vélo est-t-il ouvert ?",
+          "it": "Quando è aperto questo caffè in bici?",
+          "zh_Hans": "这家自行车咖啡什么时候开门营业？",
+          "zh_Hant": "何時這個單車咖啡廳營運？",
+          "ru": "Каков режим работы этого велосипедного кафе?",
+          "pt_BR": "Quando este café de bicicleta abre?",
+          "de": "Wann ist dieses Fahrradcafé geöffnet?",
+          "pt": "Quando este café de bicicleta abre?",
+          "da": "Hvornår er denne cykelcafé åbent?"
+        }
+      }
     }
   ],
   "presets": [
@@ -407,4 +339,4 @@
     "da": "En cykelcafé er en café rettet mod cyklister, for eksempel med tjenester som en pumpe, med masser af cykelrelateret dekoration, o.s.v",
     "fr": "Un vélo café est un café à destination des cyclistes avec, par exemple, des services tels qu’une pompe, et de nombreuses décorations liées aux vélos, etc."
   }
-}
\ No newline at end of file
+}
diff --git a/langs/layers/da.json b/langs/layers/da.json
index 6b9e50470c..e8289eb0d3 100644
--- a/langs/layers/da.json
+++ b/langs/layers/da.json
@@ -577,19 +577,10 @@
                 },
                 "question": "Tilbyder denne cykelcafé en cykelpumpe til brug for alle?"
             },
-            "bike_cafe-email": {
-                "question": "Hvad er e-mailadressen på {name}?"
-            },
             "bike_cafe-name": {
                 "question": "Hvad hedder denne cykelcafé?",
                 "render": "Denne cykelcafé hedder {name}"
             },
-            "bike_cafe-opening_hours": {
-                "question": "Hvornår er denne cykelcafé åbent?"
-            },
-            "bike_cafe-phone": {
-                "question": "Hvad er telefonnummeret til {name}?"
-            },
             "bike_cafe-repair-service": {
                 "mappings": {
                     "0": {
@@ -611,9 +602,6 @@
                     }
                 },
                 "question": "Er der værktøj her til at reparere din egen cykel?"
-            },
-            "bike_cafe-website": {
-                "question": "Hvad er webstedet for {name}?"
             }
         },
         "title": {
@@ -3052,4 +3040,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/langs/layers/de.json b/langs/layers/de.json
index b1ceca276c..0cab45d52e 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -594,19 +594,10 @@
                 },
                 "question": "Hat das Fahrrad-Café eine Fahrradpumpe, die von jedem benutzt werden kann?"
             },
-            "bike_cafe-email": {
-                "question": "Wie lautet die E-Mail-Adresse von {name}?"
-            },
             "bike_cafe-name": {
                 "question": "Wie heißt das Fahrrad-Café?",
                 "render": "Das Fahrrad-Café heißt {name}"
             },
-            "bike_cafe-opening_hours": {
-                "question": "Wann ist dieses Fahrradcafé geöffnet?"
-            },
-            "bike_cafe-phone": {
-                "question": "Wie lautet die Telefonnummer von {name}?"
-            },
             "bike_cafe-repair-service": {
                 "mappings": {
                     "0": {
@@ -628,9 +619,6 @@
                     }
                 },
                 "question": "Gibt es hier Werkzeug, um das eigene Fahrrad zu reparieren?"
-            },
-            "bike_cafe-website": {
-                "question": "Wie lautet die Webseite von {name}?"
             }
         },
         "title": {
@@ -7507,4 +7495,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/langs/layers/en.json b/langs/layers/en.json
index d4f2582d4c..7eab351bf3 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -594,19 +594,10 @@
                 },
                 "question": "Does this bike cafe offer a bike pump for use by anyone?"
             },
-            "bike_cafe-email": {
-                "question": "What is the email address of {name}?"
-            },
             "bike_cafe-name": {
                 "question": "What is the name of this bike cafe?",
                 "render": "This bike cafe is called {name}"
             },
-            "bike_cafe-opening_hours": {
-                "question": "When it this bike café opened?"
-            },
-            "bike_cafe-phone": {
-                "question": "What is the phone number of {name}?"
-            },
             "bike_cafe-repair-service": {
                 "mappings": {
                     "0": {
@@ -628,9 +619,6 @@
                     }
                 },
                 "question": "Are there tools here to repair your own bike?"
-            },
-            "bike_cafe-website": {
-                "question": "What is the website of {name}?"
             }
         },
         "title": {
@@ -8035,4 +8023,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/langs/layers/es.json b/langs/layers/es.json
index b177321f9b..9dbce139cf 100644
--- a/langs/layers/es.json
+++ b/langs/layers/es.json
@@ -549,17 +549,8 @@
     },
     "bike_cafe": {
         "tagRenderings": {
-            "bike_cafe-email": {
-                "question": "¿Cual es la dirección de correo electrónico de {name}?"
-            },
-            "bike_cafe-phone": {
-                "question": "¿Cual es el número de teléfono de {name}?"
-            },
             "bike_cafe-repair-tools": {
                 "question": "¿Hay herramientas para reparar su propia bicicleta?"
-            },
-            "bike_cafe-website": {
-                "question": "¿Cual es el sitio web de {name}?"
             }
         }
     },
@@ -4095,4 +4086,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/langs/layers/fr.json b/langs/layers/fr.json
index fadc44ddc0..2715047731 100644
--- a/langs/layers/fr.json
+++ b/langs/layers/fr.json
@@ -583,19 +583,10 @@
                 },
                 "question": "Est-ce que ce Café vélo propose une pompe en libre accès ?"
             },
-            "bike_cafe-email": {
-                "question": "Quelle est l'adresse électronique de {name} ?"
-            },
             "bike_cafe-name": {
                 "question": "Quel est le nom de ce Café vélo ?",
                 "render": "Ce Café vélo s'appelle {name}"
             },
-            "bike_cafe-opening_hours": {
-                "question": "Quand ce Café vélo est-t-il ouvert ?"
-            },
-            "bike_cafe-phone": {
-                "question": "Quel est le numéro de téléphone de {name} ?"
-            },
             "bike_cafe-repair-service": {
                 "mappings": {
                     "0": {
@@ -617,9 +608,6 @@
                     }
                 },
                 "question": "Est-ce qu'il y a des outils pour réparer soi-même son vélo ?"
-            },
-            "bike_cafe-website": {
-                "question": "Quel est le site web de {name} ?"
             }
         },
         "title": {
@@ -4538,4 +4526,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/langs/layers/gl.json b/langs/layers/gl.json
index 21102de268..920efe0be3 100644
--- a/langs/layers/gl.json
+++ b/langs/layers/gl.json
@@ -33,16 +33,10 @@
                 },
                 "question": "Este café de ciclistas ofrece unha bomba de ar para que calquera persoa poida usala?"
             },
-            "bike_cafe-email": {
-                "question": "Cal é o enderezo de correo electrónico de {name}?"
-            },
             "bike_cafe-name": {
                 "question": "Cal é o nome deste café de ciclistas?",
                 "render": "Este café de ciclistas chámase {name}"
             },
-            "bike_cafe-phone": {
-                "question": "Cal é o número de teléfono de {name}?"
-            },
             "bike_cafe-repair-service": {
                 "mappings": {
                     "0": {
@@ -64,9 +58,6 @@
                     }
                 },
                 "question": "Hai ferramentas aquí para arranxar a túa propia bicicleta?"
-            },
-            "bike_cafe-website": {
-                "question": "Cal é a páxina web de {name}?"
             }
         },
         "title": {
@@ -396,4 +387,4 @@
             "render": "Bicicleta pantasma"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/langs/layers/it.json b/langs/layers/it.json
index 40caaa48e0..7567cfc5cd 100644
--- a/langs/layers/it.json
+++ b/langs/layers/it.json
@@ -325,19 +325,10 @@
                 },
                 "question": "Questo caffè in bici offre una pompa per bici che chiunque può utilizzare?"
             },
-            "bike_cafe-email": {
-                "question": "Qual è l’indirizzo email di {name}?"
-            },
             "bike_cafe-name": {
                 "question": "Qual è il nome di questo caffè in bici?",
                 "render": "Questo caffè in bici è chiamato {name}"
             },
-            "bike_cafe-opening_hours": {
-                "question": "Quando è aperto questo caffè in bici?"
-            },
-            "bike_cafe-phone": {
-                "question": "Qual è il numero di telefono di {name}?"
-            },
             "bike_cafe-repair-service": {
                 "mappings": {
                     "0": {
@@ -359,9 +350,6 @@
                     }
                 },
                 "question": "Ci sono degli strumenti per riparare la propria bicicletta?"
-            },
-            "bike_cafe-website": {
-                "question": "Qual è il sito web di {name}?"
             }
         },
         "title": {
@@ -2724,4 +2712,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 91f4145f2a..abb93ad081 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -594,19 +594,10 @@
                 },
                 "question": "Biedt dit fietscafé een fietspomp aan voor iedereen?"
             },
-            "bike_cafe-email": {
-                "question": "Wat is het email-adres van {name}?"
-            },
             "bike_cafe-name": {
                 "question": "Wat is de naam van dit fietscafé?",
                 "render": "Dit fietscafé heet {name}"
             },
-            "bike_cafe-opening_hours": {
-                "question": "Wanneer is dit fietscafé geopend?"
-            },
-            "bike_cafe-phone": {
-                "question": "Wat is het telefoonnummer van {name}?"
-            },
             "bike_cafe-repair-service": {
                 "mappings": {
                     "0": {
@@ -628,9 +619,6 @@
                     }
                 },
                 "question": "Biedt dit fietscafé gereedschap aan om je fiets zelf te herstellen?"
-            },
-            "bike_cafe-website": {
-                "question": "Wat is de website van {name}?"
             }
         },
         "title": {
@@ -7534,4 +7522,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/langs/layers/pt.json b/langs/layers/pt.json
index ce4a5dde30..cf359a74f9 100644
--- a/langs/layers/pt.json
+++ b/langs/layers/pt.json
@@ -261,19 +261,10 @@
             }
         },
         "tagRenderings": {
-            "bike_cafe-email": {
-                "question": "Qual o endereço de email de {name}?"
-            },
             "bike_cafe-name": {
                 "question": "Qual o nome deste café de bicicleta?",
                 "render": "Este café de bicicleta se chama {name}"
             },
-            "bike_cafe-opening_hours": {
-                "question": "Quando este café de bicicleta abre?"
-            },
-            "bike_cafe-phone": {
-                "question": "Qual é o número de telefone de {name}?"
-            },
             "bike_cafe-repair-service": {
                 "mappings": {
                     "0": {
@@ -295,9 +286,6 @@
                     }
                 },
                 "question": "Há ferramentas aqui para consertar a sua própria bicicleta?"
-            },
-            "bike_cafe-website": {
-                "question": "Qual o website de {name}?"
             }
         },
         "title": {
@@ -576,4 +564,4 @@
             "render": "Bicicleta fantasma"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/langs/layers/pt_BR.json b/langs/layers/pt_BR.json
index 239a87a43b..80909df8e1 100644
--- a/langs/layers/pt_BR.json
+++ b/langs/layers/pt_BR.json
@@ -203,19 +203,10 @@
             }
         },
         "tagRenderings": {
-            "bike_cafe-email": {
-                "question": "Qual o endereço de email de {name}?"
-            },
             "bike_cafe-name": {
                 "question": "Qual o nome deste café de bicicleta?",
                 "render": "Este café de bicicleta se chama {name}"
             },
-            "bike_cafe-opening_hours": {
-                "question": "Quando este café de bicicleta abre?"
-            },
-            "bike_cafe-phone": {
-                "question": "Qual o número de telefone de {name}?"
-            },
             "bike_cafe-repair-service": {
                 "mappings": {
                     "0": {
@@ -237,9 +228,6 @@
                     }
                 },
                 "question": "Há ferramentas aqui para consertar sua bicicleta?"
-            },
-            "bike_cafe-website": {
-                "question": "Qual o website de {name}?"
             }
         },
         "title": {
@@ -530,4 +518,4 @@
             "render": "Bicicleta fantasma"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/langs/layers/ru.json b/langs/layers/ru.json
index 9934eed704..6e199449c8 100644
--- a/langs/layers/ru.json
+++ b/langs/layers/ru.json
@@ -353,19 +353,10 @@
                 },
                 "question": "Есть ли в этом велосипедном кафе велосипедный насос для всеобщего использования?"
             },
-            "bike_cafe-email": {
-                "question": "Какой адрес электронной почты у {name}?"
-            },
             "bike_cafe-name": {
                 "question": "Как называется это байк-кафе?",
                 "render": "Это велосипедное кафе называется {name}"
             },
-            "bike_cafe-opening_hours": {
-                "question": "Каков режим работы этого велосипедного кафе?"
-            },
-            "bike_cafe-phone": {
-                "question": "Какой номер телефона у {name}?"
-            },
             "bike_cafe-repair-service": {
                 "mappings": {
                     "0": {
@@ -387,9 +378,6 @@
                     }
                 },
                 "question": "Есть ли здесь инструменты для починки вашего велосипеда?"
-            },
-            "bike_cafe-website": {
-                "question": "Какой сайт у {name}?"
             }
         },
         "title": {
@@ -1753,4 +1741,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/langs/layers/zh_Hans.json b/langs/layers/zh_Hans.json
index 03119678cb..f1e2f8da48 100644
--- a/langs/layers/zh_Hans.json
+++ b/langs/layers/zh_Hans.json
@@ -191,19 +191,10 @@
                 },
                 "question": "这家自行车咖啡为每个使用者提供打气筒吗？"
             },
-            "bike_cafe-email": {
-                "question": "{name}的电子邮箱是什么？"
-            },
             "bike_cafe-name": {
                 "question": "这个自行车咖啡的名字是什么？",
                 "render": "这家自行车咖啡叫做 {name}"
             },
-            "bike_cafe-opening_hours": {
-                "question": "这家自行车咖啡什么时候开门营业？"
-            },
-            "bike_cafe-phone": {
-                "question": "{name}的电话号码是什么？"
-            },
             "bike_cafe-repair-service": {
                 "mappings": {
                     "0": {
@@ -225,9 +216,6 @@
                     }
                 },
                 "question": "这里有供你修车用的工具吗？"
-            },
-            "bike_cafe-website": {
-                "question": "{name}的网站是什么？"
             }
         },
         "title": {
@@ -239,4 +227,4 @@
             "render": "自行车咖啡"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/langs/layers/zh_Hant.json b/langs/layers/zh_Hant.json
index c3307a5212..a9468245f9 100644
--- a/langs/layers/zh_Hant.json
+++ b/langs/layers/zh_Hant.json
@@ -292,19 +292,10 @@
                 },
                 "question": "這個單車咖啡廳有提供給任何人都能使用的單車打氣甬嗎？"
             },
-            "bike_cafe-email": {
-                "question": "{name} 的電子郵件地址是？"
-            },
             "bike_cafe-name": {
                 "question": "這個單車咖啡廳的名稱是？",
                 "render": "這個單車咖啡廳叫做 {name}"
             },
-            "bike_cafe-opening_hours": {
-                "question": "何時這個單車咖啡廳營運？"
-            },
-            "bike_cafe-phone": {
-                "question": "{name} 的電話號碼是？"
-            },
             "bike_cafe-repair-service": {
                 "mappings": {
                     "0": {
@@ -326,9 +317,6 @@
                     }
                 },
                 "question": "這裡是否有工具修理你的單車嗎？"
-            },
-            "bike_cafe-website": {
-                "question": "{name} 的網站是？"
             }
         },
         "title": {
@@ -663,4 +651,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}