diff --git a/Docs/TagInfo/mapcomplete_blind_osm.json b/Docs/TagInfo/mapcomplete_blind_osm.json
index f1b552dc8..121b58c65 100644
--- a/Docs/TagInfo/mapcomplete_blind_osm.json
+++ b/Docs/TagInfo/mapcomplete_blind_osm.json
@@ -766,102 +766,97 @@
       "description": "The layer 'Crossings allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
-      "key": "crossing",
-      "description": "Layer 'Crossings' shows crossing=uncontrolled with a fixed text, namely 'Crossing, without traffic lights' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)",
-      "value": "uncontrolled"
+      "key": "crossing:signals",
+      "description": "Layer 'Crossings' shows crossing:signals=no with a fixed text, namely 'There are no traffic signals at this crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)",
+      "value": "no"
+    },
+    {
+      "key": "crossing:signals",
+      "description": "Layer 'Crossings' shows crossing:signals=yes with a fixed text, namely 'There are traffic signals at this crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)",
+      "value": "yes"
     },
     {
       "key": "crossing",
-      "description": "Layer 'Crossings' shows crossing=traffic_signals with a fixed text, namely 'Crossing with traffic signals' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)",
+      "description": "Layer 'Crossings' shows crossing=traffic_signals with a fixed text, namely 'There are traffic signals at this crossing' (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)",
       "value": "traffic_signals"
     },
     {
-      "key": "crossing",
-      "description": "Layer 'Crossings' shows crossing=zebra with a fixed text, namely 'Zebra crossing' (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)",
-      "value": "zebra"
-    },
-    {
-      "key": "crossing",
-      "description": "Layer 'Crossings' shows crossing=unmarked with a fixed text, namely 'Crossing without crossing markings' (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)",
-      "value": "unmarked"
+      "key": "crossing:markings",
+      "description": "Layer 'Crossings' shows and asks freeform values for key 'crossing:markings' (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows and asks freeform values for key 'crossing:markings' (in the mapcomplete.org theme 'OSM for the blind')"
-    },
-    {
-      "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=no with a fixed text, namely 'This crossing has no markings' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
+      "description": "Layer 'Crossings' shows crossing:markings=no with a fixed text, namely 'This crossing has no markings' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)",
       "value": "no"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=zebra with a fixed text, namely 'This crossing has zebra markings' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
+      "description": "Layer 'Crossings' shows crossing:markings=zebra with a fixed text, namely 'This crossing has zebra markings' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)",
       "value": "zebra"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=yes with a fixed text, namely 'This crossing has markings of an unknown type' (in the mapcomplete.org theme 'OSM for the blind')",
+      "description": "Layer 'Crossings' shows crossing:markings=yes with a fixed text, namely 'This crossing has markings of an unknown type' (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)",
       "value": "yes"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=lines with a fixed text, namely 'This crossings has lines on either side of the crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
+      "description": "Layer 'Crossings' shows crossing:markings=lines with a fixed text, namely 'This crossings has lines on either side of the crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)",
       "value": "lines"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=ladder with a fixed text, namely 'This crossing has lines on either side of the crossing, along with bars connecting them' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
+      "description": "Layer 'Crossings' shows crossing:markings=ladder with a fixed text, namely 'This crossing has lines on either side of the crossing, along with bars connecting them' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)",
       "value": "ladder"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=dashes with a fixed text, namely 'This crossing has dashed lines on either sides of the crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
+      "description": "Layer 'Crossings' shows crossing:markings=dashes with a fixed text, namely 'This crossing has dashed lines on either sides of the crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)",
       "value": "dashes"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=dots with a fixed text, namely 'This crossing has dotted lines on either sides of the crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
+      "description": "Layer 'Crossings' shows crossing:markings=dots with a fixed text, namely 'This crossing has dotted lines on either sides of the crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)",
       "value": "dots"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=surface with a fixed text, namely 'This crossing is marked by using a different coloured surface' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
+      "description": "Layer 'Crossings' shows crossing:markings=surface with a fixed text, namely 'This crossing is marked by using a different coloured surface' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)",
       "value": "surface"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=ladder:skewed with a fixed text, namely 'This crossing has lines on either side of the crossing, along with angled bars connecting them' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
+      "description": "Layer 'Crossings' shows crossing:markings=ladder:skewed with a fixed text, namely 'This crossing has lines on either side of the crossing, along with angled bars connecting them' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)",
       "value": "ladder:skewed"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=zebra:paired with a fixed text, namely 'This crossing has zebra markings with an interruption in every bar' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
+      "description": "Layer 'Crossings' shows crossing:markings=zebra:paired with a fixed text, namely 'This crossing has zebra markings with an interruption in every bar' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)",
       "value": "zebra:paired"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=zebra:bicolour with a fixed text, namely 'This crossing has zebra markings in alternating colours' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
+      "description": "Layer 'Crossings' shows crossing:markings=zebra:bicolour with a fixed text, namely 'This crossing has zebra markings in alternating colours' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)",
       "value": "zebra:bicolour"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=zebra:double with a fixed text, namely 'This crossing has double zebra markings' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
+      "description": "Layer 'Crossings' shows crossing:markings=zebra:double with a fixed text, namely 'This crossing has double zebra markings' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)",
       "value": "zebra:double"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=pictograms with a fixed text, namely 'This crossing has pictograms on the road' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
+      "description": "Layer 'Crossings' shows crossing:markings=pictograms with a fixed text, namely 'This crossing has pictograms on the road' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)",
       "value": "pictograms"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=ladder:paired with a fixed text, namely 'This crossing has lines on either side of the crossing, along with bars connecting them, with an interruption in every bar' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
+      "description": "Layer 'Crossings' shows crossing:markings=ladder:paired with a fixed text, namely 'This crossing has lines on either side of the crossing, along with bars connecting them, with an interruption in every bar' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)",
       "value": "ladder:paired"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=lines:paired with a fixed text, namely 'This crossing has double lines on either side of the crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
+      "description": "Layer 'Crossings' shows crossing:markings=lines:paired with a fixed text, namely 'This crossing has double lines on either side of the crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)",
       "value": "lines:paired"
     },
     {
@@ -889,6 +884,11 @@
       "description": "Layer 'Crossings' shows tactile_paving=incorrect with a fixed text, namely 'This crossing has tactile paving, but is not correct' (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)",
       "value": "incorrect"
     },
