diff --git a/langs/en.json b/langs/en.json
index ac80b262e4..d66add0443 100644
--- a/langs/en.json
+++ b/langs/en.json
@@ -98,7 +98,9 @@
       "confirmIntro": "<h3>Add a {title} here?</h3>The point you create here will be <b>visible for everyone</b>. Please, only add things on to the map if they truly exist. A lot of applications use this data.",
       "confirmButton": "Add a {category} here.<br/><div class='alert'>Your addition is visible for everyone</div>",
       "openLayerControl": "Open the layer control box",
-      "layerNotEnabled": "The layer {layer} is not enabled. Enable this layer to add a point"
+      "layerNotEnabled": "The layer {layer} is not enabled. Enable this layer to add a point",
+      "disableFiltersExplanation": "Some features might be hidden by a filter",
+      "disableFilters": "Disable all filters"
     },
     "pickLanguage": "Choose a language: ",
     "about": "Easily edit and add OpenStreetMap for a certain theme",
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 9673e5cbaf..73bcdfc5ac 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -911,6 +911,21 @@
             "0": {
                 "title": "Charging station"
             }
+        },
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "All vehicle types"
+                    },
+                    "1": {
+                        "question": "Charging station for bicycles"
+                    },
+                    "2": {
+                        "question": "Charging station for cars"
+                    }
+                }
+            }
         }
     },
     "crossings": {
@@ -1656,6 +1671,17 @@
                 "question": "Does this restaurant have a vegetarian option?"
             },
             "15": {
+                "question": "If you bring your own container (such as a cooking pot and small pots), is it used to package your order?<br/>",
+                "mappings": {
+                    "0": {
+                        "then": "You can bring <b>your own containers</b> to get your order, saving on single-use packaging material and thus waste"
+                    },
+                    "1": {
+                        "then": "Bringing your own container is <b>not allowed</b>"
+                    }
+                }
+            },
+            "16": {
                 "question": "If you bring your own container (such as a cooking pot and small pots), is it used to package your order?<br/>",
                 "mappings": {
                     "0": {
@@ -1668,6 +1694,47 @@
                         "then": "You <b>must</b> bring your own container to order here."
                     }
                 }
+            },
+            "17": {
+                "question": "Which methods of payment are accepted here?",
+                "mappings": {
+                    "0": {
+                        "then": "Cash is accepted here"
+                    },
+                    "1": {
+                        "then": "Payment cards are accepted here"
+                    }
+                }
+            }
+        },
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "Opened now"
+                    }
+                }
+            },
+            "1": {
+                "options": {
+                    "0": {
+                        "question": "Has a vegetarian menu"
+                    }
+                }
+            },
+            "2": {
+                "options": {
+                    "0": {
+                        "question": "Has a vegan menu"
+                    }
+                }
+            },
+            "3": {
+                "options": {
+                    "0": {
+                        "question": "Has a halal menu"
+                    }
+                }
             }
         }
     },
