diff --git a/Docs/BuiltinLayers.md b/Docs/BuiltinLayers.md
index 7dca1f417..c8302927e 100644
--- a/Docs/BuiltinLayers.md
+++ b/Docs/BuiltinLayers.md
@@ -316,6 +316,8 @@ A facility where bicycles can be lent for longer period of times
 
 
 
+A layer showing drinking water fountains
+
 [Go to the source code](../assets/layers/drinking_water/drinking_water.json)
 
 
@@ -341,6 +343,8 @@ A facility where bicycles can be lent for longer period of times
 
 
 
+A layer showing restaurants and fast-food amenities (with a special rendering for friteries)
+
 [Go to the source code](../assets/layers/food/food.json)
 
 
@@ -572,6 +576,8 @@ Obstacles while cycling, such as bollards and cycle barriers
 
 
 
+A bench is a wooden, metal, stone, ... surface where a human can sit. This layers visualises them and asks a few questions about them.
+
 [Go to the source code](../assets/layers/bench/bench.json)
 
 
@@ -594,6 +600,8 @@ Obstacles while cycling, such as bollards and cycle barriers
 
 
 
+A layer showing all public-transport-stops which do have a bench
+
 [Go to the source code](../assets/layers/bench_at_pt/bench_at_pt.json)
 
 
@@ -616,6 +624,8 @@ Obstacles while cycling, such as bollards and cycle barriers
 
 
 
+A layer showing vending machines for bicycle tubes (either purpose-built bicycle tube vending machines or classical vending machines with bicycle tubes and optionally additional bicycle related objects such as lights, gloves, locks, ...)
+
 [Go to the source code](../assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json)
 
 
@@ -638,6 +648,8 @@ Obstacles while cycling, such as bollards and cycle barriers
 
 
 
+A bike café is a café geared towards cyclists, for example with services such as a pump, with lots of bicycle-related decoration, ...
+
 [Go to the source code](../assets/layers/bike_cafe/bike_cafe.json)
 
 
@@ -660,6 +672,8 @@ Obstacles while cycling, such as bollards and cycle barriers
 
 
 
+A layer showing facilities where one can clean their bike
+
 [Go to the source code](../assets/layers/bike_cleaning/bike_cleaning.json)
 
 
@@ -682,6 +696,8 @@ Obstacles while cycling, such as bollards and cycle barriers
 
 
 
+A layer showing where you can park your bike
+
 [Go to the source code](../assets/layers/bike_parking/bike_parking.json)
 
 
@@ -704,6 +720,8 @@ Obstacles while cycling, such as bollards and cycle barriers
 
 
 
+A layer showing bicycle pumps and bicycle repair tool stands
+
 [Go to the source code](../assets/layers/bike_repair_station/bike_repair_station.json)
 
 
@@ -750,6 +768,8 @@ A shop specifically selling bicycles or related items
 
 
 
+A layer with bike-themed objects but who don't match any other layer
+
 [Go to the source code](../assets/layers/bike_themed_object/bike_themed_object.json)
 
 
@@ -820,6 +840,8 @@ Een vogelkijkhut
 
 
 
+A layer showing cafés and pubs where one can gather around a drink. The layer asks for some relevant questions
+
 [Go to the source code](../assets/layers/cafe_pub/cafe_pub.json)
 
 
@@ -891,6 +913,8 @@ Crossings for pedestrians and cyclists
 
 
 
+All infrastructure that someone can cycle over, accompanied with questions about this infrastructure"
+
 [Go to the source code](../assets/layers/cycleways_and_roads/cycleways_and_roads.json)
 
 
@@ -916,6 +940,8 @@ Crossings for pedestrians and cyclists
 
 
 
+A layer showing defibrillators which can be used in case of emergency. This contains public defibrillators, but also defibrillators which might need staff to fetch the actual device
+
 [Go to the source code](../assets/layers/defibrillator/defibrillator.json)
 
 
@@ -1059,6 +1085,8 @@ Map layer to show fire stations.
 
 
 
+A layer showing memorials for cyclists, killed in road accidents
+
 [Go to the source code](../assets/layers/ghost_bike/ghost_bike.json)
 
 
@@ -1105,6 +1133,8 @@ Map layer to show fire hydrants.
 
 
 
+A layer showing touristical, road side information boards (e.g. giving information about the landscape, a building, a feature, a map, ...)
+
 [Go to the source code](../assets/layers/information_board/information_board.json)
 
 
@@ -1319,6 +1349,8 @@ A sport pitch
 
 
 
+A layer showing street lights
+
 [Go to the source code](../assets/layers/street_lamps/street_lamps.json)
 
 
@@ -1341,6 +1373,8 @@ A sport pitch
 
 
 
+This layer shows surveillance cameras and allows a contributor to update information and add new cameras
+
 [Go to the source code](../assets/layers/surveillance_camera/surveillance_camera.json)
 
 
@@ -1363,6 +1397,8 @@ A sport pitch
 
 
 
+A layer showing (public) toilets
+
 [Go to the source code](../assets/layers/toilet/toilet.json)
 
 
@@ -1385,6 +1421,8 @@ A sport pitch
 
 
 
+A layer showing trees
+
 [Go to the source code](../assets/layers/tree_node/tree_node.json)
 
 
diff --git a/Docs/CalculatedTags.md b/Docs/CalculatedTags.md
index 2615357cd..8e19bdc03 100644
--- a/Docs/CalculatedTags.md
+++ b/Docs/CalculatedTags.md
@@ -239,7 +239,10 @@ For example to get all objects which overlap or embed from a layer, use `_contai
 
 If a 'unique tag key' is given, the tag with this key will only appear once (e.g. if 'name' is given, all features will have a different name) 
 
-
+  0. list of features or layer name or '*' to get all features
+  1. amount of features
+  2. unique tag key (optional)
+  3. maxDistanceInMeters (optional)
  
 
 ### memberships