+    {
+      "key": "tactile_paving",
+      "description": "Layer 'Crossings' shows tactile_paving=partial with a fixed text, namely 'This crrosing has tactile paving, but only on one side' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=crossing)",
+      "value": "partial"
+    },
     {
       "key": "button_operated",
       "description": "Layer 'Crossings' shows button_operated=yes with a fixed text, namely 'This traffic light has a button to request green light' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if highway=traffic_signals | crossing=traffic_signals)",
@@ -1348,6 +1348,16 @@
       "key": "diameter",
       "description": "Layer 'Elevator' shows and asks freeform values for key 'diameter' (in the mapcomplete.org theme 'OSM for the blind') (This is only shown if shape=circular)"
     },
+    {
+      "key": "handrail",
+      "description": "Layer 'Elevator' shows handrail=yes with a fixed text, namely 'This elevator has a handrail in the cabin' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
+      "value": "yes"
+    },
+    {
+      "key": "handrail",
+      "description": "Layer 'Elevator' shows handrail=no with a fixed text, namely 'This elevator does not have a handrail' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
+      "value": "no"
+    },
     {
       "key": "hearing_loop",
       "description": "Layer 'Elevator' shows hearing_loop=yes with a fixed text, namely 'This place has an audio induction loop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
diff --git a/Docs/TagInfo/mapcomplete_climbing.json b/Docs/TagInfo/mapcomplete_climbing.json
index fd9c38cd3..c0599dab0 100644
--- a/Docs/TagInfo/mapcomplete_climbing.json
+++ b/Docs/TagInfo/mapcomplete_climbing.json
@@ -2809,6 +2809,33 @@
       "key": "ski",
       "description": "Layer 'Guideposts' shows ski=yes with a fixed text, namely 'This guidepost shows ski routes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
       "value": "yes"
+    },
+    {
+      "key": "name",
+      "description": "Layer 'Guideposts' shows and asks freeform values for key 'name' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
+    },
+    {
+      "key": "noname",
+      "description": "Layer 'Guideposts' shows noname=yes with a fixed text, namely 'There is no name noted on this guidepost' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "yes"
+    },
+    {
+      "key": "ref",
+      "description": "Layer 'Guideposts' shows and asks freeform values for key 'ref' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
+    },
+    {
+      "key": "noref",
+      "description": "Layer 'Guideposts' shows noref=yes with a fixed text, namely 'There is no reference number noted on this guidepost' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "yes"
+    },
+    {
+      "key": "ele",
+      "description": "Layer 'Guideposts' shows and asks freeform values for key 'ele' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
+    },
+    {
+      "key": "noele",
+      "description": "Layer 'Guideposts' shows noele=yes with a fixed text, namely 'There is no elevation noted on this guidepost' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "yes"
     }
   ]
 }
\ No newline at end of file
diff --git a/Docs/TagInfo/mapcomplete_cycle_infra.json b/Docs/TagInfo/mapcomplete_cycle_infra.json
index 3b3986529..1fdcbc7a5 100644
--- a/Docs/TagInfo/mapcomplete_cycle_infra.json
+++ b/Docs/TagInfo/mapcomplete_cycle_infra.json
@@ -881,102 +881,97 @@
       "description": "The layer 'Crossings allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
-      "key": "crossing",
-      "description": "Layer 'Crossings' shows crossing=uncontrolled with a fixed text, namely 'Crossing, without traffic lights' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)",
-      "value": "uncontrolled"
+      "key": "crossing:signals",
+      "description": "Layer 'Crossings' shows crossing:signals=no with a fixed text, namely 'There are no traffic signals at this crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)",
+      "value": "no"
+    },
+    {
+      "key": "crossing:signals",
+      "description": "Layer 'Crossings' shows crossing:signals=yes with a fixed text, namely 'There are traffic signals at this crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)",
+      "value": "yes"
     },
     {
       "key": "crossing",
-      "description": "Layer 'Crossings' shows crossing=traffic_signals with a fixed text, namely 'Crossing with traffic signals' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)",
+      "description": "Layer 'Crossings' shows crossing=traffic_signals with a fixed text, namely 'There are traffic signals at this crossing' (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)",
       "value": "traffic_signals"
     },
     {
-      "key": "crossing",
-      "description": "Layer 'Crossings' shows crossing=zebra with a fixed text, namely 'Zebra crossing' (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)",
-      "value": "zebra"
-    },
-    {
-      "key": "crossing",
-      "description": "Layer 'Crossings' shows crossing=unmarked with a fixed text, namely 'Crossing without crossing markings' (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)",
-      "value": "unmarked"
+      "key": "crossing:markings",
+      "description": "Layer 'Crossings' shows and asks freeform values for key 'crossing:markings' (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows and asks freeform values for key 'crossing:markings' (in the mapcomplete.org theme 'Bicycle infrastructure')"
-    },
-    {
-      "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=no with a fixed text, namely 'This crossing has no markings' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure')",
+      "description": "Layer 'Crossings' shows crossing:markings=no with a fixed text, namely 'This crossing has no markings' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)",
       "value": "no"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=zebra with a fixed text, namely 'This crossing has zebra markings' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure')",
+      "description": "Layer 'Crossings' shows crossing:markings=zebra with a fixed text, namely 'This crossing has zebra markings' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)",
       "value": "zebra"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=yes with a fixed text, namely 'This crossing has markings of an unknown type' (in the mapcomplete.org theme 'Bicycle infrastructure')",
+      "description": "Layer 'Crossings' shows crossing:markings=yes with a fixed text, namely 'This crossing has markings of an unknown type' (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)",
       "value": "yes"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=lines with a fixed text, namely 'This crossings has lines on either side of the crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure')",
+      "description": "Layer 'Crossings' shows crossing:markings=lines with a fixed text, namely 'This crossings has lines on either side of the crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)",
       "value": "lines"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=ladder with a fixed text, namely 'This crossing has lines on either side of the crossing, along with bars connecting them' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure')",
+      "description": "Layer 'Crossings' shows crossing:markings=ladder with a fixed text, namely 'This crossing has lines on either side of the crossing, along with bars connecting them' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)",
       "value": "ladder"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=dashes with a fixed text, namely 'This crossing has dashed lines on either sides of the crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure')",
+      "description": "Layer 'Crossings' shows crossing:markings=dashes with a fixed text, namely 'This crossing has dashed lines on either sides of the crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)",
       "value": "dashes"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=dots with a fixed text, namely 'This crossing has dotted lines on either sides of the crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure')",
+      "description": "Layer 'Crossings' shows crossing:markings=dots with a fixed text, namely 'This crossing has dotted lines on either sides of the crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)",
       "value": "dots"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=surface with a fixed text, namely 'This crossing is marked by using a different coloured surface' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure')",
+      "description": "Layer 'Crossings' shows crossing:markings=surface with a fixed text, namely 'This crossing is marked by using a different coloured surface' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)",
       "value": "surface"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=ladder:skewed with a fixed text, namely 'This crossing has lines on either side of the crossing, along with angled bars connecting them' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure')",