diff --git a/langs/layers/fr.json b/langs/layers/fr.json
index b6e332f9cb..acacb191df 100644
--- a/langs/layers/fr.json
+++ b/langs/layers/fr.json
@@ -900,10 +900,24 @@
                     },
                     "1": {
                         "then": "Graisse animale"
+                    },
+                    "2": {
+                        "then": "Pas d'en-cas végétaliens disponibles"
                     }
                 }
             },
             "15": {
+                "question": "Est-il proposé d’utiliser ses propres contenants pour sa commande ?<br/>",
+                "mappings": {
+                    "0": {
+                        "then": "Vous pouvez <b>apporter vos contenants</b> pour votre commande, limitant l’usage de matériaux à usage unique et les déchets"
+                    },
+                    "1": {
+                        "then": "Apporter ses propres contenants <b>n’est pas permis</b>"
+                    }
+                }
+            },
+            "16": {
                 "question": "Est-il proposé d’utiliser ses propres contenants pour sa commande ?<br/>",
                 "mappings": {
                     "0": {
diff --git a/langs/layers/ja.json b/langs/layers/ja.json
index 0fe374c673..3559f7af40 100644
--- a/langs/layers/ja.json
+++ b/langs/layers/ja.json
@@ -18,6 +18,17 @@
     "food": {
         "tagRenderings": {
             "15": {
+                "question": "お客様が持参容器(調理用の鍋や小さな鍋など)をもってきた場合は、注文の梱包に使用されますか?<br/>",
+                "mappings": {
+                    "0": {
+                        "then": "<b>自分の容器</b>を持ってきて、注文を受け取ることができ、使い捨ての梱包材を節約して、無駄を省くことができます"
+                    },
+                    "1": {
+                        "then": "独自の容器を持参することは<b>できません</b>"
+                    }
+                }
+            },
+            "16": {
                 "question": "お客様が持参容器(調理用の鍋や小さな鍋など)をもってきた場合は、注文の梱包に使用されますか?<br/>",
                 "mappings": {
                     "0": {
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 436c529777..1f10c6b397 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -890,6 +890,23 @@
             }
         }
     },
+    "charging_station": {
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "Alle voertuigen"
+                    },
+                    "1": {
+                        "question": "Oplaadpunten voor fietsen"
+                    },
+                    "2": {
+                        "question": "Oplaadpunten voor auto's"
+                    }
+                }
+            }
+        }
+    },
     "crossings": {
         "name": "Oversteekplaatsen",
         "description": "Oversteekplaatsen voor voetgangers en fietsers",
@@ -1691,6 +1708,9 @@
                     },
                     "2": {
                         "then": "Geen vegetarische snacks beschikbaar"
+                    },
+                    "3": {
+                        "then": "Enkel halal opties zijn beschikbaar"
                     }
                 }
             },
@@ -1716,10 +1736,24 @@
                     },
                     "1": {
                         "then": "Dierlijk vet"
+                    },
+                    "2": {
+                        "then": "Geen veganistische snacks beschikbaar"
                     }
                 }
             },
             "15": {
+                "question": "Als je je eigen container (bv. kookpot of kleine potjes voor saus) meeneemt, gebruikt de frituur deze dan om je bestelling in te doen?",
+                "mappings": {
+                    "0": {
+                        "then": "Je mag je <b>eigen containers</b> meenemen om je bestelling in mee te nemen en zo minder afval te maken"
+                    },
+                    "1": {
+                        "then": "Je mag <b>geen</b> eigen containers meenemen om je bestelling in mee te nemen"
+                    }
+                }
+            },
+            "16": {
                 "question": "Als je je eigen container (bv. kookpot of kleine potjes voor saus) meeneemt, gebruikt de frituur deze dan om je bestelling in te doen?",
                 "mappings": {
                     "0": {
@@ -1732,6 +1766,47 @@
                         "then": "Je <b>moet</b> je eigen containers meenemen om je bestelling in mee te nemen."
                     }
                 }
+            },
+            "17": {
+                "question": "Welke betaalmiddelen worden hier geaccepteerd?",
+                "mappings": {
+                    "0": {
+                        "then": "Cash geld wordt hier aanvaard"
+                    },
+                    "1": {
+                        "then": "Betalen met bankkaarten kan hier"
+                    }
+                }
+            }
+        },
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "Nu geopened"
+                    }
+                }
+            },
+            "1": {
+                "options": {
+                    "0": {
+                        "question": "Heeft een vegetarisch menu"
+                    }
+                }
+            },
+            "2": {
+                "options": {
+                    "0": {
+                        "question": "Heeft een veganistisch menu"
+                    }
+                }
+            },
+            "3": {
+                "options": {
+                    "0": {
+                        "question": "Heeft een halal menu"
+                    }
+                }
             }
         }
     },
diff --git a/langs/layers/ru.json b/langs/layers/ru.json
index f1659cb305..33e07eec19 100644
--- a/langs/layers/ru.json
+++ b/langs/layers/ru.json
@@ -612,6 +612,13 @@
                         "then": "Приносить свою тару <b>не разрешено</b>"
                     }
                 }
+            },
+            "16": {
+                "mappings": {
+                    "1": {
+                        "then": "Приносить свою тару <b>не разрешено</b>"
+                    }
+                }
             }
         }
     },
diff --git a/langs/themes/ca.json b/langs/themes/ca.json
index a79b0b00b5..a3334c7088 100644
--- a/langs/themes/ca.json
+++ b/langs/themes/ca.json
@@ -42,17 +42,6 @@
             }
         }
     },
