Chore: regen docs

2025-06-26 05:11:29 +02:00 · 2025-06-26 05:11:29 +02:00 · c0e7c9e8fa
commit c0e7c9e8fa
parent f4c0541bb1
114 changed files with 629 additions and 772 deletions
--- a/Docs/Layers/aerialway.md
+++ b/Docs/Layers/aerialway.md
@ -12,13 +12,11 @@ Various forms of transport for passengers and goods that use wires, including ca
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [type](#type)
  - [duration](#duration)
  - [occupancy](#occupancy)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [oneway](#oneway)
  - [length](#length)
  - [leftover-questions](#leftover-questions)
--- a/Docs/Layers/all_vending_machine.md
+++ b/Docs/Layers/all_vending_machine.md
@ -15,14 +15,12 @@ Layer showing vending machines
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [repeated](#repeated)
  - [single_level](#single_level)
  - [vending](#vending)
  - [bicycle_tube_vending_machine-brand](#bicycle_tube_vending_machine-brand)
  - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
  - [payment-options-split](#payment-options-split)
  - [denominations-coins](#denominations-coins)
  - [denominations-notes](#denominations-notes)
--- a/Docs/Layers/animal_shelter.md
+++ b/Docs/Layers/animal_shelter.md
@ -13,7 +13,6 @@ An animal shelter is a facility where animals in trouble are brought and facilit
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [2](#2)
@ -22,7 +21,6 @@ An animal shelter is a facility where animals in trouble are brought and facilit
  - [email](#email)
  - [6](#6)
  - [opening_hours_by_appointment](#opening_hours_by_appointment)
-  - [Opening hours](#opening-hours)
  - [boarded_animals](#boarded_animals)
  - [leftover-questions](#leftover-questions)
  - [move-button](#move-button)
--- a/Docs/Layers/artwork.md
+++ b/Docs/Layers/artwork.md
@ -14,8 +14,6 @@ An open map of statues, busts, graffitis and other artwork all over the world
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia page about the memorial](#wikipedia-page-about-the-memorial)
-  - [Wikipedia page about the remembered event or person](#wikipedia-page-about-the-remembered-event-or-person)
  - [images_no_blur](#images_no_blur)
  - [artwork-artwork_type](#artwork-artwork_type)
  - [artwork-artist-wikidata](#artwork-artist-wikidata)
@ -27,9 +25,7 @@ An open map of statues, busts, graffitis and other artwork all over the world
  - [memorial-type](#memorial-type)
  - [inscription](#inscription)
  - [memorial-wikidata](#memorial-wikidata)
-  - [Wikipedia page about the memorial](#wikipedia-page-about-the-memorial)
  - [subject-wikidata](#subject-wikidata)
-  - [Wikipedia page about the remembered event or person](#wikipedia-page-about-the-remembered-event-or-person)
  - [doubles_as_bench](#doubles_as_bench)
  - [bench-backrest](#bench-backrest)
  - [bench-armrest](#bench-armrest)
--- a/Docs/Layers/artwork_on_wall.md
+++ b/Docs/Layers/artwork_on_wall.md
@ -14,8 +14,6 @@ An open map of statues, busts, graffitis and other artwork all over the world
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia page about the memorial](#wikipedia-page-about-the-memorial)
-  - [Wikipedia page about the remembered event or person](#wikipedia-page-about-the-remembered-event-or-person)
  - [historic_or_not](#historic_or_not)
  - [images_no_blur](#images_no_blur)
  - [artwork-artwork_type](#artwork-artwork_type)
@ -28,9 +26,7 @@ An open map of statues, busts, graffitis and other artwork all over the world
  - [memorial-type](#memorial-type)
  - [inscription](#inscription)
  - [memorial-wikidata](#memorial-wikidata)
-  - [Wikipedia page about the memorial](#wikipedia-page-about-the-memorial)
  - [subject-wikidata](#subject-wikidata)
-  - [Wikipedia page about the remembered event or person](#wikipedia-page-about-the-remembered-event-or-person)
  - [doubles_as_bench](#doubles_as_bench)
  - [bench-backrest](#bench-backrest)
  - [bench-armrest](#bench-armrest)
--- a/Docs/Layers/assisted_repair.md
+++ b/Docs/Layers/assisted_repair.md
@ -13,12 +13,10 @@ A self-assisted workshop is a location where people can come and repair their go
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [preset_description](#preset_description)
  - [name](#name)
  - [opening_hours_by_appointment](#opening_hours_by_appointment)
-  - [Opening hours](#opening-hours)
  - [phone](#phone)
  - [email](#email)
  - [website](#website)
--- a/Docs/Layers/atm.md
+++ b/Docs/Layers/atm.md
@ -13,13 +13,11 @@ ATMs to withdraw money
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [name](#name)
  - [brand](#brand)
  - [operator](#operator)
  - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
  - [indoor](#indoor)
  - [cash_out](#cash_out)
  - [cash_in](#cash_in)
--- a/Docs/Layers/bench.md
+++ b/Docs/Layers/bench.md
@ -13,8 +13,6 @@ A bench is a wooden, metal, stone, … surface where a human can sit. This layer
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia page about the memorial](#wikipedia-page-about-the-memorial)
-  - [Wikipedia page about the remembered event or person](#wikipedia-page-about-the-remembered-event-or-person)
  - [images](#images)
  - [bench-backrest](#bench-backrest)
  - [bench-armrest](#bench-armrest)
@ -32,9 +30,7 @@ A bench is a wooden, metal, stone, … surface where a human can sit. This layer
  - [artwork-website](#artwork-website)
  - [artwork_subject](#artwork_subject)
  - [memorial-wikidata](#memorial-wikidata)
-  - [Wikipedia page about the memorial](#wikipedia-page-about-the-memorial)
  - [subject-wikidata](#subject-wikidata)
-  - [Wikipedia page about the remembered event or person](#wikipedia-page-about-the-remembered-event-or-person)
  - [leftover-questions](#leftover-questions)
  - [move-button](#move-button)
  - [delete-button](#delete-button)
--- a/Docs/Layers/bicycle_assisted_repair_workshop.md
+++ b/Docs/Layers/bicycle_assisted_repair_workshop.md
@ -14,12 +14,10 @@ A self-assisted workshop is a location where people can come and repair their go
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [preset_description](#preset_description)
  - [name](#name)
  - [opening_hours_by_appointment](#opening_hours_by_appointment)
-  - [Opening hours](#opening-hours)
  - [phone](#phone)
  - [email](#email)
  - [website](#website)
--- a/Docs/Layers/bicycle_library.md
+++ b/Docs/Layers/bicycle_library.md
@ -13,14 +13,12 @@ A facility where bicycles can be lent for longer period of times
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [bicycle_library-name](#bicycle_library-name)
  - [website](#website)
  - [phone](#phone)
  - [email](#email)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [bicycle_library-charge](#bicycle_library-charge)
  - [bicycle-library-target-group](#bicycle-library-target-group)
  - [description](#description)
--- a/Docs/Layers/bicycle_rental.md
+++ b/Docs/Layers/bicycle_rental.md
@ -13,14 +13,12 @@ Bicycle rental stations
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [bicycle_rental_type](#bicycle_rental_type)
  - [website](#website)
  - [email](#email)
  - [phone](#phone)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [payment-options](#payment-options)
  - [payment-options-advanced](#payment-options-advanced)
  - [bicycle-types](#bicycle-types)
--- a/Docs/Layers/bicycle_rental_non_docking.md
+++ b/Docs/Layers/bicycle_rental_non_docking.md
@ -14,14 +14,12 @@ Bicycle rental stations
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [bicycle_rental_type](#bicycle_rental_type)
  - [website](#website)
  - [email](#email)
  - [phone](#phone)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [payment-options](#payment-options)
  - [payment-options-advanced](#payment-options-advanced)
  - [bicycle-types](#bicycle-types)
--- a/Docs/Layers/bike_cafe.md
+++ b/Docs/Layers/bike_cafe.md
@ -13,7 +13,6 @@ A bike café is a café geared towards cyclists, for example with services such
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [bike_cafe-name](#bike_cafe-name)
  - [bike_cafe-bike-pump](#bike_cafe-bike-pump)
@ -23,7 +22,6 @@ A bike café is a café geared towards cyclists, for example with services such
  - [phone](#phone)
  - [email](#email)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [leftover-questions](#leftover-questions)
  - [move-button](#move-button)
  - [delete-button](#delete-button)
--- a/Docs/Layers/bike_cleaning.md
+++ b/Docs/Layers/bike_cleaning.md
@ -13,10 +13,8 @@ A layer showing facilities where one can clean their bike
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
  - [bike_cleaning-service_bicycle_cleaning_charge](#bike_cleaning-service_bicycle_cleaning_charge)
  - [bike_cleaning-charge](#bike_cleaning-charge)
  - [payment-options-split](#payment-options-split)
--- a/Docs/Layers/bike_parking.md
+++ b/Docs/Layers/bike_parking.md
@ -13,7 +13,6 @@ A layer showing where you can park your bike
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [Bicycle parking type](#bicycle-parking-type)
  - [location](#location)
@ -23,7 +22,6 @@ A layer showing where you can park your bike
  - [fee](#fee)
  - [charge](#charge)
  - [opening_hours_24_7_default](#opening_hours_24_7_default)
-  - [Opening hours](#opening-hours)
  - [operator](#operator)
  - [operator_phone](#operator_phone)
  - [operator_website](#operator_website)
--- a/Docs/Layers/bike_repair_station.md
+++ b/Docs/Layers/bike_repair_station.md
@ -13,12 +13,10 @@ A layer showing bicycle pumps and bicycle repair tool stands
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [bike_repair_station-available-services](#bike_repair_station-available-services)
  - [Operational status](#operational-status)
  - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
  - [access](#access)
  - [bike_repair_station-operator](#bike_repair_station-operator)
  - [bike_repair_station-email](#bike_repair_station-email)
--- a/Docs/Layers/bike_shop.md
+++ b/Docs/Layers/bike_shop.md
@ -14,7 +14,6 @@ A shop specifically selling bicycles or related items
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [shops-name](#shops-name)
@ -22,7 +21,6 @@ A shop specifically selling bicycles or related items
  - [brand](#brand)
  - [second_hand](#second_hand)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [website](#website)
  - [email](#email)
  - [phone](#phone)
--- a/Docs/Layers/bike_themed_object.md
+++ b/Docs/Layers/bike_themed_object.md
@ -12,14 +12,12 @@ A layer with bike-themed objects but who don't match any other layer
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [description](#description)
  - [website](#website)
  - [email](#email)
  - [phone](#phone)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [leftover-questions](#leftover-questions)
  - [lod](#lod)
 5. [Filters](#filters)
--- a/Docs/Layers/brothel.md
+++ b/Docs/Layers/brothel.md
@ -13,12 +13,10 @@ An establishment specifically dedicated to prostitution.
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [name](#name)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [phone](#phone)
  - [email](#email)
  - [website](#website)
--- a/Docs/Layers/cafe_pub.md
+++ b/Docs/Layers/cafe_pub.md
@ -14,13 +14,11 @@ A layer showing cafés and pubs where one can gather around a drink. The layer a
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [Name](#name)
  - [Classification](#classification)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [website](#website)
  - [email](#email)
  - [phone](#phone)
--- a/Docs/Layers/car_rental.md
+++ b/Docs/Layers/car_rental.md
@ -13,14 +13,12 @@ Places where you can rent a car
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [name](#name)
  - [website](#website)
  - [email](#email)
  - [phone](#phone)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [leftover-questions](#leftover-questions)
  - [move-button](#move-button)
  - [lod](#lod)
--- a/Docs/Layers/charge_point.md
+++ b/Docs/Layers/charge_point.md
@ -13,7 +13,6 @@ Layer showing individual charge points within a charging station
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Technical questions](#technical-questions)
  - [images](#images)
  - [ref](#ref)
  - [capacity](#capacity)
@ -41,7 +40,6 @@ Layer showing individual charge points within a charging station
  - [plugs-amount-socket:nacs](#plugs-amount-socketnacs)
  - [questions](#questions)
  - [questions-technical](#questions-technical)
-  - [Technical questions](#technical-questions)
  - [voltage-socket:schuko](#voltage-socketschuko)
  - [current-socket:schuko](#current-socketschuko)
  - [power-output-socket:schuko](#power-output-socketschuko)
--- a/Docs/Layers/charging_station.md
+++ b/Docs/Layers/charging_station.md
@ -13,8 +13,6 @@ A charging station
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
-  - [Technical questions](#technical-questions)
  - [images](#images)
  - [Type](#type)
  - [access](#access)
@ -105,7 +103,6 @@ A charging station
  - [current-socket:nacs](#current-socketnacs)
  - [power-output-socket:nacs](#power-output-socketnacs)
  - [OH](#oh)
-  - [Opening hours](#opening-hours)
  - [fee](#fee)
  - [charge](#charge)
  - [payment-options](#payment-options)
@ -125,7 +122,6 @@ A charging station
  - [Parking:fee](#parkingfee)
  - [questions](#questions)
  - [questions-technical](#questions-technical)
-  - [Technical questions](#technical-questions)
  - [move-button](#move-button)
  - [delete-button](#delete-button)
  - [lod](#lod)
--- a/Docs/Layers/charging_station_ebikes.md
+++ b/Docs/Layers/charging_station_ebikes.md
@ -14,8 +14,6 @@ A charging station
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
-  - [Technical questions](#technical-questions)
  - [images](#images)
  - [Type](#type)
  - [access](#access)
@ -106,7 +104,6 @@ A charging station
  - [current-socket:nacs](#current-socketnacs)
  - [power-output-socket:nacs](#power-output-socketnacs)
  - [OH](#oh)
-  - [Opening hours](#opening-hours)
  - [fee](#fee)
  - [charge](#charge)
  - [payment-options](#payment-options)
@ -126,7 +123,6 @@ A charging station
  - [Parking:fee](#parkingfee)
  - [questions](#questions)
  - [questions-technical](#questions-technical)
-  - [Technical questions](#technical-questions)
  - [move-button](#move-button)
  - [delete-button](#delete-button)
  - [lod](#lod)
--- a/Docs/Layers/childcare.md
+++ b/Docs/Layers/childcare.md
@ -13,13 +13,11 @@ Shows kindergartens and preschools. Both are grouped in one layer, as they are r
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [name](#name)
  - [website](#website)
  - [email](#email)
  - [phone](#phone)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [capacity](#capacity)
  - [leftover-questions](#leftover-questions)
  - [move-button](#move-button)
--- a/Docs/Layers/climbing_area.md
+++ b/Docs/Layers/climbing_area.md
@ -14,17 +14,11 @@ An area where climbing is possible, e.g. a crag, site, boulder, … Contains agg
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Length overview](#length-overview)
-  - [Grades overview](#grades-overview)
-  - [Contains {_contained_climbing_routes_count} routes](#contains-{_contained_climbing_routes_count}-routes)
  - [images](#images)
  - [minimap](#minimap)
  - [Contained routes length hist](#contained-routes-length-hist)
-  - [Length overview](#length-overview)
  - [Contained routes hist](#contained-routes-hist)
-  - [Grades overview](#grades-overview)
  - [Contained_climbing_routes](#contained_climbing_routes)
-  - [Contains {_contained_climbing_routes_count} routes](#contains-{_contained_climbing_routes_count}-routes)
  - [name](#name)
  - [Type](#type)
  - [Rock type (crag/rock/cliff only)](#rock-type-(cragrock/cliff-only))
--- a/Docs/Layers/climbing_club.md
+++ b/Docs/Layers/climbing_club.md
@ -13,13 +13,11 @@ A climbing club or organisation
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [climbing_club-name](#climbing_club-name)
  - [website](#website)
  - [email](#email)
  - [phone](#phone)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [leftover-questions](#leftover-questions)
  - [move-button](#move-button)
  - [lod](#lod)
--- a/Docs/Layers/climbing_gym.md
+++ b/Docs/Layers/climbing_gym.md
@ -13,7 +13,6 @@ A climbing gym
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [name](#name)
  - [website](#website)
@ -22,7 +21,6 @@ A climbing gym
  - [fee](#fee)
  - [payment-options](#payment-options)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [reviews](#reviews)
  - [bouldering](#bouldering)
  - [sportclimbing](#sportclimbing)
--- a/Docs/Layers/cultural_places_without_etymology.md
+++ b/Docs/Layers/cultural_places_without_etymology.md
@ -14,10 +14,8 @@ All objects which have an etymology known
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
  - [etymology-images-from-wikipedia](#etymology-images-from-wikipedia)
  - [wikipedia-etymology](#wikipedia-etymology)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
  - [zoeken op inventaris onroerend erfgoed](#zoeken-op-inventaris-onroerend-erfgoed)
  - [simple etymology](#simple-etymology)
  - [questions](#questions)
--- a/Docs/Layers/defibrillator.md
+++ b/Docs/Layers/defibrillator.md
@ -14,7 +14,6 @@ A layer showing defibrillators which can be used in case of emergency. This cont
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [defibrillator-indoors](#defibrillator-indoors)
  - [defibrillator-access](#defibrillator-access)
@ -27,7 +26,6 @@ A layer showing defibrillators which can be used in case of emergency. This cont
  - [defibrillator-email](#defibrillator-email)
  - [defibrillator-phone](#defibrillator-phone)
  - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
  - [defibrillator-description](#defibrillator-description)
  - [defibrillator-survey:date](#defibrillator-surveydate)
  - [defibrillator-fixme](#defibrillator-fixme)
--- a/Docs/Layers/dentist.md
+++ b/Docs/Layers/dentist.md
@ -13,10 +13,8 @@ This layer shows dentist offices
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [phone](#phone)
  - [email](#email)
  - [website](#website)
--- a/Docs/Layers/doctors.md
+++ b/Docs/Layers/doctors.md
@ -14,11 +14,9 @@ This layer shows doctor offices
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [name](#name)
  - [opening_hours_by_appointment](#opening_hours_by_appointment)
-  - [Opening hours](#opening-hours)
  - [phone](#phone)
  - [email](#email)
  - [website](#website)
--- a/Docs/Layers/dogpark.md
+++ b/Docs/Layers/dogpark.md
@ -13,12 +13,10 @@ A layer showing dogparks, which are areas where dog are allowed to run without a
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [Name](#name)
  - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
  - [website](#website)
  - [dogpark-fenced](#dogpark-fenced)
  - [smalldogs](#smalldogs)
--- a/Docs/Layers/drinking_water.md
+++ b/Docs/Layers/drinking_water.md
@ -15,7 +15,6 @@ A layer showing drinking water fountains
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [Still in use?](#still-in-use)
  - [fee](#fee)
@ -24,7 +23,6 @@ A layer showing drinking water fountains
  - [temperature-cold](#temperature-cold)
  - [seasonal](#seasonal)
  - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
  - [bench-artwork](#bench-artwork)
  - [artwork-artwork_type](#artwork-artwork_type)
  - [artwork-artist-wikidata](#artwork-artist-wikidata)
--- a/Docs/Layers/education_institutions_without_etymology.md
+++ b/Docs/Layers/education_institutions_without_etymology.md
@ -14,10 +14,8 @@ All objects which have an etymology known
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
  - [etymology-images-from-wikipedia](#etymology-images-from-wikipedia)
  - [wikipedia-etymology](#wikipedia-etymology)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
  - [zoeken op inventaris onroerend erfgoed](#zoeken-op-inventaris-onroerend-erfgoed)
  - [simple etymology](#simple-etymology)
  - [questions](#questions)
--- a/Docs/Layers/elongated_coin.md
+++ b/Docs/Layers/elongated_coin.md
@ -13,10 +13,8 @@ Layer showing penny presses.
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
  - [designs](#designs)
  - [fee](#fee)
  - [payment-options-split](#payment-options-split)
--- a/Docs/Layers/etymology.md
+++ b/Docs/Layers/etymology.md
@ -12,10 +12,8 @@ All objects which have an etymology known
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
  - [etymology-images-from-wikipedia](#etymology-images-from-wikipedia)
  - [wikipedia-etymology](#wikipedia-etymology)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
  - [zoeken op inventaris onroerend erfgoed](#zoeken-op-inventaris-onroerend-erfgoed)
  - [simple etymology](#simple-etymology)
  - [questions](#questions)
--- a/Docs/Layers/fitness_centre.md
+++ b/Docs/Layers/fitness_centre.md
@ -13,14 +13,12 @@ Layer showing fitness centres
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [name](#name)
  - [images](#images)
  - [phone](#phone)
  - [email](#email)
  - [website](#website)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [wheelchair-access](#wheelchair-access)
  - [repeated](#repeated)
  - [single_level](#single_level)
--- a/Docs/Layers/fitness_station.md
+++ b/Docs/Layers/fitness_station.md
@ -13,13 +13,11 @@ Find a fitness station near you, and add missing ones.
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [name](#name)
  - [type](#type)
  - [operator](#operator)
  - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
  - [leftover-questions](#leftover-questions)
  - [move-button](#move-button)
  - [lod](#lod)
--- a/Docs/Layers/food.md
+++ b/Docs/Layers/food.md
@ -14,14 +14,11 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
-  - [Drive-through opening hours](#drive-through-opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [Name](#name)
  - [Fastfood vs restaurant](#fastfood-vs-restaurant)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [website](#website)
  - [email](#email)
  - [phone](#phone)
@ -38,7 +35,6 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [delivery](#delivery)
  - [drive-through](#drive-through)
  - [drive-through-opening_hours](#drive-through-opening_hours)
-  - [Drive-through opening hours](#drive-through-opening-hours)
  - [child_highchair](#child_highchair)
  - [kids_area](#kids_area)
  - [diets_title](#diets_title)
@ -47,10 +43,10 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [lactose_free](#lactose_free)
  - [gluten_free](#gluten_free)
  - [vegan](#vegan)
-  - [Vegetarian (no friture)](#vegetarian-(no-friture))
-  - [Vegan (no friture)](#vegan-(no-friture))
-  - [halal (no friture)](#halal-(no-friture))
-  - [organic (no friture)](#organic-(no-friture))
+  - [vegan_food](#vegan_food)
+  - [vegetarian](#vegetarian)
+  - [halal](#halal)
+  - [organic](#organic)
  - [friture-vegetarian](#friture-vegetarian)
  - [friture-vegan](#friture-vegan)
  - [friture-organic](#friture-organic)
@ -169,8 +165,8 @@ Elements must match **any** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:lactose_free#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Alactose_free/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:gluten_free#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Agluten_free/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegan#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegan/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) |
-| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegetarian#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegetarian/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegan#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegan/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegetarian#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegetarian/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:halal#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Ahalal/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:halal](https://wiki.openstreetmap.org/wiki/Key:diet:halal) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/organic#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/organic/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegetarian#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegetarian/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) |
@ -249,10 +245,10 @@ Elements must match **any** of the following expressions:
 | [lactose_free](#lactose_free) <br/> _(Original in [diets](./diets.md#lactose_free))_ | Does  have a lactose-free offering?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [gluten_free](#gluten_free) <br/> _(Original in [diets](./diets.md#gluten_free))_ | Does this shop have a gluten free offering?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [vegan](#vegan) <br/> _(Original in [diets](./diets.md#vegan))_ | Does this place offer a vegan option?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [Vegetarian (no friture)](#Vegetarian (no friture)) <br/> _(Original in [diets](./diets.md#Vegetarian (no friture)))_ | Does this restaurant have a vegetarian option?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [Vegan (no friture)](#Vegan (no friture)) <br/> _(Original in [diets](./diets.md#Vegan (no friture)))_ | Does this business serve vegan meals?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [halal (no friture)](#halal (no friture)) <br/> _(Original in [diets](./diets.md#halal (no friture)))_ | Does this restaurant offer a halal menu?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [organic (no friture)](#organic (no friture)) <br/> _(Original in [diets](./diets.md#organic (no friture)))_ | Does this restaurant offer organic food?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [vegan_food](#vegan_food) <br/> _(Original in [diets](./diets.md#vegan_food))_ | Does this business serve vegan meals?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [vegetarian](#vegetarian) <br/> _(Original in [diets](./diets.md#vegetarian))_ | Does this restaurant have a vegetarian option?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [halal](#halal) <br/> _(Original in [diets](./diets.md#halal))_ | Does this restaurant offer a halal menu?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [organic](#organic) <br/> _(Original in [diets](./diets.md#organic))_ | Does this restaurant offer organic food?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-vegetarian](#friture-vegetarian) <br/> _(Original in [diets](./diets.md#friture-vegetarian))_ | Does this fries shop have vegetarian snacks?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-vegan](#friture-vegan) <br/> _(Original in [diets](./diets.md#friture-vegan))_ | Does this fries shop have vegan snacks?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-organic](#friture-organic) <br/> _(Original in [diets](./diets.md#friture-organic))_ | Does this fries shop offer organic snacks?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
@ -560,18 +556,7 @@ The question is `Does this place offer a vegan option?`

 This tagrendering has labels `diets` `diets-content` `hidden`

-### Vegetarian (no friture)
-The question is `Does this restaurant have a vegetarian option?`
-
- -  *No vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>
- -  *Some vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited' target='_blank'>limited</a>
- - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *Vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes' target='_blank'>yes</a>
- - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *All dishes are vegetarian* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly' target='_blank'>only</a>
- -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand' target='_blank'>on_demand</a>
-
-This tagrendering has labels `diets` `diets-content` `hidden`
-
-### Vegan (no friture)
+### vegan_food
 The question is `Does this business serve vegan meals?`

 -  *No vegan options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno' target='_blank'>no</a>
@ -580,25 +565,40 @@ The question is `Does this business serve vegan meals?`
 -  *All dishes are vegan* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly' target='_blank'>only</a>
 -  *Some dishes might be adapted to a vegan version if asked for* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand' target='_blank'>on_demand</a>

+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`

-### halal (no friture)
+### vegetarian
+The question is `Does this restaurant have a vegetarian option?`
+
+ -  *No vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>
+ -  *Some vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited' target='_blank'>limited</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *Vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes' target='_blank'>yes</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *All dishes are vegetarian* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly' target='_blank'>only</a>
+ -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand' target='_blank'>on_demand</a>
+
+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
+This tagrendering has labels `diets` `diets-content` `hidden`
+
+### halal
 The question is `Does this restaurant offer a halal menu?`

 -  *There are no halal options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno' target='_blank'>no</a>
 -  *There is a small halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited' target='_blank'>limited</a>
- -  *There is a halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes' target='_blank'>yes</a>
- -  *Only halal options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly' target='_blank'>only</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/diets/halal.svg'> *There is a halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes' target='_blank'>yes</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/diets/halal.svg'> *Only halal options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly' target='_blank'>only</a>

+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`

-### organic (no friture)
+### organic
 The question is `Does this restaurant offer organic food?`

 -  *There are no organic options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>
 -  *There is an organic menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>
 -  *Only organic options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>

+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`

 ### friture-vegetarian
--- a/Docs/Layers/food_courts.md
+++ b/Docs/Layers/food_courts.md
@ -12,12 +12,10 @@ Food courts with a variety of food options.
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [name](#name)
  - [reviews](#reviews)
  - [images](#images)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [wheelchair-access](#wheelchair-access)
  - [website](#website)
  - [phone](#phone)
--- a/Docs/Layers/food_dog_friendly.md
+++ b/Docs/Layers/food_dog_friendly.md
@ -15,14 +15,11 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
-  - [Drive-through opening hours](#drive-through-opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [Name](#name)
  - [Fastfood vs restaurant](#fastfood-vs-restaurant)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [website](#website)
  - [email](#email)
  - [phone](#phone)
@ -39,7 +36,6 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [delivery](#delivery)
  - [drive-through](#drive-through)
  - [drive-through-opening_hours](#drive-through-opening_hours)
-  - [Drive-through opening hours](#drive-through-opening-hours)
  - [child_highchair](#child_highchair)
  - [kids_area](#kids_area)
  - [diets_title](#diets_title)
@ -48,10 +44,10 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [lactose_free](#lactose_free)
  - [gluten_free](#gluten_free)
  - [vegan](#vegan)
-  - [Vegetarian (no friture)](#vegetarian-(no-friture))
-  - [Vegan (no friture)](#vegan-(no-friture))
-  - [halal (no friture)](#halal-(no-friture))
-  - [organic (no friture)](#organic-(no-friture))
+  - [vegan_food](#vegan_food)
+  - [vegetarian](#vegetarian)
+  - [halal](#halal)
+  - [organic](#organic)
  - [friture-vegetarian](#friture-vegetarian)
  - [friture-vegan](#friture-vegan)
  - [friture-organic](#friture-organic)
@ -154,8 +150,8 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:lactose_free#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Alactose_free/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:gluten_free#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Agluten_free/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegan#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegan/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) |
-| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegetarian#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegetarian/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegan#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegan/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegetarian#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegetarian/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:halal#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Ahalal/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:halal](https://wiki.openstreetmap.org/wiki/Key:diet:halal) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/organic#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/organic/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegetarian#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegetarian/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) |
@ -234,10 +230,10 @@ Elements must match **all** of the following expressions:
 | [lactose_free](#lactose_free) <br/> _(Original in [diets](./diets.md#lactose_free))_ | Does  have a lactose-free offering?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [gluten_free](#gluten_free) <br/> _(Original in [diets](./diets.md#gluten_free))_ | Does this shop have a gluten free offering?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [vegan](#vegan) <br/> _(Original in [diets](./diets.md#vegan))_ | Does this place offer a vegan option?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [Vegetarian (no friture)](#Vegetarian (no friture)) <br/> _(Original in [diets](./diets.md#Vegetarian (no friture)))_ | Does this restaurant have a vegetarian option?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [Vegan (no friture)](#Vegan (no friture)) <br/> _(Original in [diets](./diets.md#Vegan (no friture)))_ | Does this business serve vegan meals?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [halal (no friture)](#halal (no friture)) <br/> _(Original in [diets](./diets.md#halal (no friture)))_ | Does this restaurant offer a halal menu?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [organic (no friture)](#organic (no friture)) <br/> _(Original in [diets](./diets.md#organic (no friture)))_ | Does this restaurant offer organic food?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [vegan_food](#vegan_food) <br/> _(Original in [diets](./diets.md#vegan_food))_ | Does this business serve vegan meals?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [vegetarian](#vegetarian) <br/> _(Original in [diets](./diets.md#vegetarian))_ | Does this restaurant have a vegetarian option?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [halal](#halal) <br/> _(Original in [diets](./diets.md#halal))_ | Does this restaurant offer a halal menu?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [organic](#organic) <br/> _(Original in [diets](./diets.md#organic))_ | Does this restaurant offer organic food?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-vegetarian](#friture-vegetarian) <br/> _(Original in [diets](./diets.md#friture-vegetarian))_ | Does this fries shop have vegetarian snacks?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-vegan](#friture-vegan) <br/> _(Original in [diets](./diets.md#friture-vegan))_ | Does this fries shop have vegan snacks?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-organic](#friture-organic) <br/> _(Original in [diets](./diets.md#friture-organic))_ | Does this fries shop offer organic snacks?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
@ -545,18 +541,7 @@ The question is `Does this place offer a vegan option?`

 This tagrendering has labels `diets` `diets-content` `hidden`

-### Vegetarian (no friture)
-The question is `Does this restaurant have a vegetarian option?`
-
- -  *No vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>
- -  *Some vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited' target='_blank'>limited</a>
- - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *Vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes' target='_blank'>yes</a>
- - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *All dishes are vegetarian* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly' target='_blank'>only</a>
- -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand' target='_blank'>on_demand</a>
-
-This tagrendering has labels `diets` `diets-content` `hidden`
-
-### Vegan (no friture)
+### vegan_food
 The question is `Does this business serve vegan meals?`

 -  *No vegan options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno' target='_blank'>no</a>
@ -565,25 +550,40 @@ The question is `Does this business serve vegan meals?`
 -  *All dishes are vegan* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly' target='_blank'>only</a>
 -  *Some dishes might be adapted to a vegan version if asked for* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand' target='_blank'>on_demand</a>

+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`

-### halal (no friture)
+### vegetarian
+The question is `Does this restaurant have a vegetarian option?`
+
+ -  *No vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>
+ -  *Some vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited' target='_blank'>limited</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *Vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes' target='_blank'>yes</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *All dishes are vegetarian* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly' target='_blank'>only</a>
+ -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand' target='_blank'>on_demand</a>
+
+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
+This tagrendering has labels `diets` `diets-content` `hidden`
+
+### halal
 The question is `Does this restaurant offer a halal menu?`

 -  *There are no halal options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno' target='_blank'>no</a>
 -  *There is a small halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited' target='_blank'>limited</a>
- -  *There is a halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes' target='_blank'>yes</a>
- -  *Only halal options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly' target='_blank'>only</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/diets/halal.svg'> *There is a halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes' target='_blank'>yes</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/diets/halal.svg'> *Only halal options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly' target='_blank'>only</a>

+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`

-### organic (no friture)
+### organic
 The question is `Does this restaurant offer organic food?`

 -  *There are no organic options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>
 -  *There is an organic menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>
 -  *Only organic options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>

+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`

 ### friture-vegetarian
--- a/Docs/Layers/food_glutenfree.md
+++ b/Docs/Layers/food_glutenfree.md
@ -15,15 +15,12 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
-  - [Drive-through opening hours](#drive-through-opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [gluten_free](#gluten_free)
  - [Name](#name)
  - [Fastfood vs restaurant](#fastfood-vs-restaurant)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [website](#website)
  - [email](#email)
  - [phone](#phone)
@ -40,7 +37,6 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [delivery](#delivery)
  - [drive-through](#drive-through)
  - [drive-through-opening_hours](#drive-through-opening_hours)
-  - [Drive-through opening hours](#drive-through-opening-hours)
  - [child_highchair](#child_highchair)
  - [kids_area](#kids_area)
  - [diets_title](#diets_title)
@ -48,10 +44,10 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [sugar_free](#sugar_free)
  - [lactose_free](#lactose_free)
  - [vegan](#vegan)
-  - [Vegetarian (no friture)](#vegetarian-(no-friture))
-  - [Vegan (no friture)](#vegan-(no-friture))
-  - [halal (no friture)](#halal-(no-friture))
-  - [organic (no friture)](#organic-(no-friture))
+  - [vegan_food](#vegan_food)
+  - [vegetarian](#vegetarian)
+  - [halal](#halal)
+  - [organic](#organic)
  - [friture-vegetarian](#friture-vegetarian)
  - [friture-vegan](#friture-vegan)
  - [friture-organic](#friture-organic)
@ -155,8 +151,8 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:sugar_free#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Asugar_free/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:lactose_free#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Alactose_free/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegan#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegan/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) |
-| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegetarian#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegetarian/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegan#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegan/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegetarian#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegetarian/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:halal#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Ahalal/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:halal](https://wiki.openstreetmap.org/wiki/Key:diet:halal) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/organic#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/organic/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegetarian#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegetarian/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) |
@ -235,10 +231,10 @@ Elements must match **all** of the following expressions:
 | [sugar_free](#sugar_free) <br/> _(Original in [diets](./diets.md#sugar_free))_ | Does this shop have a sugar free offering?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [lactose_free](#lactose_free) <br/> _(Original in [diets](./diets.md#lactose_free))_ | Does  have a lactose-free offering?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [vegan](#vegan) <br/> _(Original in [diets](./diets.md#vegan))_ | Does this place offer a vegan option?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [Vegetarian (no friture)](#Vegetarian (no friture)) <br/> _(Original in [diets](./diets.md#Vegetarian (no friture)))_ | Does this restaurant have a vegetarian option?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [Vegan (no friture)](#Vegan (no friture)) <br/> _(Original in [diets](./diets.md#Vegan (no friture)))_ | Does this business serve vegan meals?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [halal (no friture)](#halal (no friture)) <br/> _(Original in [diets](./diets.md#halal (no friture)))_ | Does this restaurant offer a halal menu?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [organic (no friture)](#organic (no friture)) <br/> _(Original in [diets](./diets.md#organic (no friture)))_ | Does this restaurant offer organic food?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [vegan_food](#vegan_food) <br/> _(Original in [diets](./diets.md#vegan_food))_ | Does this business serve vegan meals?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [vegetarian](#vegetarian) <br/> _(Original in [diets](./diets.md#vegetarian))_ | Does this restaurant have a vegetarian option?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [halal](#halal) <br/> _(Original in [diets](./diets.md#halal))_ | Does this restaurant offer a halal menu?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [organic](#organic) <br/> _(Original in [diets](./diets.md#organic))_ | Does this restaurant offer organic food?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-vegetarian](#friture-vegetarian) <br/> _(Original in [diets](./diets.md#friture-vegetarian))_ | Does this fries shop have vegetarian snacks?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-vegan](#friture-vegan) <br/> _(Original in [diets](./diets.md#friture-vegan))_ | Does this fries shop have vegan snacks?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-organic](#friture-organic) <br/> _(Original in [diets](./diets.md#friture-organic))_ | Does this fries shop offer organic snacks?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
@ -546,18 +542,7 @@ The question is `Does this place offer a vegan option?`

 This tagrendering has labels `diets` `diets-content` `hidden`

-### Vegetarian (no friture)
-The question is `Does this restaurant have a vegetarian option?`
-
- -  *No vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>
- -  *Some vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited' target='_blank'>limited</a>
- - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *Vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes' target='_blank'>yes</a>
- - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *All dishes are vegetarian* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly' target='_blank'>only</a>
- -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand' target='_blank'>on_demand</a>
-
-This tagrendering has labels `diets` `diets-content` `hidden`
-
-### Vegan (no friture)
+### vegan_food
 The question is `Does this business serve vegan meals?`

 -  *No vegan options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno' target='_blank'>no</a>
@ -566,25 +551,40 @@ The question is `Does this business serve vegan meals?`
 -  *All dishes are vegan* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly' target='_blank'>only</a>
 -  *Some dishes might be adapted to a vegan version if asked for* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand' target='_blank'>on_demand</a>

+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`

-### halal (no friture)
+### vegetarian
+The question is `Does this restaurant have a vegetarian option?`
+
+ -  *No vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>
+ -  *Some vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited' target='_blank'>limited</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *Vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes' target='_blank'>yes</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *All dishes are vegetarian* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly' target='_blank'>only</a>
+ -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand' target='_blank'>on_demand</a>
+
+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
+This tagrendering has labels `diets` `diets-content` `hidden`
+
+### halal
 The question is `Does this restaurant offer a halal menu?`

 -  *There are no halal options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno' target='_blank'>no</a>
 -  *There is a small halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited' target='_blank'>limited</a>
- -  *There is a halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes' target='_blank'>yes</a>
- -  *Only halal options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly' target='_blank'>only</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/diets/halal.svg'> *There is a halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes' target='_blank'>yes</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/diets/halal.svg'> *Only halal options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly' target='_blank'>only</a>

+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`

-### organic (no friture)
+### organic
 The question is `Does this restaurant offer organic food?`

 -  *There are no organic options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>
 -  *There is an organic menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>
 -  *Only organic options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>

+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`

 ### friture-vegetarian
--- a/Docs/Layers/food_lactosefree.md
+++ b/Docs/Layers/food_lactosefree.md
@ -15,15 +15,12 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
-  - [Drive-through opening hours](#drive-through-opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [lactosefree](#lactosefree)
  - [Name](#name)
  - [Fastfood vs restaurant](#fastfood-vs-restaurant)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [website](#website)
  - [email](#email)
  - [phone](#phone)
@ -40,7 +37,6 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [delivery](#delivery)
  - [drive-through](#drive-through)
  - [drive-through-opening_hours](#drive-through-opening_hours)
-  - [Drive-through opening hours](#drive-through-opening-hours)
  - [child_highchair](#child_highchair)
  - [kids_area](#kids_area)
  - [diets_title](#diets_title)
@ -48,10 +44,10 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [sugar_free](#sugar_free)
  - [gluten_free](#gluten_free)
  - [vegan](#vegan)
-  - [Vegetarian (no friture)](#vegetarian-(no-friture))
-  - [Vegan (no friture)](#vegan-(no-friture))
-  - [halal (no friture)](#halal-(no-friture))
-  - [organic (no friture)](#organic-(no-friture))
+  - [vegan_food](#vegan_food)
+  - [vegetarian](#vegetarian)
+  - [halal](#halal)
+  - [organic](#organic)
  - [friture-vegetarian](#friture-vegetarian)
  - [friture-vegan](#friture-vegan)
  - [friture-organic](#friture-organic)
@ -154,8 +150,8 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:sugar_free#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Asugar_free/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:gluten_free#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Agluten_free/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegan#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegan/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) |
-| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegetarian#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegetarian/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegan#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegan/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegetarian#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegetarian/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:halal#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Ahalal/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:halal](https://wiki.openstreetmap.org/wiki/Key:diet:halal) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/organic#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/organic/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegetarian#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegetarian/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) |
@ -234,10 +230,10 @@ Elements must match **all** of the following expressions:
 | [sugar_free](#sugar_free) <br/> _(Original in [diets](./diets.md#sugar_free))_ | Does this shop have a sugar free offering?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [gluten_free](#gluten_free) <br/> _(Original in [diets](./diets.md#gluten_free))_ | Does this shop have a gluten free offering?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [vegan](#vegan) <br/> _(Original in [diets](./diets.md#vegan))_ | Does this place offer a vegan option?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [Vegetarian (no friture)](#Vegetarian (no friture)) <br/> _(Original in [diets](./diets.md#Vegetarian (no friture)))_ | Does this restaurant have a vegetarian option?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [Vegan (no friture)](#Vegan (no friture)) <br/> _(Original in [diets](./diets.md#Vegan (no friture)))_ | Does this business serve vegan meals?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [halal (no friture)](#halal (no friture)) <br/> _(Original in [diets](./diets.md#halal (no friture)))_ | Does this restaurant offer a halal menu?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [organic (no friture)](#organic (no friture)) <br/> _(Original in [diets](./diets.md#organic (no friture)))_ | Does this restaurant offer organic food?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [vegan_food](#vegan_food) <br/> _(Original in [diets](./diets.md#vegan_food))_ | Does this business serve vegan meals?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [vegetarian](#vegetarian) <br/> _(Original in [diets](./diets.md#vegetarian))_ | Does this restaurant have a vegetarian option?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [halal](#halal) <br/> _(Original in [diets](./diets.md#halal))_ | Does this restaurant offer a halal menu?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [organic](#organic) <br/> _(Original in [diets](./diets.md#organic))_ | Does this restaurant offer organic food?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-vegetarian](#friture-vegetarian) <br/> _(Original in [diets](./diets.md#friture-vegetarian))_ | Does this fries shop have vegetarian snacks?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-vegan](#friture-vegan) <br/> _(Original in [diets](./diets.md#friture-vegan))_ | Does this fries shop have vegan snacks?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-organic](#friture-organic) <br/> _(Original in [diets](./diets.md#friture-organic))_ | Does this fries shop offer organic snacks?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
@ -540,18 +536,7 @@ The question is `Does this place offer a vegan option?`

 This tagrendering has labels `diets` `diets-content` `hidden`

-### Vegetarian (no friture)
-The question is `Does this restaurant have a vegetarian option?`
-
- -  *No vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>
- -  *Some vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited' target='_blank'>limited</a>
- - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *Vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes' target='_blank'>yes</a>
- - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *All dishes are vegetarian* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly' target='_blank'>only</a>
- -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand' target='_blank'>on_demand</a>
-
-This tagrendering has labels `diets` `diets-content` `hidden`
-
-### Vegan (no friture)
+### vegan_food
 The question is `Does this business serve vegan meals?`

 -  *No vegan options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno' target='_blank'>no</a>
@ -560,25 +545,40 @@ The question is `Does this business serve vegan meals?`
 -  *All dishes are vegan* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly' target='_blank'>only</a>
 -  *Some dishes might be adapted to a vegan version if asked for* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand' target='_blank'>on_demand</a>

+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`

-### halal (no friture)
+### vegetarian
+The question is `Does this restaurant have a vegetarian option?`
+
+ -  *No vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>
+ -  *Some vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited' target='_blank'>limited</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *Vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes' target='_blank'>yes</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *All dishes are vegetarian* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly' target='_blank'>only</a>
+ -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand' target='_blank'>on_demand</a>
+
+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
+This tagrendering has labels `diets` `diets-content` `hidden`
+
+### halal
 The question is `Does this restaurant offer a halal menu?`

 -  *There are no halal options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno' target='_blank'>no</a>
 -  *There is a small halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited' target='_blank'>limited</a>
- -  *There is a halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes' target='_blank'>yes</a>
- -  *Only halal options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly' target='_blank'>only</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/diets/halal.svg'> *There is a halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes' target='_blank'>yes</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/diets/halal.svg'> *Only halal options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly' target='_blank'>only</a>

+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`

-### organic (no friture)
+### organic
 The question is `Does this restaurant offer organic food?`

 -  *There are no organic options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>
 -  *There is an organic menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>
 -  *Only organic options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>

+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`

 ### friture-vegetarian
--- a/Docs/Layers/friture.md
+++ b/Docs/Layers/friture.md
@ -15,14 +15,11 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
-  - [Drive-through opening hours](#drive-through-opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [Name](#name)
  - [Fastfood vs restaurant](#fastfood-vs-restaurant)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [website](#website)
  - [email](#email)
  - [phone](#phone)
@ -39,7 +36,6 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [delivery](#delivery)
  - [drive-through](#drive-through)
  - [drive-through-opening_hours](#drive-through-opening_hours)
-  - [Drive-through opening hours](#drive-through-opening-hours)
  - [child_highchair](#child_highchair)
  - [kids_area](#kids_area)
  - [diets_title](#diets_title)
@ -48,10 +44,10 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [lactose_free](#lactose_free)
  - [gluten_free](#gluten_free)
  - [vegan](#vegan)
-  - [Vegetarian (no friture)](#vegetarian-(no-friture))
-  - [Vegan (no friture)](#vegan-(no-friture))
-  - [halal (no friture)](#halal-(no-friture))
-  - [organic (no friture)](#organic-(no-friture))
+  - [vegan_food](#vegan_food)
+  - [vegetarian](#vegetarian)
+  - [halal](#halal)
+  - [organic](#organic)
  - [friture-vegetarian](#friture-vegetarian)
  - [friture-vegan](#friture-vegan)
  - [friture-organic](#friture-organic)
@ -154,8 +150,8 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:lactose_free#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Alactose_free/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:gluten_free#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Agluten_free/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegan#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegan/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) |
-| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegetarian#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegetarian/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegan#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegan/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegetarian#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegetarian/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:halal#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Ahalal/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:halal](https://wiki.openstreetmap.org/wiki/Key:diet:halal) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/organic#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/organic/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegetarian#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegetarian/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) |
@ -234,10 +230,10 @@ Elements must match **all** of the following expressions:
 | [lactose_free](#lactose_free) <br/> _(Original in [diets](./diets.md#lactose_free))_ | Does  have a lactose-free offering?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [gluten_free](#gluten_free) <br/> _(Original in [diets](./diets.md#gluten_free))_ | Does this shop have a gluten free offering?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [vegan](#vegan) <br/> _(Original in [diets](./diets.md#vegan))_ | Does this place offer a vegan option?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [Vegetarian (no friture)](#Vegetarian (no friture)) <br/> _(Original in [diets](./diets.md#Vegetarian (no friture)))_ | Does this restaurant have a vegetarian option?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [Vegan (no friture)](#Vegan (no friture)) <br/> _(Original in [diets](./diets.md#Vegan (no friture)))_ | Does this business serve vegan meals?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [halal (no friture)](#halal (no friture)) <br/> _(Original in [diets](./diets.md#halal (no friture)))_ | Does this restaurant offer a halal menu?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [organic (no friture)](#organic (no friture)) <br/> _(Original in [diets](./diets.md#organic (no friture)))_ | Does this restaurant offer organic food?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [vegan_food](#vegan_food) <br/> _(Original in [diets](./diets.md#vegan_food))_ | Does this business serve vegan meals?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [vegetarian](#vegetarian) <br/> _(Original in [diets](./diets.md#vegetarian))_ | Does this restaurant have a vegetarian option?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [halal](#halal) <br/> _(Original in [diets](./diets.md#halal))_ | Does this restaurant offer a halal menu?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [organic](#organic) <br/> _(Original in [diets](./diets.md#organic))_ | Does this restaurant offer organic food?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-vegetarian](#friture-vegetarian) <br/> _(Original in [diets](./diets.md#friture-vegetarian))_ | Does this fries shop have vegetarian snacks?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-vegan](#friture-vegan) <br/> _(Original in [diets](./diets.md#friture-vegan))_ | Does this fries shop have vegan snacks?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-organic](#friture-organic) <br/> _(Original in [diets](./diets.md#friture-organic))_ | Does this fries shop offer organic snacks?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
@ -545,18 +541,7 @@ The question is `Does this place offer a vegan option?`

 This tagrendering has labels `diets` `diets-content` `hidden`

-### Vegetarian (no friture)
-The question is `Does this restaurant have a vegetarian option?`
-
- -  *No vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>
- -  *Some vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited' target='_blank'>limited</a>
- - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *Vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes' target='_blank'>yes</a>
- - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *All dishes are vegetarian* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly' target='_blank'>only</a>
- -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand' target='_blank'>on_demand</a>
-
-This tagrendering has labels `diets` `diets-content` `hidden`
-
-### Vegan (no friture)
+### vegan_food
 The question is `Does this business serve vegan meals?`

 -  *No vegan options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno' target='_blank'>no</a>
@ -565,25 +550,40 @@ The question is `Does this business serve vegan meals?`
 -  *All dishes are vegan* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly' target='_blank'>only</a>
 -  *Some dishes might be adapted to a vegan version if asked for* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand' target='_blank'>on_demand</a>

+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`

-### halal (no friture)
+### vegetarian
+The question is `Does this restaurant have a vegetarian option?`
+
+ -  *No vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>
+ -  *Some vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited' target='_blank'>limited</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *Vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes' target='_blank'>yes</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *All dishes are vegetarian* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly' target='_blank'>only</a>
+ -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand' target='_blank'>on_demand</a>
+
+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
+This tagrendering has labels `diets` `diets-content` `hidden`
+
+### halal
 The question is `Does this restaurant offer a halal menu?`

 -  *There are no halal options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno' target='_blank'>no</a>
 -  *There is a small halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited' target='_blank'>limited</a>
- -  *There is a halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes' target='_blank'>yes</a>
- -  *Only halal options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly' target='_blank'>only</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/diets/halal.svg'> *There is a halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes' target='_blank'>yes</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/diets/halal.svg'> *Only halal options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly' target='_blank'>only</a>

+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`

-### organic (no friture)
+### organic
 The question is `Does this restaurant offer organic food?`

 -  *There are no organic options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>
 -  *There is an organic menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>
 -  *Only organic options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>

+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`

 ### friture-vegetarian
--- a/Docs/Layers/ghost_bike.md
+++ b/Docs/Layers/ghost_bike.md
@ -13,7 +13,6 @@ A layer showing memorials for cyclists, killed in road accidents
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia page about the deceased person](#wikipedia-page-about-the-deceased-person)
  - [preset_description](#preset_description)
  - [images_no_blur](#images_no_blur)
  - [ghost_bike-name](#ghost_bike-name)
@ -21,7 +20,6 @@ A layer showing memorials for cyclists, killed in road accidents
  - [ghost_bike-inscription](#ghost_bike-inscription)
  - [ghost_bike-start_date](#ghost_bike-start_date)
  - [wikidata](#wikidata)
-  - [Wikipedia page about the deceased person](#wikipedia-page-about-the-deceased-person)
  - [leftover-questions](#leftover-questions)
  - [move-button](#move-button)
  - [delete-button](#delete-button)
--- a/Docs/Layers/hackerspace.md
+++ b/Docs/Layers/hackerspace.md
@ -13,7 +13,6 @@ Hackerspace
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [is_makerspace](#is_makerspace)
@ -25,7 +24,6 @@ Hackerspace
  - [phone](#phone)
  - [mastodon](#mastodon)
  - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
  - [hackerspaces-service-3dprinter](#hackerspaces-service-3dprinter)
  - [hackerspaces-service-lasercutter](#hackerspaces-service-lasercutter)
  - [hackerspaces-service-cnc_drilling_machine](#hackerspaces-service-cnc_drilling_machine)
--- a/Docs/Layers/health_and_social_places_without_etymology.md
+++ b/Docs/Layers/health_and_social_places_without_etymology.md
@ -14,10 +14,8 @@ All objects which have an etymology known
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
  - [etymology-images-from-wikipedia](#etymology-images-from-wikipedia)
  - [wikipedia-etymology](#wikipedia-etymology)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
  - [zoeken op inventaris onroerend erfgoed](#zoeken-op-inventaris-onroerend-erfgoed)
  - [simple etymology](#simple-etymology)
  - [questions](#questions)
--- a/Docs/Layers/historic_aircraft.md
+++ b/Docs/Layers/historic_aircraft.md
@ -11,17 +11,13 @@
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia page about the memorial](#wikipedia-page-about-the-memorial)
-  - [Wikipedia page about the remembered event or person](#wikipedia-page-about-the-remembered-event-or-person)
  - [images](#images)
  - [model](#model)
  - [is_memorial](#is_memorial)
  - [memorial-type](#memorial-type)
  - [inscription](#inscription)
  - [memorial-wikidata](#memorial-wikidata)
-  - [Wikipedia page about the memorial](#wikipedia-page-about-the-memorial)
  - [subject-wikidata](#subject-wikidata)
-  - [Wikipedia page about the remembered event or person](#wikipedia-page-about-the-remembered-event-or-person)
  - [leftover-questions](#leftover-questions)
  - [move-button](#move-button)
  - [delete-button](#delete-button)
--- a/Docs/Layers/historic_rolling_stock.md
+++ b/Docs/Layers/historic_rolling_stock.md
@ -13,8 +13,6 @@ Historic rolling stock (such as locomotives, railway cars and wagons) which are
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia page about the memorial](#wikipedia-page-about-the-memorial)
-  - [Wikipedia page about the remembered event or person](#wikipedia-page-about-the-remembered-event-or-person)
  - [images](#images)
  - [preset_type](#preset_type)
  - [wikipedia](#wikipedia)
@ -23,9 +21,7 @@ Historic rolling stock (such as locomotives, railway cars and wagons) which are
  - [memorial-type](#memorial-type)
  - [inscription](#inscription)
  - [memorial-wikidata](#memorial-wikidata)
-  - [Wikipedia page about the memorial](#wikipedia-page-about-the-memorial)
  - [subject-wikidata](#subject-wikidata)
-  - [Wikipedia page about the remembered event or person](#wikipedia-page-about-the-remembered-event-or-person)
  - [leftover-questions](#leftover-questions)
  - [move-button](#move-button)
  - [delete-button](#delete-button)
--- a/Docs/Layers/hospital.md
+++ b/Docs/Layers/hospital.md
@ -12,7 +12,6 @@ A layer showing hospital grounds
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours for visitors](#opening-hours-for-visitors)
  - [name](#name)
  - [inpatient](#inpatient)
  - [phone](#phone)
@ -25,7 +24,6 @@ A layer showing hospital grounds
  - [unit](#unit)
  - [address-questions](#address-questions)
  - [oh-visitor](#oh-visitor)
-  - [Opening hours for visitors](#opening-hours-for-visitors)
  - [leftover-questions](#leftover-questions)
  - [move-button](#move-button)
  - [lod](#lod)
--- a/Docs/Layers/ice_cream.md
+++ b/Docs/Layers/ice_cream.md
@ -14,12 +14,10 @@ A place where ice cream is sold over the counter
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [1](#1)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [phone](#phone)
  - [email](#email)
  - [website](#website)
--- a/Docs/Layers/icecream_glutenfree.md
+++ b/Docs/Layers/icecream_glutenfree.md
@ -15,13 +15,11 @@ A place where ice cream is sold over the counter
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [gluten_free](#gluten_free)
  - [1](#1)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [phone](#phone)
  - [email](#email)
  - [website](#website)
--- a/Docs/Layers/icecream_lactosefree.md
+++ b/Docs/Layers/icecream_lactosefree.md
@ -15,13 +15,11 @@ A place where ice cream is sold over the counter
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [lactosefree](#lactosefree)
  - [1](#1)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [phone](#phone)
  - [email](#email)
  - [website](#website)
--- a/Docs/Layers/indoors.md
+++ b/Docs/Layers/indoors.md
@ -13,8 +13,6 @@ Basic indoor mapping: shows room outlines
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [repeated](#repeated)
  - [single_level](#single_level)
@ -23,13 +21,11 @@ Basic indoor mapping: shows room outlines
  - [room-type](#room-type)
  - [room-capacity](#room-capacity)
  - [wikipedia-etymology](#wikipedia-etymology)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
  - [toilet-access](#toilet-access)
  - [toilets-fee](#toilets-fee)
  - [toilet-charge](#toilet-charge)
  - [payment-options-split](#payment-options-split)
  - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
  - [toilets-type](#toilets-type)
  - [toilets-disposal](#toilets-disposal)
  - [gender_segregated](#gender_segregated)
--- a/Docs/Layers/medical_shops.md
+++ b/Docs/Layers/medical_shops.md
@ -16,7 +16,6 @@ A shop
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [shops-name](#shops-name)
@ -24,7 +23,6 @@ A shop
  - [brand](#brand)
  - [second_hand](#second_hand)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [website](#website)
  - [email](#email)
  - [phone](#phone)
--- a/Docs/Layers/memorial.md
+++ b/Docs/Layers/memorial.md
@ -14,15 +14,11 @@ Layer showing memorial plaques, based upon a unofficial theme. Can be expanded t
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia page about the memorial](#wikipedia-page-about-the-memorial)
-  - [Wikipedia page about the remembered event or person](#wikipedia-page-about-the-remembered-event-or-person)
  - [images_no_blur](#images_no_blur)
  - [memorial-type](#memorial-type)
  - [inscription](#inscription)
  - [memorial-wikidata](#memorial-wikidata)
-  - [Wikipedia page about the memorial](#wikipedia-page-about-the-memorial)
  - [subject-wikidata](#subject-wikidata)
-  - [Wikipedia page about the remembered event or person](#wikipedia-page-about-the-remembered-event-or-person)
  - [start_date](#start_date)
  - [bench-backrest](#bench-backrest)
  - [bench-armrest](#bench-armrest)
--- a/Docs/Layers/note.md
+++ b/Docs/Layers/note.md
@ -17,12 +17,10 @@ This layer is loaded from an external source, namely
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Nearby images](#nearby-images)
  - [conversation](#conversation)
  - [add_image](#add_image)
  - [comment](#comment)
  - [nearby-images](#nearby-images)
-  - [Nearby images](#nearby-images)
  - [report-contributor](#report-contributor)
  - [report-note](#report-note)
  - [leftover-questions](#leftover-questions)
--- a/Docs/Layers/outdoor_seating.md
+++ b/Docs/Layers/outdoor_seating.md
@ -12,12 +12,10 @@ Outdoor seating areas, usually located near cafes and restaurants.
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [access](#access)
  - [seasonal](#seasonal)
  - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
  - [website](#website)
  - [internet](#internet)
  - [internet-fee](#internet-fee)
--- a/Docs/Layers/parcel_lockers.md
+++ b/Docs/Layers/parcel_lockers.md
@ -13,12 +13,10 @@ Layer showing parcel lockers for collecting and sending parcels.
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [brand](#brand)
  - [operator](#operator)
  - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
  - [ref](#ref)
  - [mail-in](#mail-in)
  - [pickup](#pickup)
--- a/Docs/Layers/parks_and_forests_without_etymology.md
+++ b/Docs/Layers/parks_and_forests_without_etymology.md
@ -14,10 +14,8 @@ All objects which have an etymology known
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
  - [etymology-images-from-wikipedia](#etymology-images-from-wikipedia)
  - [wikipedia-etymology](#wikipedia-etymology)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
  - [zoeken op inventaris onroerend erfgoed](#zoeken-op-inventaris-onroerend-erfgoed)
  - [simple etymology](#simple-etymology)
  - [questions](#questions)
--- a/Docs/Layers/parks_without_etymology.md
+++ b/Docs/Layers/parks_without_etymology.md
@ -14,10 +14,8 @@ All objects which have an etymology known
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
  - [etymology-images-from-wikipedia](#etymology-images-from-wikipedia)
  - [wikipedia-etymology](#wikipedia-etymology)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
  - [zoeken op inventaris onroerend erfgoed](#zoeken-op-inventaris-onroerend-erfgoed)
  - [simple etymology](#simple-etymology)
  - [questions](#questions)
--- a/Docs/Layers/pet_shops.md
+++ b/Docs/Layers/pet_shops.md
@ -16,7 +16,6 @@ A shop
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [shops-name](#shops-name)
@ -24,7 +23,6 @@ A shop
  - [brand](#brand)
  - [second_hand](#second_hand)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [website](#website)
  - [email](#email)
  - [phone](#phone)
--- a/Docs/Layers/pharmacy.md
+++ b/Docs/Layers/pharmacy.md
@ -14,12 +14,10 @@ A layer showing pharmacies, which (probably) dispense prescription drugs
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [name](#name)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [phone](#phone)
  - [email](#email)
  - [website](#website)
--- a/Docs/Layers/physiotherapist.md
+++ b/Docs/Layers/physiotherapist.md
@ -13,11 +13,9 @@ This layer shows physiotherapists
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [name](#name)
  - [opening_hours_by_appointment](#opening_hours_by_appointment)
-  - [Opening hours](#opening-hours)
  - [phone](#phone)
  - [email](#email)
  - [website](#website)
--- a/Docs/Layers/police.md
+++ b/Docs/Layers/police.md
@ -13,7 +13,6 @@ Many types of police facilities
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [police_name](#police_name)
@ -22,7 +21,6 @@ Many types of police facilities
  - [email](#email)
  - [website](#website)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [4_z2nrdhy6tyyh4fd](#4_z2nrdhy6tyyh4fd)
  - [leftover-questions](#leftover-questions)
  - [move-button](#move-button)
--- a/Docs/Layers/post_offices_with_atm.md
+++ b/Docs/Layers/post_offices_with_atm.md
@ -14,13 +14,11 @@ A layer showing post offices.
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [phone](#phone)
  - [email](#email)
  - [website](#website)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [post_partner](#post_partner)
  - [post_offic_brand](#post_offic_brand)
  - [partner-brand](#partner-brand)
--- a/Docs/Layers/postoffices.md
+++ b/Docs/Layers/postoffices.md
@ -13,13 +13,11 @@ A layer showing post offices.
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [phone](#phone)
  - [email](#email)
  - [website](#website)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [post_partner](#post_partner)
  - [post_offic_brand](#post_offic_brand)
  - [partner-brand](#partner-brand)
--- a/Docs/Layers/recycling.md
+++ b/Docs/Layers/recycling.md
@ -13,7 +13,6 @@ A layer with recycling containers and centres
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [recycling-type](#recycling-type)
  - [recycling-centre-name](#recycling-centre-name)
@ -24,7 +23,6 @@ A layer with recycling containers and centres
  - [email](#email)
  - [phone](#phone)
  - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
  - [access](#access)
  - [colour](#colour)
  - [survey_date](#survey_date)
--- a/Docs/Layers/shop_dog_friendly.md
+++ b/Docs/Layers/shop_dog_friendly.md
@ -15,7 +15,6 @@ A shop
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [shops-name](#shops-name)
@ -23,7 +22,6 @@ A shop
  - [brand](#brand)
  - [second_hand](#second_hand)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [website](#website)
  - [email](#email)
  - [phone](#phone)
--- a/Docs/Layers/shops.md
+++ b/Docs/Layers/shops.md
@ -14,7 +14,6 @@ A shop
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [shops-name](#shops-name)
@ -22,7 +21,6 @@ A shop
  - [brand](#brand)
  - [second_hand](#second_hand)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [website](#website)
  - [email](#email)
  - [phone](#phone)
--- a/Docs/Layers/shops_glutenfree.md
+++ b/Docs/Layers/shops_glutenfree.md
@ -15,7 +15,6 @@ A shop
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [gluten_free](#gluten_free)
@ -24,7 +23,6 @@ A shop
  - [brand](#brand)
  - [second_hand](#second_hand)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [website](#website)
  - [email](#email)
  - [phone](#phone)
--- a/Docs/Layers/shops_lactosefree.md
+++ b/Docs/Layers/shops_lactosefree.md
@ -15,7 +15,6 @@ A shop
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [lactosefree](#lactosefree)
@ -24,7 +23,6 @@ A shop
  - [brand](#brand)
  - [second_hand](#second_hand)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [website](#website)
  - [email](#email)
  - [phone](#phone)
--- a/Docs/Layers/shops_second_hand.md
+++ b/Docs/Layers/shops_second_hand.md
@ -15,7 +15,6 @@ A shop
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [shops-name](#shops-name)
@ -23,7 +22,6 @@ A shop
  - [brand](#brand)
  - [second_hand](#second_hand)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [website](#website)
  - [email](#email)
  - [phone](#phone)
--- a/Docs/Layers/shops_with_climbing_shoe_repair.md
+++ b/Docs/Layers/shops_with_climbing_shoe_repair.md
@ -15,7 +15,6 @@ A shop
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [repairs_climbing_shoes](#repairs_climbing_shoes)
  - [images](#images)
  - [reviews](#reviews)
@ -24,7 +23,6 @@ A shop
  - [brand](#brand)
  - [second_hand](#second_hand)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [website](#website)
  - [email](#email)
  - [phone](#phone)
--- a/Docs/Layers/shower.md
+++ b/Docs/Layers/shower.md
@ -13,7 +13,6 @@ A layer showing (public) showers
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [repeated](#repeated)
  - [single_level](#single_level)
@ -21,7 +20,6 @@ A layer showing (public) showers
  - [fee](#fee)
  - [charge](#charge)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [hot_water](#hot_water)
  - [payment-options-split](#payment-options-split)
  - [has_grab_rail_lr](#has_grab_rail_lr)
--- a/Docs/Layers/souvenir_coin.md
+++ b/Docs/Layers/souvenir_coin.md
@ -13,10 +13,8 @@ Layer showing machines selling souvenir coins
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
  - [designs](#designs)
  - [payment-options-split](#payment-options-split)
  - [website](#website)
--- a/Docs/Layers/souvenir_note.md
+++ b/Docs/Layers/souvenir_note.md
@ -13,10 +13,8 @@ Layer showing machines selling souvenir banknotes
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
  - [designs](#designs)
  - [payment-options-split](#payment-options-split)
  - [website](#website)
--- a/Docs/Layers/sport_places_without_etymology.md
+++ b/Docs/Layers/sport_places_without_etymology.md
@ -14,10 +14,8 @@ All objects which have an etymology known
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
  - [etymology-images-from-wikipedia](#etymology-images-from-wikipedia)
  - [wikipedia-etymology](#wikipedia-etymology)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
  - [zoeken op inventaris onroerend erfgoed](#zoeken-op-inventaris-onroerend-erfgoed)
  - [simple etymology](#simple-etymology)
  - [questions](#questions)
--- a/Docs/Layers/sport_shops.md
+++ b/Docs/Layers/sport_shops.md
@ -16,7 +16,6 @@ A shop
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [shops-name](#shops-name)
@ -24,7 +23,6 @@ A shop
  - [brand](#brand)
  - [second_hand](#second_hand)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [website](#website)
  - [email](#email)
  - [phone](#phone)
--- a/Docs/Layers/sports_centre.md
+++ b/Docs/Layers/sports_centre.md
@ -13,10 +13,8 @@ Indoor and outdoor sports centres can be found on this layer
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [phone](#phone)
  - [website](#website)
  - [email](#email)
--- a/Docs/Layers/streets_without_etymology.md
+++ b/Docs/Layers/streets_without_etymology.md
@ -14,10 +14,8 @@ All objects which have an etymology known
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
  - [etymology-images-from-wikipedia](#etymology-images-from-wikipedia)
  - [wikipedia-etymology](#wikipedia-etymology)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
  - [zoeken op inventaris onroerend erfgoed](#zoeken-op-inventaris-onroerend-erfgoed)
  - [simple etymology](#simple-etymology)
  - [questions](#questions)
--- a/Docs/Layers/stripclub.md
+++ b/Docs/Layers/stripclub.md
@ -13,12 +13,10 @@ A venue where erotic dance, striptease, or lap dances are performed commercially
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [reviews](#reviews)
  - [name](#name)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [phone](#phone)
  - [email](#email)
  - [website](#website)
--- a/Docs/Layers/toilet.md
+++ b/Docs/Layers/toilet.md
@ -34,7 +34,6 @@ A layer showing (public) toilets
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [toilet-reviews](#toilet-reviews)
  - [repeated](#repeated)
@ -44,7 +43,6 @@ A layer showing (public) toilets
  - [toilet-charge](#toilet-charge)
  - [payment-options-split](#payment-options-split)
  - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
  - [toilets-type](#toilets-type)
  - [toilets-disposal](#toilets-disposal)
  - [gender_segregated](#gender_segregated)
--- a/Docs/Layers/toilet_at_amenity.md
+++ b/Docs/Layers/toilet_at_amenity.md
@ -12,7 +12,6 @@ A layer showing (public) toilets located at different places.
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images_toilet](#images_toilet)
  - [toilets_repeated](#toilets_repeated)
  - [toilets_single_level](#toilets_single_level)
@ -25,7 +24,6 @@ A layer showing (public) toilets located at different places.
  - [toilets_description](#toilets_description)
  - [toilets_toilets-wheelchair](#toilets_toilets-wheelchair)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [toilets-type](#toilets-type)
  - [toilets-disposal](#toilets-disposal)
  - [menstrual_products](#menstrual_products)
--- a/Docs/Layers/tool_library.md
+++ b/Docs/Layers/tool_library.md
@ -13,14 +13,12 @@ A tool library is a place where people from the general public can borrow tools
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [phone](#phone)
  - [email](#email)
  - [website](#website)
  - [facebook](#facebook)
  - [opening_hours_by_appointment](#opening_hours_by_appointment)
-  - [Opening hours](#opening-hours)
  - [membership](#membership)
  - [membership_charge](#membership_charge)
  - [fee](#fee)
--- a/Docs/Layers/toursistic_places_without_etymology.md
+++ b/Docs/Layers/toursistic_places_without_etymology.md
@ -14,10 +14,8 @@ All objects which have an etymology known
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
  - [etymology-images-from-wikipedia](#etymology-images-from-wikipedia)
  - [wikipedia-etymology](#wikipedia-etymology)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
  - [zoeken op inventaris onroerend erfgoed](#zoeken-op-inventaris-onroerend-erfgoed)
  - [simple etymology](#simple-etymology)
  - [questions](#questions)
--- a/Docs/Layers/transit_stops.md
+++ b/Docs/Layers/transit_stops.md
@ -12,7 +12,6 @@ Layer showing different types of transit stops.
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [{_contained_routes_count} routes stop at this stop](#{_contained_routes_count}-routes-stop-at-this-stop)
  - [stop_name](#stop_name)
  - [images](#images)
  - [shelter](#shelter)
@ -23,7 +22,6 @@ Layer showing different types of transit stops.
  - [lit](#lit)
  - [departures_board](#departures_board)
  - [contained_routes](#contained_routes)
-  - [{_contained_routes_count} routes stop at this stop](#{_contained_routes_count}-routes-stop-at-this-stop)
  - [leftover-questions](#leftover-questions)
  - [lod](#lod)
 5. [Filters](#filters)
--- a/Docs/Layers/vending_machine.md
+++ b/Docs/Layers/vending_machine.md
@ -13,14 +13,12 @@ Layer showing vending machines
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [repeated](#repeated)
  - [single_level](#single_level)
  - [vending](#vending)
  - [bicycle_tube_vending_machine-brand](#bicycle_tube_vending_machine-brand)
  - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
  - [payment-options-split](#payment-options-split)
  - [denominations-coins](#denominations-coins)
  - [denominations-notes](#denominations-notes)
--- a/Docs/Layers/vending_machine_bicycle.md
+++ b/Docs/Layers/vending_machine_bicycle.md
@ -14,14 +14,12 @@ Layer showing vending machines
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [images](#images)
  - [repeated](#repeated)
  - [single_level](#single_level)
  - [vending](#vending)
  - [bicycle_tube_vending_machine-brand](#bicycle_tube_vending_machine-brand)
  - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
  - [payment-options-split](#payment-options-split)
  - [denominations-coins](#denominations-coins)
  - [denominations-notes](#denominations-notes)
--- a/Docs/Layers/veterinary.md
+++ b/Docs/Layers/veterinary.md
@ -13,12 +13,10 @@ A layer showing veterinarians
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
  - [website](#website)
  - [reviews](#reviews)
  - [phone](#phone)
  - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
  - [vetName](#vetname)
  - [leftover-questions](#leftover-questions)
  - [move-button](#move-button)