+      "description": "Layer 'Crossings' shows crossing:markings=ladder:skewed with a fixed text, namely 'This crossing has lines on either side of the crossing, along with angled bars connecting them' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)",
       "value": "ladder:skewed"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=zebra:paired with a fixed text, namely 'This crossing has zebra markings with an interruption in every bar' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure')",
+      "description": "Layer 'Crossings' shows crossing:markings=zebra:paired with a fixed text, namely 'This crossing has zebra markings with an interruption in every bar' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)",
       "value": "zebra:paired"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=zebra:bicolour with a fixed text, namely 'This crossing has zebra markings in alternating colours' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure')",
+      "description": "Layer 'Crossings' shows crossing:markings=zebra:bicolour with a fixed text, namely 'This crossing has zebra markings in alternating colours' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)",
       "value": "zebra:bicolour"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=zebra:double with a fixed text, namely 'This crossing has double zebra markings' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure')",
+      "description": "Layer 'Crossings' shows crossing:markings=zebra:double with a fixed text, namely 'This crossing has double zebra markings' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)",
       "value": "zebra:double"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=pictograms with a fixed text, namely 'This crossing has pictograms on the road' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure')",
+      "description": "Layer 'Crossings' shows crossing:markings=pictograms with a fixed text, namely 'This crossing has pictograms on the road' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)",
       "value": "pictograms"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=ladder:paired with a fixed text, namely 'This crossing has lines on either side of the crossing, along with bars connecting them, with an interruption in every bar' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure')",
+      "description": "Layer 'Crossings' shows crossing:markings=ladder:paired with a fixed text, namely 'This crossing has lines on either side of the crossing, along with bars connecting them, with an interruption in every bar' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)",
       "value": "ladder:paired"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=lines:paired with a fixed text, namely 'This crossing has double lines on either side of the crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure')",
+      "description": "Layer 'Crossings' shows crossing:markings=lines:paired with a fixed text, namely 'This crossing has double lines on either side of the crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)",
       "value": "lines:paired"
     },
     {
@@ -1014,6 +1009,11 @@
       "description": "Layer 'Crossings' shows tactile_paving=incorrect with a fixed text, namely 'This crossing has tactile paving, but is not correct' (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)",
       "value": "incorrect"
     },
+    {
+      "key": "tactile_paving",
+      "description": "Layer 'Crossings' shows tactile_paving=partial with a fixed text, namely 'This crrosing has tactile paving, but only on one side' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=crossing)",
+      "value": "partial"
+    },
     {
       "key": "button_operated",
       "description": "Layer 'Crossings' shows button_operated=yes with a fixed text, namely 'This traffic light has a button to request green light' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bicycle infrastructure') (This is only shown if highway=traffic_signals | crossing=traffic_signals)",
diff --git a/Docs/TagInfo/mapcomplete_guideposts.json b/Docs/TagInfo/mapcomplete_guideposts.json
index 7a5ba5bf5..765eef042 100644
--- a/Docs/TagInfo/mapcomplete_guideposts.json
+++ b/Docs/TagInfo/mapcomplete_guideposts.json
@@ -63,6 +63,33 @@
       "key": "ski",
       "description": "Layer 'Guideposts' shows ski=yes with a fixed text, namely 'This guidepost shows ski routes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Guideposts')",
       "value": "yes"
+    },
+    {
+      "key": "name",
+      "description": "Layer 'Guideposts' shows and asks freeform values for key 'name' (in the mapcomplete.org theme 'Guideposts')"
+    },
+    {
+      "key": "noname",
+      "description": "Layer 'Guideposts' shows noname=yes with a fixed text, namely 'There is no name noted on this guidepost' and allows to pick this as a default answer (in the mapcomplete.org theme 'Guideposts')",
+      "value": "yes"
+    },
+    {
+      "key": "ref",
+      "description": "Layer 'Guideposts' shows and asks freeform values for key 'ref' (in the mapcomplete.org theme 'Guideposts')"
+    },
+    {
+      "key": "noref",
+      "description": "Layer 'Guideposts' shows noref=yes with a fixed text, namely 'There is no reference number noted on this guidepost' and allows to pick this as a default answer (in the mapcomplete.org theme 'Guideposts')",
+      "value": "yes"
+    },
+    {
+      "key": "ele",
+      "description": "Layer 'Guideposts' shows and asks freeform values for key 'ele' (in the mapcomplete.org theme 'Guideposts')"
+    },
+    {
+      "key": "noele",
+      "description": "Layer 'Guideposts' shows noele=yes with a fixed text, namely 'There is no elevation noted on this guidepost' and allows to pick this as a default answer (in the mapcomplete.org theme 'Guideposts')",
+      "value": "yes"
     }
   ]
 }
\ No newline at end of file
diff --git a/Docs/TagInfo/mapcomplete_indoors.json b/Docs/TagInfo/mapcomplete_indoors.json
index 20ffc0673..eec15b056 100644
--- a/Docs/TagInfo/mapcomplete_indoors.json
+++ b/Docs/TagInfo/mapcomplete_indoors.json
@@ -533,6 +533,16 @@
       "key": "diameter",
       "description": "Layer 'Elevator' shows and asks freeform values for key 'diameter' (in the mapcomplete.org theme 'Indoors') (This is only shown if shape=circular)"
     },