-    "fritures": {
-        "layers": {
-            "0": {
-                "tagRenderings": {
-                    "3": {
-                        "render": "<a href='{website}'>{website}</a>"
-                    }
-                }
-            }
-        }
-    },
     "personal": {
         "title": "Interfície personal",
         "description": "Crea una interfície basada en totes les capes disponibles de totes les interfícies"
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 78b3092fc5..17277a0c29 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -831,31 +831,8 @@
     "fritures": {
         "layers": {
             "0": {
-                "tagRenderings": {
-                    "1": {
-                        "question": "What is the name of this friture?"
-                    },
-                    "3": {
-                        "render": "<a href='{website}'>{website}</a>",
-                        "question": "What is the website of this shop?"
-                    },
-                    "4": {
-                        "question": "What is the phone number?"
-                    },
-                    "8": {
-                        "question": "If you bring your own container (such as a cooking pot and small pots), is it used to package your order?<br/>",
-                        "mappings": {
-                            "0": {
-                                "then": "You can bring <b>your own containers</b> to get your order, saving on single-use packaging material and thus waste"
-                            },
-                            "1": {
-                                "then": "Bringing your own container is <b>not allowed</b>"
-                            },
-                            "2": {
-                                "then": "You <b>must</b> bring your own container to order here."
-                            }
-                        }
-                    }
+                "override": {
+                    "name": "Fries shop"
                 }
             }
         }
diff --git a/langs/themes/fr.json b/langs/themes/fr.json
index 99f7223a75..ecc1bbafaa 100644
--- a/langs/themes/fr.json
+++ b/langs/themes/fr.json
@@ -712,90 +712,8 @@
         "title": "Carte des friteries",
         "layers": {
             "0": {
-                "name": "Friteries",
-                "title": {
-                    "render": "Friterie",
-                    "mappings": {
-                        "0": {
-                            "then": " <i>{name}</i>"
-                        }
-                    }
-                },
-                "tagRenderings": {
-                    "1": {
-                        "render": "{name}",
-                        "question": "Quel est le nom de cette friterie?"
-                    },
-                    "2": {
-                        "render": "<h3>Horaires</h3>{opening_hours_table(opening_hours)}",
-                        "question": "Quand est ce-que ce friterie ouvert?"
-                    },
-                    "3": {
-                        "render": "<a href='{website}'>{website}</a>",
-                        "question": "Quel est le site web de cette  friterie?"
-                    },
-                    "4": {
-                        "render": "<a href='tel:{phone}'>{phone}</a>",
-                        "question": "Quel est le numéro de téléphone de cette friterie?"
-                    },
-                    "5": {
-                        "question": "Cette friterie est-elle équipée de snacks végétariens ?",
-                        "mappings": {
-                            "0": {
-                                "then": "Des collations végétariennes sont disponibles"
-                            },
-                            "1": {
-                                "then": "Quelques snacks végétariens seulement"
-                            },
-                            "2": {
-                                "then": "Pas d'en-cas végétariens disponibles"
-                            }
-                        }
-                    },
-                    "6": {
-                        "question": "Cette friterie est-elle équipée de snacks végétaliens ?",
-                        "mappings": {
-                            "0": {
-                                "then": "Des collations végétaliens sont disponibles"
-                            },
-                            "1": {
-                                "then": "Quelques snacks végétaliens seulement"
-                            },
-                            "2": {
-                                "then": "Pas d'en-cas végétaliens disponibles"
-                            }
-                        }
-                    },
-                    "7": {
-                        "question": "Cette friteuse fonctionne-t-elle avec de la graisse animale ou végétale ?",
-                        "mappings": {
-                            "0": {
-                                "then": "Huile végétale"
-                            },
-                            "1": {
-                                "then": "Graisse animale"
-                            }
-                        }
-                    },
-                    "8": {
-                        "question": "Est-il proposé d’utiliser ses propres contenants pour sa commande ?<br/>",
-                        "mappings": {
-                            "0": {
-                                "then": "Vous pouvez <b>apporter vos contenants</b> pour votre commande, limitant l’usage de matériaux à usage unique et les déchets"
-                            },
-                            "1": {
-                                "then": "Apporter ses propres contenants <b>n’est pas permis</b>"
-                            },
-                            "2": {
-                                "then": "Il est <b>obligatoire</b> d’apporter ses propres contenants"
-                            }
-                        }
-                    }
-                },
-                "presets": {
-                    "0": {
-                        "title": "Friturie"
-                    }
+                "override": {
+                    "name": "Friteries"
                 }
             }
         }
diff --git a/langs/themes/id.json b/langs/themes/id.json
index c436e745eb..71148bcf36 100644
--- a/langs/themes/id.json
+++ b/langs/themes/id.json
@@ -125,17 +125,6 @@
             }
         }
     },
-    "fritures": {
-        "layers": {
-            "0": {
-                "tagRenderings": {
-                    "3": {
-                        "render": "<a href='{website}'>{website}</a>"
-                    }
-                }
-            }
-        }
-    },
     "hailhydrant": {
         "layers": {
             "0": {
diff --git a/langs/themes/it.json b/langs/themes/it.json
index 0d7fd27456..189b761780 100644
--- a/langs/themes/it.json
+++ b/langs/themes/it.json
@@ -488,21 +488,6 @@
             }
         }
     },
-    "fritures": {
-        "layers": {
-            "0": {
-                "tagRenderings": {
-                    "3": {
-                        "render": "<a href='{website}'>{website}</a>",
-                        "question": "Qual è il sito web di questo negozio?"
-                    },
-                    "4": {
-                        "question": "Qual è il numero di telefono?"
-                    }
-                }
-            }
-        }
-    },
     "hailhydrant": {
         "layers": {
             "0": {
diff --git a/langs/themes/ja.json b/langs/themes/ja.json
index 619f25da89..26df696426 100644
--- a/langs/themes/ja.json
+++ b/langs/themes/ja.json
@@ -699,38 +699,6 @@
             }
         }
     },
-    "fritures": {
-        "layers": {
-            "0": {
-                "tagRenderings": {
-                    "1": {
-                        "question": "このfritureは何という名前ですか?"
-                    },
-                    "3": {
-                        "render": "<a href='{website}'>{website}</a>",
-                        "question": "このお店のホームページは何ですか?"
-                    },
-                    "4": {
-                        "question": "電話番号は何番ですか?"
-                    },
-                    "8": {
-                        "question": "お客様が持参容器(調理用の鍋や小さな鍋など)をもってきた場合は、注文の梱包に使用されますか?<br/>",
-                        "mappings": {
-                            "0": {
-                                "then": "<b>自分の容器</b>を持ってきて、注文を受け取ることができ、使い捨ての梱包材を節約して、無駄を省くことができます"
-                            },
-                            "1": {
-                                "then": "独自の容器を持参することは<b>できません</b>"
-                            },
-                            "2": {
-                                "then": "自身の容器が注文に<b>必要</b>。"
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    },
     "ghostbikes": {
         "title": "ゴーストバイク",
         "description": "<b>ゴーストバイク</b>は、交通事故で死亡したサイクリストを記念するもので、事故現場の近くに恒久的に置かれた白い自転車の形をしています。<br/><br/>このマップには、OpenStreetMapで知られているゴーストバイクがすべて表示されます。ゴーストバイクは行方不明ですか?誰でもここで情報の追加や更新ができます。必要なのは(無料の)OpenStreetMapアカウントだけです。"
diff --git a/langs/themes/nb_NO.json b/langs/themes/nb_NO.json
index bba4fc5e5b..89305a087d 100644
--- a/langs/themes/nb_NO.json
+++ b/langs/themes/nb_NO.json
@@ -243,17 +243,6 @@
             }
         }
     },
-    "fritures": {
-        "layers": {
-            "0": {
-                "tagRenderings": {
-                    "4": {
-                        "question": "Hva er telefonnummeret?"
-                    }
-                }
-            }
-        }
-    },
     "ghostbikes": {
         "title": "Spøkelsessykler"
     },
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index 82acb39c39..d90beb6559 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -714,89 +714,8 @@
         "description": "Op deze kaart vind je je favoriete frituur!",
         "layers": {
             "0": {
-                "name": "Frituren",
-                "title": {
-                    "render": "Frituur",
-                    "mappings": {
-                        "0": {
-                            "then": " <i>{name}</i>"
-                        }
-                    }
-                },
-                "tagRenderings": {
-                    "1": {
-                        "render": "{name}",
-                        "question": "Wat is de naam van deze frituur?"
-                    },
-                    "2": {
-                        "render": "<h3>Openingsuren</h3>{opening_hours_table(opening_hours)}",
-                        "question": "Wat zijn de openinguren van deze frituur?"
-                    },
-                    "3": {
-                        "question": "Wat is de website van deze frituur?"
-                    },
-                    "4": {
-                        "render": "<a href='tel:{phone}'>{phone}</a>",
-                        "question": "Wat is het telefoonnummer van deze frituur?"
-                    },
-                    "5": {
-                        "question": "Heeft deze frituur vegetarische snacks?",
-                        "mappings": {
-                            "0": {
-                                "then": "Er zijn vegetarische snacks aanwezig"
-                            },
-                            "1": {
-                                "then": "Slechts enkele vegetarische snacks"
-                            },
-                            "2": {
-                                "then": "Geen vegetarische snacks beschikbaar"
-                            }
-                        }
-                    },
-                    "6": {
-                        "question": "Heeft deze frituur veganistische snacks?",
-                        "mappings": {
-                            "0": {
-                                "then": "Er zijn veganistische snacks aanwezig"
-                            },
-                            "1": {
-                                "then": "Slechts enkele veganistische snacks"
-                            },
-                            "2": {
-                                "then": "Geen veganistische snacks beschikbaar"
-                            }
-                        }
-                    },
-                    "7": {
-                        "question": "Bakt deze frituur met dierlijk vet of met plantaardige olie?",
-                        "mappings": {
-                            "0": {
-                                "then": "Plantaardige olie"
-                            },
-                            "1": {
-                                "then": "Dierlijk vet"
-                            }
-                        }
-                    },
-                    "8": {
-                        "question": "Als je je eigen container (bv. kookpot of kleine potjes voor saus) meeneemt, gebruikt de frituur deze dan om je bestelling in te doen?",
-                        "mappings": {
-                            "0": {
-                                "then": "Je mag je <b>eigen containers</b> meenemen om je bestelling in mee te nemen en zo minder afval te maken"
-                            },
-                            "1": {
-                                "then": "Je mag <b>geen</b> eigen containers meenemen om je bestelling in mee te nemen"
-                            },
-                            "2": {
-                                "then": "Je <b>moet</b> je eigen containers meenemen om je bestelling in mee te nemen."
-                            }
-                        }
-                    }
-                },
-                "presets": {
-                    "0": {
-                        "title": "Frituur"
-                    }
+                "override": {
+                    "name": "Frituren"
                 }
             }
         }
@@ -1118,6 +1037,10 @@
         "shortDescription": "Bewakingscameras en dergelijke",
         "description": "Op deze open kaart kan je bewakingscamera's vinden."
     },
+    "toerisme_vlaanderen": {
+        "title": "Toeristisch relevante info",
+        "shortDescription": "Een kaart om toeristisch relevante info op aan te duiden"
+    },
     "toilets": {
         "title": "Open Toilettenkaart",
         "description": "Een kaart met openbare toiletten"
diff --git a/langs/themes/ru.json b/langs/themes/ru.json
index cac8fe3226..5c622034ea 100644
--- a/langs/themes/ru.json
+++ b/langs/themes/ru.json
@@ -421,28 +421,6 @@
             }
         }
     },
-    "fritures": {
-        "layers": {
-            "0": {
-                "tagRenderings": {
-                    "3": {
-                        "render": "<a href='{website}'>{website}</a>",
-                        "question": "Какой веб-сайт у этого магазина?"
-                    },
-                    "4": {
-                        "question": "Какой телефон?"
-                    },
-                    "8": {
-                        "mappings": {
-                            "1": {
-                                "then": "Приносить свою тару <b>не разрешено</b>"
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    },
     "hailhydrant": {
         "title": "Пожарные гидранты, огнетушители, пожарные станции и станции скорой помощи.",
         "shortDescription": "Карта пожарных гидрантов, огнетушителей, пожарных станций и станций скорой помощи.",