+    {
+      "key": "handrail",
+      "description": "Layer 'Elevator' shows handrail=yes with a fixed text, namely 'This elevator has a handrail in the cabin' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors')",
+      "value": "yes"
+    },
+    {
+      "key": "handrail",
+      "description": "Layer 'Elevator' shows handrail=no with a fixed text, namely 'This elevator does not have a handrail' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors')",
+      "value": "no"
+    },
     {
       "key": "hearing_loop",
       "description": "Layer 'Elevator' shows hearing_loop=yes with a fixed text, namely 'This place has an audio induction loop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors')",
diff --git a/Docs/TagInfo/mapcomplete_kerbs_and_crossings.json b/Docs/TagInfo/mapcomplete_kerbs_and_crossings.json
index d4c7975d1..5247ea8c4 100644
--- a/Docs/TagInfo/mapcomplete_kerbs_and_crossings.json
+++ b/Docs/TagInfo/mapcomplete_kerbs_and_crossings.json
@@ -761,102 +761,97 @@
       "description": "The layer 'Crossings allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
-      "key": "crossing",
-      "description": "Layer 'Crossings' shows crossing=uncontrolled with a fixed text, namely 'Crossing, without traffic lights' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)",
-      "value": "uncontrolled"
+      "key": "crossing:signals",
+      "description": "Layer 'Crossings' shows crossing:signals=no with a fixed text, namely 'There are no traffic signals at this crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)",
+      "value": "no"
+    },
+    {
+      "key": "crossing:signals",
+      "description": "Layer 'Crossings' shows crossing:signals=yes with a fixed text, namely 'There are traffic signals at this crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)",
+      "value": "yes"
     },
     {
       "key": "crossing",
-      "description": "Layer 'Crossings' shows crossing=traffic_signals with a fixed text, namely 'Crossing with traffic signals' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)",
+      "description": "Layer 'Crossings' shows crossing=traffic_signals with a fixed text, namely 'There are traffic signals at this crossing' (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)",
       "value": "traffic_signals"
     },
     {
-      "key": "crossing",
-      "description": "Layer 'Crossings' shows crossing=zebra with a fixed text, namely 'Zebra crossing' (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)",
-      "value": "zebra"
-    },
-    {
-      "key": "crossing",
-      "description": "Layer 'Crossings' shows crossing=unmarked with a fixed text, namely 'Crossing without crossing markings' (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)",
-      "value": "unmarked"
+      "key": "crossing:markings",
+      "description": "Layer 'Crossings' shows and asks freeform values for key 'crossing:markings' (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows and asks freeform values for key 'crossing:markings' (in the mapcomplete.org theme 'Kerbs and crossings')"
-    },
-    {
-      "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=no with a fixed text, namely 'This crossing has no markings' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings')",
+      "description": "Layer 'Crossings' shows crossing:markings=no with a fixed text, namely 'This crossing has no markings' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)",
       "value": "no"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=zebra with a fixed text, namely 'This crossing has zebra markings' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings')",
+      "description": "Layer 'Crossings' shows crossing:markings=zebra with a fixed text, namely 'This crossing has zebra markings' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)",
       "value": "zebra"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=yes with a fixed text, namely 'This crossing has markings of an unknown type' (in the mapcomplete.org theme 'Kerbs and crossings')",
+      "description": "Layer 'Crossings' shows crossing:markings=yes with a fixed text, namely 'This crossing has markings of an unknown type' (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)",
       "value": "yes"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=lines with a fixed text, namely 'This crossings has lines on either side of the crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings')",
+      "description": "Layer 'Crossings' shows crossing:markings=lines with a fixed text, namely 'This crossings has lines on either side of the crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)",
       "value": "lines"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=ladder with a fixed text, namely 'This crossing has lines on either side of the crossing, along with bars connecting them' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings')",
+      "description": "Layer 'Crossings' shows crossing:markings=ladder with a fixed text, namely 'This crossing has lines on either side of the crossing, along with bars connecting them' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)",
       "value": "ladder"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=dashes with a fixed text, namely 'This crossing has dashed lines on either sides of the crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings')",
+      "description": "Layer 'Crossings' shows crossing:markings=dashes with a fixed text, namely 'This crossing has dashed lines on either sides of the crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)",
       "value": "dashes"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=dots with a fixed text, namely 'This crossing has dotted lines on either sides of the crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings')",
+      "description": "Layer 'Crossings' shows crossing:markings=dots with a fixed text, namely 'This crossing has dotted lines on either sides of the crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)",
       "value": "dots"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=surface with a fixed text, namely 'This crossing is marked by using a different coloured surface' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings')",
+      "description": "Layer 'Crossings' shows crossing:markings=surface with a fixed text, namely 'This crossing is marked by using a different coloured surface' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)",
       "value": "surface"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=ladder:skewed with a fixed text, namely 'This crossing has lines on either side of the crossing, along with angled bars connecting them' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings')",
+      "description": "Layer 'Crossings' shows crossing:markings=ladder:skewed with a fixed text, namely 'This crossing has lines on either side of the crossing, along with angled bars connecting them' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)",
       "value": "ladder:skewed"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=zebra:paired with a fixed text, namely 'This crossing has zebra markings with an interruption in every bar' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings')",
+      "description": "Layer 'Crossings' shows crossing:markings=zebra:paired with a fixed text, namely 'This crossing has zebra markings with an interruption in every bar' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)",
       "value": "zebra:paired"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=zebra:bicolour with a fixed text, namely 'This crossing has zebra markings in alternating colours' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings')",
+      "description": "Layer 'Crossings' shows crossing:markings=zebra:bicolour with a fixed text, namely 'This crossing has zebra markings in alternating colours' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)",
       "value": "zebra:bicolour"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=zebra:double with a fixed text, namely 'This crossing has double zebra markings' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings')",
+      "description": "Layer 'Crossings' shows crossing:markings=zebra:double with a fixed text, namely 'This crossing has double zebra markings' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)",
       "value": "zebra:double"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=pictograms with a fixed text, namely 'This crossing has pictograms on the road' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings')",
+      "description": "Layer 'Crossings' shows crossing:markings=pictograms with a fixed text, namely 'This crossing has pictograms on the road' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)",
       "value": "pictograms"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=ladder:paired with a fixed text, namely 'This crossing has lines on either side of the crossing, along with bars connecting them, with an interruption in every bar' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings')",
+      "description": "Layer 'Crossings' shows crossing:markings=ladder:paired with a fixed text, namely 'This crossing has lines on either side of the crossing, along with bars connecting them, with an interruption in every bar' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)",
       "value": "ladder:paired"
     },
     {
       "key": "crossing:markings",
-      "description": "Layer 'Crossings' shows crossing:markings=lines:paired with a fixed text, namely 'This crossing has double lines on either side of the crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings')",
+      "description": "Layer 'Crossings' shows crossing:markings=lines:paired with a fixed text, namely 'This crossing has double lines on either side of the crossing' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)",
       "value": "lines:paired"
     },
     {
@@ -894,6 +889,11 @@
       "description": "Layer 'Crossings' shows tactile_paving=incorrect with a fixed text, namely 'This crossing has tactile paving, but is not correct' (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)",
       "value": "incorrect"
     },
+    {
+      "key": "tactile_paving",
+      "description": "Layer 'Crossings' shows tactile_paving=partial with a fixed text, namely 'This crrosing has tactile paving, but only on one side' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=crossing)",
+      "value": "partial"
+    },
     {
       "key": "button_operated",
       "description": "Layer 'Crossings' shows button_operated=yes with a fixed text, namely 'This traffic light has a button to request green light' and allows to pick this as a default answer (in the mapcomplete.org theme 'Kerbs and crossings') (This is only shown if highway=traffic_signals | crossing=traffic_signals)",
diff --git a/Docs/TagInfo/mapcomplete_nature.json b/Docs/TagInfo/mapcomplete_nature.json
index a2e9291de..7910a7626 100644
--- a/Docs/TagInfo/mapcomplete_nature.json
+++ b/Docs/TagInfo/mapcomplete_nature.json
@@ -1477,6 +1477,33 @@
       "description": "Layer 'Guideposts' shows ski=yes with a fixed text, namely 'This guidepost shows ski routes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
       "value": "yes"
     },
+    {
+      "key": "name",
+      "description": "Layer 'Guideposts' shows and asks freeform values for key 'name' (in the mapcomplete.org theme 'Into nature')"
+    },
+    {
+      "key": "noname",
+      "description": "Layer 'Guideposts' shows noname=yes with a fixed text, namely 'There is no name noted on this guidepost' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
+      "value": "yes"
+    },
+    {
+      "key": "ref",
+      "description": "Layer 'Guideposts' shows and asks freeform values for key 'ref' (in the mapcomplete.org theme 'Into nature')"
+    },
+    {
+      "key": "noref",
+      "description": "Layer 'Guideposts' shows noref=yes with a fixed text, namely 'There is no reference number noted on this guidepost' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
+      "value": "yes"
+    },
+    {
+      "key": "ele",
+      "description": "Layer 'Guideposts' shows and asks freeform values for key 'ele' (in the mapcomplete.org theme 'Into nature')"
+    },
+    {
+      "key": "noele",
+      "description": "Layer 'Guideposts' shows noele=yes with a fixed text, namely 'There is no elevation noted on this guidepost' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
+      "value": "yes"
+    },
     {
       "key": "amenity",
       "description": "The MapComplete theme Into nature has a layer Shelter showing features with this tag",
diff --git a/Docs/TagInfo/mapcomplete_onwheels.json b/Docs/TagInfo/mapcomplete_onwheels.json
index 38bdb30e4..e5963ca12 100644
--- a/Docs/TagInfo/mapcomplete_onwheels.json
+++ b/Docs/TagInfo/mapcomplete_onwheels.json
@@ -3808,6 +3808,16 @@
       "key": "diameter",
       "description": "Layer 'Elevator' shows and asks freeform values for key 'diameter' (in the mapcomplete.org theme 'OnWheels') (This is only shown if shape=circular)"
     },
+    {
+      "key": "handrail",
+      "description": "Layer 'Elevator' shows handrail=yes with a fixed text, namely 'This elevator has a handrail in the cabin' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "yes"
+    },
+    {
+      "key": "handrail",
+      "description": "Layer 'Elevator' shows handrail=no with a fixed text, namely 'This elevator does not have a handrail' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "no"
+    },
     {
       "key": "hearing_loop",
       "description": "Layer 'Elevator' shows hearing_loop=yes with a fixed text, namely 'This place has an audio induction loop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
diff --git a/Docs/TagInfo/mapcomplete_postboxes.json b/Docs/TagInfo/mapcomplete_postboxes.json
index 6dd4f3596..243a996e1 100644
--- a/Docs/TagInfo/mapcomplete_postboxes.json
+++ b/Docs/TagInfo/mapcomplete_postboxes.json
@@ -262,16 +262,6 @@
       "description": "The MapComplete theme Postbox and Post Office Map has a layer Parcel Lockers showing features with this tag",
       "value": "parcel_locker"
     },
-    {
-      "key": "amenity",
-      "description": "The MapComplete theme Postbox and Post Office Map has a layer Parcel Lockers showing features with this tag",
-      "value": "vending_machine"
-    },
-    {
-      "key": "vending",
-      "description": "The MapComplete theme Postbox and Post Office Map has a layer Parcel Lockers showing features with this tag",
-      "value": "parcel_pickup;parcel_mail_in"
-    },
     {
       "key": "id",
       "description": "Layer 'Parcel Lockers' shows id~.+ with a fixed text, namely 'You just created this element! Thanks for sharing this info with the world and helping people worldwide.' (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if _backend~.+ & _last_edit:passed_time<300 & (_version_number= | _version_number=1))"
@@ -324,22 +314,27 @@
     },
     {
       "key": "parcel_mail_in",
-      "description": "Layer 'Parcel Lockers' shows parcel_mail_in=yes with a fixed text, namely 'You can send packages from this parcel locker' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if amenity=parcel_locker)",
+      "description": "Layer 'Parcel Lockers' shows parcel_mail_in=yes with a fixed text, namely 'You can send packages from this parcel locker' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map')",
       "value": "yes"
     },
     {
       "key": "parcel_mail_in",
-      "description": "Layer 'Parcel Lockers' shows parcel_mail_in=no with a fixed text, namely 'You <b>can't</b> send packages from this parcel locker' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if amenity=parcel_locker)",
+      "description": "Layer 'Parcel Lockers' shows parcel_mail_in=no with a fixed text, namely 'You <b>can't</b> send packages from this parcel locker' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map')",
       "value": "no"
     },
+    {
+      "key": "parcel_mail_in",
+      "description": "Layer 'Parcel Lockers' shows parcel_mail_in=returns_only with a fixed text, namely 'You can send packages from this parcel locker, but only for returns' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map')",
+      "value": "returns_only"
+    },
     {
       "key": "parcel_pickup",
-      "description": "Layer 'Parcel Lockers' shows parcel_pickup=yes with a fixed text, namely 'You can pick up packages from this parcel locker' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if amenity=parcel_locker)",
+      "description": "Layer 'Parcel Lockers' shows parcel_pickup=yes with a fixed text, namely 'You can pick up packages from this parcel locker' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map')",
       "value": "yes"
     },
     {
       "key": "parcel_pickup",
-      "description": "Layer 'Parcel Lockers' shows parcel_pickup=no with a fixed text, namely 'You <b>can't</b> pick up packages from this parcel locker' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if amenity=parcel_locker)",
+      "description": "Layer 'Parcel Lockers' shows parcel_pickup=no with a fixed text, namely 'You <b>can't</b> pick up packages from this parcel locker' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map')",
       "value": "no"
     },
     {
diff --git a/Docs/TagInfo/mapcomplete_ski.json b/Docs/TagInfo/mapcomplete_ski.json
index 11274b7d7..f6b9f64eb 100644
--- a/Docs/TagInfo/mapcomplete_ski.json
+++ b/Docs/TagInfo/mapcomplete_ski.json
@@ -238,6 +238,33 @@
       "description": "Layer 'Guideposts' shows ski=yes with a fixed text, namely 'This guidepost shows ski routes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways')",
       "value": "yes"
     },
+    {
+      "key": "name",
+      "description": "Layer 'Guideposts' shows and asks freeform values for key 'name' (in the mapcomplete.org theme 'Ski pistes and aerialways')"
+    },
+    {
+      "key": "noname",
+      "description": "Layer 'Guideposts' shows noname=yes with a fixed text, namely 'There is no name noted on this guidepost' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways')",
+      "value": "yes"
+    },
+    {
+      "key": "ref",
+      "description": "Layer 'Guideposts' shows and asks freeform values for key 'ref' (in the mapcomplete.org theme 'Ski pistes and aerialways')"
+    },
+    {
+      "key": "noref",
+      "description": "Layer 'Guideposts' shows noref=yes with a fixed text, namely 'There is no reference number noted on this guidepost' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways')",
+      "value": "yes"
+    },
+    {
+      "key": "ele",
+      "description": "Layer 'Guideposts' shows and asks freeform values for key 'ele' (in the mapcomplete.org theme 'Ski pistes and aerialways')"
+    },
+    {
+      "key": "noele",
+      "description": "Layer 'Guideposts' shows noele=yes with a fixed text, namely 'There is no elevation noted on this guidepost' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways')",
+      "value": "yes"
+    },
     {
       "key": "tourism",
       "description": "The MapComplete theme Ski pistes and aerialways has a layer Maps showing features with this tag",
diff --git a/Docs/TagInfo/mapcomplete_wayside_shrines.json b/Docs/TagInfo/mapcomplete_wayside_shrines.json
index fcfa44a06..468ffe6c9 100644
--- a/Docs/TagInfo/mapcomplete_wayside_shrines.json
+++ b/Docs/TagInfo/mapcomplete_wayside_shrines.json
@@ -2,7 +2,7 @@
   "data_format": 1,
   "project": {
     "name": "MapComplete Wayside shrines",
-    "description": "This map shows shrines found on the side of roads and paths, and allows adding new ones",
+    "description": "This map shows shrines and crosses found on the side of roads and paths, and allows adding new ones",
     "project_url": "https://mapcomplete.org/wayside_shrines",
     "doc_url": "https://source.mapcomplete.org/MapComplete/MapComplete/src/branch/develop/Docs/Themes",
     "icon_url": "https://mapcomplete.org/assets/layers/wayside_shrine/shrine.svg",
@@ -12,229 +12,253 @@
   "tags": [
     {
       "key": "historic",
-      "description": "The MapComplete theme Wayside shrines has a layer Wayside Shrines showing features with this tag",
+      "description": "The MapComplete theme Wayside shrines has a layer Wayside Shrines and Crosses showing features with this tag",
       "value": "wayside_shrine"
     },
+    {
+      "key": "historic",
+      "description": "The MapComplete theme Wayside shrines has a layer Wayside Shrines and Crosses showing features with this tag",
+      "value": "wayside_cross"
+    },
     {
       "key": "id",
-      "description": "Layer 'Wayside Shrines' shows id~.+ with a fixed text, namely 'You just created this element! Thanks for sharing this info with the world and helping people worldwide.' (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if _backend~.+ & _last_edit:passed_time<300 & (_version_number= | _version_number=1))"
+      "description": "Layer 'Wayside Shrines and Crosses' shows id~.+ with a fixed text, namely 'You just created this element! Thanks for sharing this info with the world and helping people worldwide.' (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if _backend~.+ & _last_edit:passed_time<300 & (_version_number= | _version_number=1))"
     },
     {
       "key": "image",
-      "description": "The layer 'Wayside Shrines allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Wayside Shrines and Crosses allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "panoramax",
-      "description": "The layer 'Wayside Shrines allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Wayside Shrines and Crosses allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "mapillary",
-      "description": "The layer 'Wayside Shrines allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Wayside Shrines and Crosses allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "wikidata",
-      "description": "The layer 'Wayside Shrines allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Wayside Shrines and Crosses allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "wikipedia",
-      "description": "The layer 'Wayside Shrines allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Wayside Shrines and Crosses allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "name",
-      "description": "Layer 'Wayside Shrines' shows and asks freeform values for key 'name' (in the mapcomplete.org theme 'Wayside shrines')"
+      "description": "Layer 'Wayside Shrines and Crosses' shows and asks freeform values for key 'name' (in the mapcomplete.org theme 'Wayside shrines')"
     },
     {
       "key": "noname",
-      "description": "Layer 'Wayside Shrines' shows noname=yes with a fixed text, namely 'This shrine does not have a name' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines')",
+      "description": "Layer 'Wayside Shrines and Crosses' shows noname=yes with a fixed text, namely 'This shrine does not have a name' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines')",
       "value": "yes"
     },
     {
-      "key": "religion",
-      "description": "Layer 'Wayside Shrines' shows and asks freeform values for key 'religion' (in the mapcomplete.org theme 'Wayside shrines')"
+      "key": "inscription",
+      "description": "Layer 'Wayside Shrines and Crosses' shows and asks freeform values for key 'inscription' (in the mapcomplete.org theme 'Wayside shrines')"
+    },
+    {
+      "key": "not:inscription",
+      "description": "Layer 'Wayside Shrines and Crosses' shows not:inscription=yes with a fixed text, namely 'No inscription' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines')",
+      "value": "yes"
+    },
+    {
+      "key": "inscription",
+      "description": "Layer 'Wayside Shrines and Crosses' shows inscription=Ave Maria with a fixed text, namely 'The inscription is <b>Ave Maria</b>' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines')",
+      "value": "Ave Maria"
+    },
+    {
+      "key": "inscription",
+      "description": "Layer 'Wayside Shrines and Crosses' shows inscription=I.N.R.I with a fixed text, namely 'The inscription is <b>I.N.R.I.</b>' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines')",
+      "value": "I.N.R.I"
     },
     {
       "key": "religion",
-      "description": "Layer 'Wayside Shrines' shows religion=christian with a fixed text, namely 'This is a Christian shrine' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines')",
+      "description": "Layer 'Wayside Shrines and Crosses' shows and asks freeform values for key 'religion' (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if historic!=wayside_cross)"
+    },
+    {
+      "key": "religion",
+      "description": "Layer 'Wayside Shrines and Crosses' shows religion=christian with a fixed text, namely 'This is a Christian shrine' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if historic!=wayside_cross)",
       "value": "christian"
     },
     {
       "key": "religion",
-      "description": "Layer 'Wayside Shrines' shows religion=buddhist with a fixed text, namely 'This is a Buddhist shrine' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines')",
+      "description": "Layer 'Wayside Shrines and Crosses' shows religion=buddhist with a fixed text, namely 'This is a Buddhist shrine' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if historic!=wayside_cross)",
       "value": "buddhist"
     },
     {
       "key": "religion",
-      "description": "Layer 'Wayside Shrines' shows religion=hindu with a fixed text, namely 'This is a Hindu shrine' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines')",
+      "description": "Layer 'Wayside Shrines and Crosses' shows religion=hindu with a fixed text, namely 'This is a Hindu shrine' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if historic!=wayside_cross)",
       "value": "hindu"
     },
     {
       "key": "religion",
-      "description": "Layer 'Wayside Shrines' shows religion=jain with a fixed text, namely 'This is a Jain shrine' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines')",
+      "description": "Layer 'Wayside Shrines and Crosses' shows religion=jain with a fixed text, namely 'This is a Jain shrine' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if historic!=wayside_cross)",
       "value": "jain"
     },
     {
       "key": "religion",
-      "description": "Layer 'Wayside Shrines' shows religion=jewish with a fixed text, namely 'This is a Jewish shrine' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines')",
+      "description": "Layer 'Wayside Shrines and Crosses' shows religion=jewish with a fixed text, namely 'This is a Jewish shrine' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if historic!=wayside_cross)",
       "value": "jewish"
     },
     {
       "key": "religion",
-      "description": "Layer 'Wayside Shrines' shows religion=muslim with a fixed text, namely 'This is an Islamic shrine' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines')",
+      "description": "Layer 'Wayside Shrines and Crosses' shows religion=muslim with a fixed text, namely 'This is an Islamic shrine' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if historic!=wayside_cross)",
       "value": "muslim"
     },
     {
       "key": "religion",
-      "description": "Layer 'Wayside Shrines' shows religion=pagan with a fixed text, namely 'This is a Pagan shrine' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines')",
+      "description": "Layer 'Wayside Shrines and Crosses' shows religion=pagan with a fixed text, namely 'This is a Pagan shrine' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if historic!=wayside_cross)",
       "value": "pagan"
     },
     {
       "key": "religion",
-      "description": "Layer 'Wayside Shrines' shows religion=shinto with a fixed text, namely 'This is a Shinto shrine' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines')",
+      "description": "Layer 'Wayside Shrines and Crosses' shows religion=shinto with a fixed text, namely 'This is a Shinto shrine' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if historic!=wayside_cross)",
       "value": "shinto"
     },
     {
       "key": "religion",
-      "description": "Layer 'Wayside Shrines' shows religion=sikh with a fixed text, namely 'This is a Sikh shrine' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines')",
+      "description": "Layer 'Wayside Shrines and Crosses' shows religion=sikh with a fixed text, namely 'This is a Sikh shrine' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if historic!=wayside_cross)",
       "value": "sikh"
     },
     {
       "key": "religion",
-      "description": "Layer 'Wayside Shrines' shows religion=taoist with a fixed text, namely 'This is a Taoist shrine' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines')",
+      "description": "Layer 'Wayside Shrines and Crosses' shows religion=taoist with a fixed text, namely 'This is a Taoist shrine' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if historic!=wayside_cross)",
       "value": "taoist"
     },
     {
       "key": "religion",
-      "description": "Layer 'Wayside Shrines' shows religion=zoroastrian with a fixed text, namely 'This is a Zoroastrian shrine' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines')",
+      "description": "Layer 'Wayside Shrines and Crosses' shows religion=zoroastrian with a fixed text, namely 'This is a Zoroastrian shrine' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if historic!=wayside_cross)",
       "value": "zoroastrian"
     },
     {
       "key": "denomination",
-      "description": "Layer 'Wayside Shrines' shows and asks freeform values for key 'denomination' (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=christian)"
+      "description": "Layer 'Wayside Shrines and Crosses' shows and asks freeform values for key 'denomination' (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=christian)"
     },
     {
       "key": "denomination",
-      "description": "Layer 'Wayside Shrines' shows denomination=catholic with a fixed text, namely 'The religious subdenomination is Catholic' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=christian)",
+      "description": "Layer 'Wayside Shrines and Crosses' shows denomination=catholic with a fixed text, namely 'The religious subdenomination is Catholic' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=christian)",
       "value": "catholic"
     },
     {
       "key": "denomination",
-      "description": "Layer 'Wayside Shrines' shows denomination=roman_catholic with a fixed text, namely 'The religious subdenomination is Roman Catholic' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=christian)",
+      "description": "Layer 'Wayside Shrines and Crosses' shows denomination=roman_catholic with a fixed text, namely 'The religious subdenomination is Roman Catholic' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=christian)",
       "value": "roman_catholic"
     },
     {
       "key": "denomination",
-      "description": "Layer 'Wayside Shrines' shows denomination=orthodox with a fixed text, namely 'The religious subdenomination is Orthodox' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=christian)",
+      "description": "Layer 'Wayside Shrines and Crosses' shows denomination=orthodox with a fixed text, namely 'The religious subdenomination is Orthodox' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=christian)",
       "value": "orthodox"
     },
     {
       "key": "denomination",
-      "description": "Layer 'Wayside Shrines' shows denomination=greek_orthodox with a fixed text, namely 'The religious subdenomination is Greek-Orthodox' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=christian)",
+      "description": "Layer 'Wayside Shrines and Crosses' shows denomination=greek_orthodox with a fixed text, namely 'The religious subdenomination is Greek-Orthodox' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=christian)",
       "value": "greek_orthodox"
     },
     {
       "key": "denomination",
-      "description": "Layer 'Wayside Shrines' shows denomination=russian_orthodox with a fixed text, namely 'The religious subdenomination is Russian-Orthodox' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=christian)",
+      "description": "Layer 'Wayside Shrines and Crosses' shows denomination=russian_orthodox with a fixed text, namely 'The religious subdenomination is Russian-Orthodox' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=christian)",
       "value": "russian_orthodox"
     },
     {
       "key": "denomination",
-      "description": "Layer 'Wayside Shrines' shows denomination=serbian_orthodox with a fixed text, namely 'The religious subdenomination is Serbian Orthodox' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=christian)",
+      "description": "Layer 'Wayside Shrines and Crosses' shows denomination=serbian_orthodox with a fixed text, namely 'The religious subdenomination is Serbian Orthodox' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=christian)",
       "value": "serbian_orthodox"
     },
     {
       "key": "denomination",
-      "description": "Layer 'Wayside Shrines' shows denomination=protestant with a fixed text, namely 'The religious subdenomination is Protestant' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=christian)",
+      "description": "Layer 'Wayside Shrines and Crosses' shows denomination=protestant with a fixed text, namely 'The religious subdenomination is Protestant' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=christian)",
       "value": "protestant"
     },
     {
       "key": "denomination",
-      "description": "Layer 'Wayside Shrines' shows denomination=anglican with a fixed text, namely 'The religious subdenomination is Anglican' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=christian)",
+      "description": "Layer 'Wayside Shrines and Crosses' shows denomination=anglican with a fixed text, namely 'The religious subdenomination is Anglican' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=christian)",
       "value": "anglican"
     },
     {
       "key": "denomination",
-      "description": "Layer 'Wayside Shrines' shows denomination=adventist with a fixed text, namely 'The religious subdenomination is Adventist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=christian)",
+      "description": "Layer 'Wayside Shrines and Crosses' shows denomination=adventist with a fixed text, namely 'The religious subdenomination is Adventist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=christian)",
       "value": "adventist"
     },
     {
       "key": "denomination",
-      "description": "Layer 'Wayside Shrines' shows denomination=evangelical with a fixed text, namely 'The religious subdenomination is evangelical' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=christian)",
+      "description": "Layer 'Wayside Shrines and Crosses' shows denomination=evangelical with a fixed text, namely 'The religious subdenomination is evangelical' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=christian)",
       "value": "evangelical"
     },
     {
       "key": "denomination",
-      "description": "Layer 'Wayside Shrines' shows and asks freeform values for key 'denomination' (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=muslim)"
+      "description": "Layer 'Wayside Shrines and Crosses' shows and asks freeform values for key 'denomination' (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=muslim)"
     },
     {
       "key": "denomination",
-      "description": "Layer 'Wayside Shrines' shows denomination=shia with a fixed text, namely 'The religious subdenomination is Shia' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=muslim)",
+      "description": "Layer 'Wayside Shrines and Crosses' shows denomination=shia with a fixed text, namely 'The religious subdenomination is Shia' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=muslim)",
       "value": "shia"
     },
     {
       "key": "denomination",
-      "description": "Layer 'Wayside Shrines' shows denomination=sunni with a fixed text, namely 'The religious subdenomination is Sunni' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=muslim)",
+      "description": "Layer 'Wayside Shrines and Crosses' shows denomination=sunni with a fixed text, namely 'The religious subdenomination is Sunni' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=muslim)",
       "value": "sunni"
     },
     {
       "key": "denomination",
-      "description": "Layer 'Wayside Shrines' shows denomination=sufi with a fixed text, namely 'The religious subdenomination is Sufi' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=muslim)",
+      "description": "Layer 'Wayside Shrines and Crosses' shows denomination=sufi with a fixed text, namely 'The religious subdenomination is Sufi' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=muslim)",
       "value": "sufi"
     },
     {
       "key": "denomination",
-      "description": "Layer 'Wayside Shrines' shows and asks freeform values for key 'denomination' (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=jewish)"
+      "description": "Layer 'Wayside Shrines and Crosses' shows and asks freeform values for key 'denomination' (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=jewish)"
     },
     {
       "key": "denomination",
-      "description": "Layer 'Wayside Shrines' shows denomination=conservative with a fixed text, namely 'The religious subdenomination is Conservative' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=jewish)",
+      "description": "Layer 'Wayside Shrines and Crosses' shows denomination=conservative with a fixed text, namely 'The religious subdenomination is Conservative' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=jewish)",
       "value": "conservative"
     },
     {
       "key": "denomination",
-      "description": "Layer 'Wayside Shrines' shows denomination=orthodox with a fixed text, namely 'The religious subdenomination is Orthodox' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=jewish)",
+      "description": "Layer 'Wayside Shrines and Crosses' shows denomination=orthodox with a fixed text, namely 'The religious subdenomination is Orthodox' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=jewish)",
       "value": "orthodox"
     },
     {
       "key": "denomination",
-      "description": "Layer 'Wayside Shrines' shows denomination=hasidic with a fixed text, namely 'The religious subdenomination is Hasidic' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=jewish)",
+      "description": "Layer 'Wayside Shrines and Crosses' shows denomination=hasidic with a fixed text, namely 'The religious subdenomination is Hasidic' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=jewish)",
       "value": "hasidic"
     },
     {
       "key": "denomination",
-      "description": "Layer 'Wayside Shrines' shows denomination=reform with a fixed text, namely 'The religious subdenomination is Reform' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=jewish)",
+      "description": "Layer 'Wayside Shrines and Crosses' shows denomination=reform with a fixed text, namely 'The religious subdenomination is Reform' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion=jewish)",
       "value": "reform"
     },
     {
       "key": "denomination",
-      "description": "Layer 'Wayside Shrines' shows and asks freeform values for key 'denomination' (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion!=christian & religion!=muslim & religion!=jewish & religion~.+)"
+      "description": "Layer 'Wayside Shrines and Crosses' shows and asks freeform values for key 'denomination' (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if religion!=christian & religion!=muslim & religion!=jewish & religion~.+)"
     },
     {
       "key": "level",
-      "description": "Layer 'Wayside Shrines' shows and asks freeform values for key 'level' (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if repeat_on=)"
+      "description": "Layer 'Wayside Shrines and Crosses' shows and asks freeform values for key 'level' (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if repeat_on=)"
     },
     {
       "key": "location",
-      "description": "Layer 'Wayside Shrines' shows location=underground with a fixed text, namely 'Located underground' (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if repeat_on=)",
+      "description": "Layer 'Wayside Shrines and Crosses' shows location=underground with a fixed text, namely 'Located underground' (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if repeat_on=)",
       "value": "underground"
     },
     {
       "key": "level",
-      "description": "Layer 'Wayside Shrines' shows level=0 with a fixed text, namely 'Located on the ground floor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if repeat_on=)",
+      "description": "Layer 'Wayside Shrines and Crosses' shows level=0 with a fixed text, namely 'Located on the ground floor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if repeat_on=)",
       "value": "0"
     },
     {
       "key": "level",
-      "description": "Layer 'Wayside Shrines' shows level= with a fixed text, namely 'Located on the ground floor' (in the mapcomplete.org theme 'Wayside shrines') Picking this answer will delete the key level. (This is only shown if repeat_on=)",
+      "description": "Layer 'Wayside Shrines and Crosses' shows level= with a fixed text, namely 'Located on the ground floor' (in the mapcomplete.org theme 'Wayside shrines') Picking this answer will delete the key level. (This is only shown if repeat_on=)",
       "value": ""
     },
     {
       "key": "level",
-      "description": "Layer 'Wayside Shrines' shows level=1 with a fixed text, namely 'Located on the first floor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if repeat_on=)",
+      "description": "Layer 'Wayside Shrines and Crosses' shows level=1 with a fixed text, namely 'Located on the first floor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if repeat_on=)",
       "value": "1"
     },
     {
       "key": "level",
-      "description": "Layer 'Wayside Shrines' shows level=-1 with a fixed text, namely 'Located on the first basement level' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if repeat_on=)",
+      "description": "Layer 'Wayside Shrines and Crosses' shows level=-1 with a fixed text, namely 'Located on the first basement level' and allows to pick this as a default answer (in the mapcomplete.org theme 'Wayside shrines') (This is only shown if repeat_on=)",
       "value": "-1"
     },
     {