diff --git a/Docs/BuiltinLayers.md b/Docs/BuiltinLayers.md
index 659005e751..e9eb25ab0f 100644
--- a/Docs/BuiltinLayers.md
+++ b/Docs/BuiltinLayers.md
@@ -12,6 +12,7 @@
     + [home_location](#home_location)
     + [gps_track](#gps_track)
     + [type_node](#type_node)
+    + [note](#note)
     + [conflation](#conflation)
     + [left_right_style](#left_right_style)
     + [split_point](#split_point)
@@ -85,6 +86,8 @@
       * [Themes using this layer](#themes-using-this-layer)
     + [nature_reserve](#nature_reserve)
       * [Themes using this layer](#themes-using-this-layer)
+    + [note_import](#note_import)
+      * [Themes using this layer](#themes-using-this-layer)
     + [observation_tower](#observation_tower)
       * [Themes using this layer](#themes-using-this-layer)
     + [parking](#parking)
@@ -124,6 +127,7 @@
   - [home_location](#home_location)
   - [gps_track](#gps_track)
   - [type_node](#type_node)
+  - [note](#note)
   - [conflation](#conflation)
   - [left_right_style](#left_right_style)
   - [split_point](#split_point)
@@ -205,6 +209,19 @@ This is a priviliged meta_layer which exports _every_ point in OSM. This only wo
   - Not rendered on the map by default. If you want to rendering this on the map, override `mapRenderings`
  
 
+### note 
+
+
+
+This layer shows notes on OpenStreetMap.
+
+[Go to the source code](../assets/layers/note/note.json)
+
+
+
+
+ 
+
 ### conflation 
 
 
@@ -450,6 +467,7 @@ Special builtin layer providing all walls and buildings. This layer is useful in
   - [hydrant](#hydrant)
   - [information_board](#information_board)
   - [nature_reserve](#nature_reserve)
+  - [note_import](#note_import)
   - [observation_tower](#observation_tower)
   - [parking](#parking)
   - [pedestrian_path](#pedestrian_path)
@@ -1143,6 +1161,30 @@ Een natuurgebied is een gebied waar actief ruimte gemaakt word voor de natuur. T
   - [nature](https://mapcomplete.osm.be/nature)
  
 
+### note_import 
+
+
+
+Template for note note imports.
+
+[Go to the source code](../assets/layers/note_import/note_import.json)
+
+
+
+  - This layer will automatically load  [public_bookcase](#public_bookcase)  into the layout as it depends on it:  a tagrendering needs this layer (import)
+
+
+
+
+#### Themes using this layer 
+
+
+
+
+
+  - [bookcases](https://mapcomplete.osm.be/bookcases)
+ 
+
 ### observation_tower 
 
 
@@ -1273,7 +1315,7 @@ A streetside cabinet with books, accessible to anyone
 
 
 
-
+  - This layer is needed as dependency for layer [note_import](#note_import)
 
 
 
diff --git a/Docs/CalculatedTags.md b/Docs/CalculatedTags.md
index 02bf6103c9..ae3ae85d68 100644
--- a/Docs/CalculatedTags.md
+++ b/Docs/CalculatedTags.md
@@ -13,7 +13,7 @@
     + [_length, _length:km](#_length,-_lengthkm)
     + [Theme-defined keys](#theme-defined-keys)
     + [_country](#_country)
-    + [_isOpen, _isOpen:description](#_isopen,-_isopendescription)
+    + [_isOpen](#_isopen)
     + [_direction:numerical, _direction:leftright](#_directionnumerical,-_direction:leftright)
     + [_now:date, _now:datetime, _loaded:date, _loaded:_datetime](#_nowdate,-_now:datetime,-_loaded:date,-_loaded:_datetime)
     + [_last_edit:contributor, _last_edit:contributor:uid, _last_edit:changeset, _last_edit:timestamp, _version_number, _backend](#_last_editcontributor,-_last_edit:contributor:uid,-_last_edit:changeset,-_last_edit:timestamp,-_version_number,-_backend)
@@ -104,7 +104,7 @@ The country code of the property (with latlon2country)
 
 
 
-### _isOpen, _isOpen:description 
+### _isOpen 
 
 
 
diff --git a/Docs/SpecialRenderings.md b/Docs/SpecialRenderings.md
index ba5b54f54b..8039b7f12f 100644
--- a/Docs/SpecialRenderings.md
+++ b/Docs/SpecialRenderings.md
@@ -48,6 +48,14 @@
       * [Example usage of open_in_iD](#example-usage-of-open_in_id)
     + [clear_location_history](#clear_location_history)
       * [Example usage of clear_location_history](#example-usage-of-clear_location_history)
+    + [close_note](#close_note)
+      * [Example usage of close_note](#example-usage-of-close_note)
+    + [add_note_comment](#add_note_comment)
+      * [Example usage of add_note_comment](#example-usage-of-add_note_comment)
+    + [visualize_note_comments](#visualize_note_comments)
+      * [Example usage of visualize_note_comments](#example-usage-of-visualize_note_comments)
+    + [add_image_to_note](#add_image_to_note)
+      * [Example usage of add_image_to_note](#example-usage-of-add_image_to_note)
     + [auto_apply](#auto_apply)
       * [Example usage of auto_apply](#example-usage-of-auto_apply)
 
@@ -223,7 +231,7 @@ It is only functional in official themes, but can be tested in unoffical themes.
 
 #### Specifying which tags to copy or add
 
-The argument `tags` of the import button takes a `;`-seperated list of tags to add.
+The argument `tags` of the import button takes a `;`-seperated list of tags to add (or the name of a property which contains a JSON-list of properties).
 
 These can either be a tag to add, such as `amenity=fast_food` or can use a substitution, e.g. `addr:housenumber=$number`. 
 This new point will then have the tags `amenity=fast_food` and `addr:housenumber` with the value that was saved in `number` in the original feature. 
@@ -264,16 +272,17 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
 name | default | description
 ------ | --------- | -------------
 targetLayer | _undefined_ | The id of the layer where this point should end up. This is not very strict, it will simply result in checking that this layer is shown preventing possible duplicate elements
-tags | _undefined_ | The tags to add onto the new object - see specification above
+tags | _undefined_ | The tags to add onto the new object - see specification above. If this is a key (a single word occuring in the properties of the object), the corresponding value is taken and expanded instead
 text | Import this data into OpenStreetMap | The text to show on the button
 icon | ./assets/svg/addSmall.svg | A nice icon to show in the button
 snap_onto_layers | _undefined_ | If a way of the given layer(s) is closeby, will snap the new point onto this way (similar as preset might snap). To show multiple layers to snap onto, use a `;`-seperated list
 max_snap_distance | 5 | The maximum distance that the imported point will be moved to snap onto a way in an already existing layer (in meters). This is previewed to the contributor, similar to the 'add new point'-action of MapComplete
+note_id | _undefined_ | If given, this key will be read. The corresponding note on OSM will be closed, stating 'imported'
  
 
 #### Example usage of import_button 
 
- `{import_button(,,Import this data into OpenStreetMap,./assets/svg/addSmall.svg,,5)}` 
+ `{import_button(,,Import this data into OpenStreetMap,./assets/svg/addSmall.svg,,5,)}` 
 
 ### import_way_button 
 
@@ -284,7 +293,7 @@ It is only functional in official themes, but can be tested in unoffical themes.
 
 #### Specifying which tags to copy or add
 
-The argument `tags` of the import button takes a `;`-seperated list of tags to add.
+The argument `tags` of the import button takes a `;`-seperated list of tags to add (or the name of a property which contains a JSON-list of properties).
 
 These can either be a tag to add, such as `amenity=fast_food` or can use a substitution, e.g. `addr:housenumber=$number`. 
 This new point will then have the tags `amenity=fast_food` and `addr:housenumber` with the value that was saved in `number` in the original feature. 
@@ -325,7 +334,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
 name | default | description
 ------ | --------- | -------------
 targetLayer | _undefined_ | The id of the layer where this point should end up. This is not very strict, it will simply result in checking that this layer is shown preventing possible duplicate elements
-tags | _undefined_ | The tags to add onto the new object - see specification above
+tags | _undefined_ | The tags to add onto the new object - see specification above. If this is a key (a single word occuring in the properties of the object), the corresponding value is taken and expanded instead
 text | Import this data into OpenStreetMap | The text to show on the button
 icon | ./assets/svg/addSmall.svg | A nice icon to show in the button
 snap_to_point_if | _undefined_ | Points with the given tags will be snapped to or moved
@@ -349,7 +358,7 @@ It is only functional in official themes, but can be tested in unoffical themes.
 
 #### Specifying which tags to copy or add
 
-The argument `tags` of the import button takes a `;`-seperated list of tags to add.
+The argument `tags` of the import button takes a `;`-seperated list of tags to add (or the name of a property which contains a JSON-list of properties).
 
 These can either be a tag to add, such as `amenity=fast_food` or can use a substitution, e.g. `addr:housenumber=$number`. 
 This new point will then have the tags `amenity=fast_food` and `addr:housenumber` with the value that was saved in `number` in the original feature. 
@@ -390,7 +399,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
 name | default | description
 ------ | --------- | -------------
 targetLayer | _undefined_ | The id of the layer where this point should end up. This is not very strict, it will simply result in checking that this layer is shown preventing possible duplicate elements
-tags | _undefined_ | The tags to add onto the new object - see specification above
+tags | _undefined_ | The tags to add onto the new object - see specification above. If this is a key (a single word occuring in the properties of the object), the corresponding value is taken and expanded instead
 text | Import this data into OpenStreetMap | The text to show on the button
 icon | ./assets/svg/addSmall.svg | A nice icon to show in the button
 way_to_conflate | _undefined_ | The key, of which the corresponding value is the id of the OSM-way that must be conflated; typically a calculatedTag
@@ -478,6 +487,62 @@ id_of_object_to_apply_this_one | _undefined_ | If specified, applies the the tag
 
  `{clear_location_history()}` 
 
+### close_note 
+
+ Button to close a note - eventually with a prefixed text 
+
+name | default | description
+------ | --------- | -------------
+text | _undefined_ | Text to show on this button
+icon | checkmark.svg | Icon to show
+Id-key | id | The property name where the ID of the note to close can be found
+comment | _undefined_ | Text to add onto the note when closing
+ 
+
+#### Example usage of close_note 
+
+ `{close_note(,checkmark.svg,id,)}` 
+
+### add_note_comment 
+
+ A textfield to add a comment to a node (with the option to close the note). 
+
+name | default | description
+------ | --------- | -------------
+Id-key | id | The property name where the ID of the note to close can be found
+ 
+
+#### Example usage of add_note_comment 
+
+ `{add_note_comment(id)}` 
+
+### visualize_note_comments 
+
+ Visualises the comments for notes 
+
+name | default | description
+------ | --------- | -------------
+commentsKey | comments | The property name of the comments, which should be stringified json
+start | 0 | Drop the first 'start' comments
+ 
+
+#### Example usage of visualize_note_comments 
+
+ `{visualize_note_comments(comments,0)}` 
+
+### add_image_to_note 
+
+ Adds an image to a node 
+
+name | default | description
+------ | --------- | -------------
+Id-key | id | The property name where the ID of the note to close can be found
+ 
+
+#### Example usage of add_image_to_note 
+
+ `{add_image_to_note(id)}` 
+
 ### auto_apply 
 
  A button to run many actions for many features at once.
diff --git a/Docs/TagInfo/mapcomplete_aed.json b/Docs/TagInfo/mapcomplete_aed.json
index 3e5655917a..8003a6d061 100644
--- a/Docs/TagInfo/mapcomplete_aed.json
+++ b/Docs/TagInfo/mapcomplete_aed.json
@@ -72,7 +72,7 @@
     },
     {
       "key": "defibrillator",
-      "description": "Layer 'Defibrillators' shows <span class='line-through'>defibrillator</span> with a fixed text, namely 'There is no info about the type of device' (in the MapComplete.osm.be theme 'Open AED Map') Picking this answer will delete the key defibrillator.",
+      "description": "Layer 'Defibrillators' shows  with a fixed text, namely 'There is no info about the type of device' (in the MapComplete.osm.be theme 'Open AED Map') Picking this answer will delete the key defibrillator.",
       "value": ""
     },
     {
diff --git a/Docs/TagInfo/mapcomplete_bicyclelib.json b/Docs/TagInfo/mapcomplete_bicyclelib.json
index 9120a4b0a2..cd9e68bd31 100644
--- a/Docs/TagInfo/mapcomplete_bicyclelib.json
+++ b/Docs/TagInfo/mapcomplete_bicyclelib.json
@@ -39,14 +39,26 @@
       "key": "website",
       "description": "Layer 'Bicycle library' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Bicycle libraries')"
     },
+    {
+      "key": "contact:website",
+      "description": "Layer 'Bicycle library' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Bicycle libraries')"
+    },
     {
       "key": "phone",
       "description": "Layer 'Bicycle library' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Bicycle libraries')"
     },
+    {
+      "key": "contact:phone",
+      "description": "Layer 'Bicycle library' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Bicycle libraries')"
+    },
     {
       "key": "email",
       "description": "Layer 'Bicycle library' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Bicycle libraries')"
     },
+    {
+      "key": "contact:email",
+      "description": "Layer 'Bicycle library' shows contact:email~^..*$ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Bicycle libraries')"
+    },
     {
       "key": "opening_hours",
       "description": "Layer 'Bicycle library' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Bicycle libraries')"
@@ -57,12 +69,12 @@
     },
     {
       "key": "fee",
-      "description": "Layer 'Bicycle library' shows fee=no&<span class='line-through'>charge</span> with a fixed text, namely 'Lending a bicycle is free' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle libraries')",
+      "description": "Layer 'Bicycle library' shows fee=no with a fixed text, namely 'Lending a bicycle is free' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle libraries')",
       "value": "no"
     },
     {
       "key": "charge",
-      "description": "Layer 'Bicycle library' shows fee=no&<span class='line-through'>charge</span> with a fixed text, namely 'Lending a bicycle is free' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle libraries') Picking this answer will delete the key charge.",
+      "description": "Layer 'Bicycle library' shows fee=no with a fixed text, namely 'Lending a bicycle is free' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle libraries') Picking this answer will delete the key charge.",
       "value": ""
     },
     {
diff --git a/Docs/TagInfo/mapcomplete_binoculars.json b/Docs/TagInfo/mapcomplete_binoculars.json
index e02b95dcbd..11114fb8e1 100644
--- a/Docs/TagInfo/mapcomplete_binoculars.json
+++ b/Docs/TagInfo/mapcomplete_binoculars.json
@@ -37,12 +37,12 @@
     },
     {
       "key": "fee",
-      "description": "Layer 'Binoculars' shows fee=no&<span class='line-through'>charge</span> with a fixed text, namely 'Free to use' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Binoculars')",
+      "description": "Layer 'Binoculars' shows fee=no with a fixed text, namely 'Free to use' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Binoculars')",
       "value": "no"
     },
     {
       "key": "charge",
-      "description": "Layer 'Binoculars' shows fee=no&<span class='line-through'>charge</span> with a fixed text, namely 'Free to use' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Binoculars') Picking this answer will delete the key charge.",
+      "description": "Layer 'Binoculars' shows fee=no with a fixed text, namely 'Free to use' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Binoculars') Picking this answer will delete the key charge.",
       "value": ""
     },
     {
diff --git a/Docs/TagInfo/mapcomplete_bookcases.json b/Docs/TagInfo/mapcomplete_bookcases.json
index 6ae753d18a..ddba7cb5d9 100644
--- a/Docs/TagInfo/mapcomplete_bookcases.json
+++ b/Docs/TagInfo/mapcomplete_bookcases.json
@@ -2,7 +2,7 @@
   "data_format": 1,
   "project": {
     "name": "MapComplete Open Bookcase Map",
-    "description": "A public bookcase is a small streetside cabinet, box, old phone boot or some other objects where books are stored",
+    "description": "A public bookcase is a small streetside cabinet, box, old phone booth or some other objects where books are stored",
     "project_url": "https://mapcomplete.osm.be/bookcases",
     "doc_url": "https://github.com/pietervdvn/MapComplete/tree/master/assets/themes/",
     "icon_url": "https://mapcomplete.osm.be/assets/themes/bookcases/bookcase.svg",
@@ -37,12 +37,12 @@
     },
     {
       "key": "noname",
-      "description": "Layer 'Bookcases' shows noname=yes&<span class='line-through'>name</span> with a fixed text, namely 'This bookcase doesn't have a name' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Bookcase Map')",
+      "description": "Layer 'Bookcases' shows noname=yes with a fixed text, namely 'This bookcase doesn't have a name' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Bookcase Map')",
       "value": "yes"
     },
     {
       "key": "name",
-      "description": "Layer 'Bookcases' shows noname=yes&<span class='line-through'>name</span> with a fixed text, namely 'This bookcase doesn't have a name' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Bookcase Map') Picking this answer will delete the key name.",
+      "description": "Layer 'Bookcases' shows noname=yes with a fixed text, namely 'This bookcase doesn't have a name' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Bookcase Map') Picking this answer will delete the key name.",
       "value": ""
     },
     {
@@ -76,7 +76,7 @@
     },
     {
       "key": "indoor",
-      "description": "Layer 'Bookcases' shows <span class='line-through'>indoor</span> with a fixed text, namely 'This bookcase is located outdoors' (in the MapComplete.osm.be theme 'Open Bookcase Map') Picking this answer will delete the key indoor.",
+      "description": "Layer 'Bookcases' shows  with a fixed text, namely 'This bookcase is located outdoors' (in the MapComplete.osm.be theme 'Open Bookcase Map') Picking this answer will delete the key indoor.",
       "value": ""
     },
     {
@@ -99,22 +99,22 @@
     },
     {
       "key": "brand",
-      "description": "Layer 'Bookcases' shows brand=Little Free Library&<span class='line-through'>nobrand</span> with a fixed text, namely 'Part of the network 'Little Free Library'' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Bookcase Map')",
+      "description": "Layer 'Bookcases' shows brand=Little Free Library with a fixed text, namely 'Part of the network 'Little Free Library'' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Bookcase Map')",
       "value": "Little Free Library"
     },
     {
       "key": "nobrand",
-      "description": "Layer 'Bookcases' shows brand=Little Free Library&<span class='line-through'>nobrand</span> with a fixed text, namely 'Part of the network 'Little Free Library'' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Bookcase Map') Picking this answer will delete the key nobrand.",
+      "description": "Layer 'Bookcases' shows brand=Little Free Library with a fixed text, namely 'Part of the network 'Little Free Library'' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Bookcase Map') Picking this answer will delete the key nobrand.",
       "value": ""
     },
     {
       "key": "nobrand",
-      "description": "Layer 'Bookcases' shows nobrand=yes&<span class='line-through'>brand</span> with a fixed text, namely 'This public bookcase is not part of a bigger network' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Bookcase Map')",
+      "description": "Layer 'Bookcases' shows nobrand=yes with a fixed text, namely 'This public bookcase is not part of a bigger network' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Bookcase Map')",
       "value": "yes"
     },
     {
       "key": "brand",
-      "description": "Layer 'Bookcases' shows nobrand=yes&<span class='line-through'>brand</span> with a fixed text, namely 'This public bookcase is not part of a bigger network' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Bookcase Map') Picking this answer will delete the key brand.",
+      "description": "Layer 'Bookcases' shows nobrand=yes with a fixed text, namely 'This public bookcase is not part of a bigger network' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Bookcase Map') Picking this answer will delete the key brand.",
       "value": ""
     },
     {
@@ -123,17 +123,17 @@
     },
     {
       "key": "nobrand",
-      "description": "Layer 'Bookcases' shows nobrand=yes&<span class='line-through'>brand</span>&<span class='line-through'>ref</span> with a fixed text, namely 'This bookcase is not part of a bigger network' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Bookcase Map')",
+      "description": "Layer 'Bookcases' shows nobrand=yes with a fixed text, namely 'This bookcase is not part of a bigger network' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Bookcase Map')",
       "value": "yes"
     },
     {
       "key": "brand",
-      "description": "Layer 'Bookcases' shows nobrand=yes&<span class='line-through'>brand</span>&<span class='line-through'>ref</span> with a fixed text, namely 'This bookcase is not part of a bigger network' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Bookcase Map') Picking this answer will delete the key brand.",
+      "description": "Layer 'Bookcases' shows nobrand=yes with a fixed text, namely 'This bookcase is not part of a bigger network' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Bookcase Map') Picking this answer will delete the key brand.",
       "value": ""
     },
     {
       "key": "ref",
-      "description": "Layer 'Bookcases' shows nobrand=yes&<span class='line-through'>brand</span>&<span class='line-through'>ref</span> with a fixed text, namely 'This bookcase is not part of a bigger network' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Bookcase Map') Picking this answer will delete the key ref.",
+      "description": "Layer 'Bookcases' shows nobrand=yes with a fixed text, namely 'This bookcase is not part of a bigger network' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Bookcase Map') Picking this answer will delete the key ref.",
       "value": ""
     },
     {
@@ -144,6 +144,10 @@
       "key": "website",
       "description": "Layer 'Bookcases' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Open Bookcase Map')"
     },
+    {
+      "key": "id",
+      "description": "The MapComplete theme Open Bookcase Map has a layer Possible bookcases showing features with this tag"
+    },
     {
       "key": "id",
       "description": "The MapComplete theme Open Bookcase Map has a layer Your track showing features with this tag",
diff --git a/Docs/TagInfo/mapcomplete_cafes_and_pubs.json b/Docs/TagInfo/mapcomplete_cafes_and_pubs.json
index 7e152fb841..87d1edc2b8 100644
--- a/Docs/TagInfo/mapcomplete_cafes_and_pubs.json
+++ b/Docs/TagInfo/mapcomplete_cafes_and_pubs.json
@@ -83,14 +83,26 @@
       "key": "website",
       "description": "Layer 'Cafés and pubs' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Cafés and pubs')"
     },
+    {
+      "key": "contact:website",
+      "description": "Layer 'Cafés and pubs' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Cafés and pubs')"
+    },
     {
       "key": "email",
       "description": "Layer 'Cafés and pubs' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Cafés and pubs')"
     },
+    {
+      "key": "contact:email",
+      "description": "Layer 'Cafés and pubs' shows contact:email~^..*$ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Cafés and pubs')"
+    },
     {
       "key": "phone",
       "description": "Layer 'Cafés and pubs' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Cafés and pubs')"
     },
+    {
+      "key": "contact:phone",
+      "description": "Layer 'Cafés and pubs' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Cafés and pubs')"
+    },
     {
       "key": "payment:cash",
       "description": "Layer 'Cafés and pubs' shows payment:cash=yes with a fixed text, namely 'Cash is accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cafés and pubs')",
diff --git a/Docs/TagInfo/mapcomplete_campersite.json b/Docs/TagInfo/mapcomplete_campersite.json
index 26721d0c3d..959fc26873 100644
--- a/Docs/TagInfo/mapcomplete_campersite.json
+++ b/Docs/TagInfo/mapcomplete_campersite.json
@@ -42,12 +42,12 @@
     },
     {
       "key": "fee",
-      "description": "Layer 'Camper sites' shows fee=no&<span class='line-through'>charge</span> with a fixed text, namely 'Can be used for free' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Campersites')",
+      "description": "Layer 'Camper sites' shows fee=no with a fixed text, namely 'Can be used for free' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Campersites')",
       "value": "no"
     },
     {
       "key": "charge",
-      "description": "Layer 'Camper sites' shows fee=no&<span class='line-through'>charge</span> with a fixed text, namely 'Can be used for free' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Campersites') Picking this answer will delete the key charge.",
+      "description": "Layer 'Camper sites' shows fee=no with a fixed text, namely 'Can be used for free' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Campersites') Picking this answer will delete the key charge.",
       "value": ""
     },
     {
@@ -136,20 +136,6 @@
       "key": "description",
       "description": "Layer 'Camper sites' shows and asks freeform values for key 'description' (in the MapComplete.osm.be theme 'Campersites')"
     },
-    {
-      "key": "operator",
-      "description": "Layer 'Camper sites' shows and asks freeform values for key 'operator' (in the MapComplete.osm.be theme 'Campersites')"
-    },
-    {
-      "key": "power_supply",
-      "description": "Layer 'Camper sites' shows power_supply=yes with a fixed text, namely 'This place has a power supply' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Campersites')",
-      "value": "yes"
-    },
-    {
-      "key": "power_supply",
-      "description": "Layer 'Camper sites' shows power_supply=no with a fixed text, namely 'This place does not have power supply' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Campersites')",
-      "value": "no"
-    },
     {
       "key": "amenity",
       "description": "The MapComplete theme Campersites has a layer Sanitary dump stations showing features with this tag",
@@ -239,20 +225,6 @@
       "key": "network",
       "description": "Layer 'Sanitary dump stations' shows and asks freeform values for key 'network' (in the MapComplete.osm.be theme 'Campersites')"
     },
-    {
-      "key": "operator",
-      "description": "Layer 'Sanitary dump stations' shows and asks freeform values for key 'operator' (in the MapComplete.osm.be theme 'Campersites')"
-    },
-    {
-      "key": "power_supply",
-      "description": "Layer 'Sanitary dump stations' shows power_supply=yes with a fixed text, namely 'This place has a power supply' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Campersites')",
-      "value": "yes"
-    },
-    {
-      "key": "power_supply",
-      "description": "Layer 'Sanitary dump stations' shows power_supply=no with a fixed text, namely 'This place does not have power supply' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Campersites')",
-      "value": "no"
-    },
     {
       "key": "id",
       "description": "The MapComplete theme Campersites has a layer Your track showing features with this tag",
diff --git a/Docs/TagInfo/mapcomplete_charging_stations.json b/Docs/TagInfo/mapcomplete_charging_stations.json
index a816304f6a..4fdb903d94 100644
--- a/Docs/TagInfo/mapcomplete_charging_stations.json
+++ b/Docs/TagInfo/mapcomplete_charging_stations.json
@@ -895,42 +895,42 @@
     },
     {
       "key": "fee",
-      "description": "Layer 'Charging stations' shows fee=no&<span class='line-through'>fee:conditional</span>&<span class='line-through'>charge</span>&authentication:none=yes with a fixed text, namely 'Free to use (without authenticating)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
+      "description": "Layer 'Charging stations' shows fee=no&authentication:none=yes with a fixed text, namely 'Free to use (without authenticating)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
       "value": "no"
     },
     {
       "key": "fee:conditional",
-      "description": "Layer 'Charging stations' shows fee=no&<span class='line-through'>fee:conditional</span>&<span class='line-through'>charge</span>&authentication:none=yes with a fixed text, namely 'Free to use (without authenticating)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key fee:conditional.",
+      "description": "Layer 'Charging stations' shows fee=no&authentication:none=yes with a fixed text, namely 'Free to use (without authenticating)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key fee:conditional.",
       "value": ""
     },
     {
       "key": "charge",
-      "description": "Layer 'Charging stations' shows fee=no&<span class='line-through'>fee:conditional</span>&<span class='line-through'>charge</span>&authentication:none=yes with a fixed text, namely 'Free to use (without authenticating)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key charge.",
+      "description": "Layer 'Charging stations' shows fee=no&authentication:none=yes with a fixed text, namely 'Free to use (without authenticating)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key charge.",
       "value": ""
     },
     {
       "key": "authentication:none",
-      "description": "Layer 'Charging stations' shows fee=no&<span class='line-through'>fee:conditional</span>&<span class='line-through'>charge</span>&authentication:none=yes with a fixed text, namely 'Free to use (without authenticating)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
+      "description": "Layer 'Charging stations' shows fee=no&authentication:none=yes with a fixed text, namely 'Free to use (without authenticating)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
       "value": "yes"
     },
     {
       "key": "fee",
-      "description": "Layer 'Charging stations' shows fee=no&<span class='line-through'>fee:conditional</span>&<span class='line-through'>charge</span>&authentication:none=no with a fixed text, namely 'Free to use, but one has to authenticate' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
+      "description": "Layer 'Charging stations' shows fee=no&authentication:none=no with a fixed text, namely 'Free to use, but one has to authenticate' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
       "value": "no"
     },
     {
       "key": "fee:conditional",
-      "description": "Layer 'Charging stations' shows fee=no&<span class='line-through'>fee:conditional</span>&<span class='line-through'>charge</span>&authentication:none=no with a fixed text, namely 'Free to use, but one has to authenticate' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key fee:conditional.",
+      "description": "Layer 'Charging stations' shows fee=no&authentication:none=no with a fixed text, namely 'Free to use, but one has to authenticate' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key fee:conditional.",
       "value": ""
     },
     {
       "key": "charge",
-      "description": "Layer 'Charging stations' shows fee=no&<span class='line-through'>fee:conditional</span>&<span class='line-through'>charge</span>&authentication:none=no with a fixed text, namely 'Free to use, but one has to authenticate' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key charge.",
+      "description": "Layer 'Charging stations' shows fee=no&authentication:none=no with a fixed text, namely 'Free to use, but one has to authenticate' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key charge.",
       "value": ""
     },
     {
       "key": "authentication:none",
-      "description": "Layer 'Charging stations' shows fee=no&<span class='line-through'>fee:conditional</span>&<span class='line-through'>charge</span>&authentication:none=no with a fixed text, namely 'Free to use, but one has to authenticate' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
+      "description": "Layer 'Charging stations' shows fee=no&authentication:none=no with a fixed text, namely 'Free to use, but one has to authenticate' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
       "value": "no"
     },
     {
@@ -945,12 +945,12 @@
     },
     {
       "key": "fee",
-      "description": "Layer 'Charging stations' shows fee=yes&<span class='line-through'>fee:conditional</span> with a fixed text, namely 'Paid use' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
+      "description": "Layer 'Charging stations' shows fee=yes with a fixed text, namely 'Paid use' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
       "value": "yes"
     },
     {
       "key": "fee:conditional",
-      "description": "Layer 'Charging stations' shows fee=yes&<span class='line-through'>fee:conditional</span> with a fixed text, namely 'Paid use' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key fee:conditional.",
+      "description": "Layer 'Charging stations' shows fee=yes with a fixed text, namely 'Paid use' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key fee:conditional.",
       "value": ""
     },
     {
@@ -967,16 +967,6 @@
       "description": "Layer 'Charging stations' shows payment:cards=yes with a fixed text, namely 'Payment cards are accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
       "value": "yes"
     },
-    {
-      "key": "payment:app",
-      "description": "Layer 'Charging stations' shows payment:app=yes with a fixed text, namely 'Payment is done using a dedicated app' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
-      "value": "yes"
-    },
-    {
-      "key": "payment:membership_card",
-      "description": "Layer 'Charging stations' shows payment:membership_card=yes with a fixed text, namely 'Payment is done using a membership card' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
-      "value": "yes"
-    },
     {
       "key": "authentication:membership_card",
       "description": "Layer 'Charging stations' shows authentication:membership_card=yes with a fixed text, namely 'Authentication by a membership card' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
@@ -1111,7 +1101,7 @@
     },
     {
       "key": "level",
-      "description": "Layer 'Charging stations' shows <span class='line-through'>level</span> with a fixed text, namely 'Located on the ground floor' (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key level.",
+      "description": "Layer 'Charging stations' shows  with a fixed text, namely 'Located on the ground floor' (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key level.",
       "value": ""
     },
     {
@@ -1125,127 +1115,127 @@
     },
     {
       "key": "planned:amenity",
-      "description": "Layer 'Charging stations' shows <span class='line-through'>planned:amenity</span>&<span class='line-through'>construction:amenity</span>&<span class='line-through'>disused:amenity</span>&<span class='line-through'>operational_status</span>&amenity=charging_station with a fixed text, namely 'This charging station works' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key planned:amenity.",
+      "description": "Layer 'Charging stations' shows amenity=charging_station with a fixed text, namely 'This charging station works' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key planned:amenity.",
       "value": ""
     },
     {
       "key": "construction:amenity",
-      "description": "Layer 'Charging stations' shows <span class='line-through'>planned:amenity</span>&<span class='line-through'>construction:amenity</span>&<span class='line-through'>disused:amenity</span>&<span class='line-through'>operational_status</span>&amenity=charging_station with a fixed text, namely 'This charging station works' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key construction:amenity.",
+      "description": "Layer 'Charging stations' shows amenity=charging_station with a fixed text, namely 'This charging station works' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key construction:amenity.",
       "value": ""
     },
     {
       "key": "disused:amenity",
-      "description": "Layer 'Charging stations' shows <span class='line-through'>planned:amenity</span>&<span class='line-through'>construction:amenity</span>&<span class='line-through'>disused:amenity</span>&<span class='line-through'>operational_status</span>&amenity=charging_station with a fixed text, namely 'This charging station works' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key disused:amenity.",
+      "description": "Layer 'Charging stations' shows amenity=charging_station with a fixed text, namely 'This charging station works' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key disused:amenity.",
       "value": ""
     },
     {
       "key": "operational_status",
-      "description": "Layer 'Charging stations' shows <span class='line-through'>planned:amenity</span>&<span class='line-through'>construction:amenity</span>&<span class='line-through'>disused:amenity</span>&<span class='line-through'>operational_status</span>&amenity=charging_station with a fixed text, namely 'This charging station works' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key operational_status.",
+      "description": "Layer 'Charging stations' shows amenity=charging_station with a fixed text, namely 'This charging station works' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key operational_status.",
       "value": ""
     },
     {
       "key": "amenity",
-      "description": "Layer 'Charging stations' shows <span class='line-through'>planned:amenity</span>&<span class='line-through'>construction:amenity</span>&<span class='line-through'>disused:amenity</span>&<span class='line-through'>operational_status</span>&amenity=charging_station with a fixed text, namely 'This charging station works' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
+      "description": "Layer 'Charging stations' shows amenity=charging_station with a fixed text, namely 'This charging station works' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
       "value": "charging_station"
     },
     {
       "key": "planned:amenity",
-      "description": "Layer 'Charging stations' shows <span class='line-through'>planned:amenity</span>&<span class='line-through'>construction:amenity</span>&<span class='line-through'>disused:amenity</span>&operational_status=broken&amenity=charging_station with a fixed text, namely 'This charging station is broken' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key planned:amenity.",
+      "description": "Layer 'Charging stations' shows operational_status=broken&amenity=charging_station with a fixed text, namely 'This charging station is broken' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key planned:amenity.",
       "value": ""
     },
     {
       "key": "construction:amenity",
-      "description": "Layer 'Charging stations' shows <span class='line-through'>planned:amenity</span>&<span class='line-through'>construction:amenity</span>&<span class='line-through'>disused:amenity</span>&operational_status=broken&amenity=charging_station with a fixed text, namely 'This charging station is broken' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key construction:amenity.",
+      "description": "Layer 'Charging stations' shows operational_status=broken&amenity=charging_station with a fixed text, namely 'This charging station is broken' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key construction:amenity.",
       "value": ""
     },
     {
       "key": "disused:amenity",
-      "description": "Layer 'Charging stations' shows <span class='line-through'>planned:amenity</span>&<span class='line-through'>construction:amenity</span>&<span class='line-through'>disused:amenity</span>&operational_status=broken&amenity=charging_station with a fixed text, namely 'This charging station is broken' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key disused:amenity.",
+      "description": "Layer 'Charging stations' shows operational_status=broken&amenity=charging_station with a fixed text, namely 'This charging station is broken' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key disused:amenity.",
       "value": ""
     },
     {
       "key": "operational_status",
-      "description": "Layer 'Charging stations' shows <span class='line-through'>planned:amenity</span>&<span class='line-through'>construction:amenity</span>&<span class='line-through'>disused:amenity</span>&operational_status=broken&amenity=charging_station with a fixed text, namely 'This charging station is broken' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
+      "description": "Layer 'Charging stations' shows operational_status=broken&amenity=charging_station with a fixed text, namely 'This charging station is broken' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
       "value": "broken"
     },
     {
       "key": "amenity",
-      "description": "Layer 'Charging stations' shows <span class='line-through'>planned:amenity</span>&<span class='line-through'>construction:amenity</span>&<span class='line-through'>disused:amenity</span>&operational_status=broken&amenity=charging_station with a fixed text, namely 'This charging station is broken' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
+      "description": "Layer 'Charging stations' shows operational_status=broken&amenity=charging_station with a fixed text, namely 'This charging station is broken' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
       "value": "charging_station"
     },
     {
       "key": "planned:amenity",
-      "description": "Layer 'Charging stations' shows planned:amenity=charging_station&<span class='line-through'>construction:amenity</span>&<span class='line-through'>disused:amenity</span>&<span class='line-through'>operational_status</span>&<span class='line-through'>amenity</span> with a fixed text, namely 'A charging station is planned here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
+      "description": "Layer 'Charging stations' shows planned:amenity=charging_station with a fixed text, namely 'A charging station is planned here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
       "value": "charging_station"
     },
     {
       "key": "construction:amenity",
-      "description": "Layer 'Charging stations' shows planned:amenity=charging_station&<span class='line-through'>construction:amenity</span>&<span class='line-through'>disused:amenity</span>&<span class='line-through'>operational_status</span>&<span class='line-through'>amenity</span> with a fixed text, namely 'A charging station is planned here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key construction:amenity.",
+      "description": "Layer 'Charging stations' shows planned:amenity=charging_station with a fixed text, namely 'A charging station is planned here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key construction:amenity.",
       "value": ""
     },
     {
       "key": "disused:amenity",
-      "description": "Layer 'Charging stations' shows planned:amenity=charging_station&<span class='line-through'>construction:amenity</span>&<span class='line-through'>disused:amenity</span>&<span class='line-through'>operational_status</span>&<span class='line-through'>amenity</span> with a fixed text, namely 'A charging station is planned here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key disused:amenity.",
+      "description": "Layer 'Charging stations' shows planned:amenity=charging_station with a fixed text, namely 'A charging station is planned here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key disused:amenity.",
       "value": ""
     },
     {
       "key": "operational_status",
-      "description": "Layer 'Charging stations' shows planned:amenity=charging_station&<span class='line-through'>construction:amenity</span>&<span class='line-through'>disused:amenity</span>&<span class='line-through'>operational_status</span>&<span class='line-through'>amenity</span> with a fixed text, namely 'A charging station is planned here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key operational_status.",
+      "description": "Layer 'Charging stations' shows planned:amenity=charging_station with a fixed text, namely 'A charging station is planned here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key operational_status.",
       "value": ""
     },
     {
       "key": "amenity",
-      "description": "Layer 'Charging stations' shows planned:amenity=charging_station&<span class='line-through'>construction:amenity</span>&<span class='line-through'>disused:amenity</span>&<span class='line-through'>operational_status</span>&<span class='line-through'>amenity</span> with a fixed text, namely 'A charging station is planned here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key amenity.",
+      "description": "Layer 'Charging stations' shows planned:amenity=charging_station with a fixed text, namely 'A charging station is planned here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key amenity.",
       "value": ""
     },
     {
       "key": "planned:amenity",
-      "description": "Layer 'Charging stations' shows <span class='line-through'>planned:amenity</span>&construction:amenity=charging_station&<span class='line-through'>disused:amenity</span>&<span class='line-through'>operational_status</span>&<span class='line-through'>amenity</span> with a fixed text, namely 'A charging station is constructed here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key planned:amenity.",
+      "description": "Layer 'Charging stations' shows construction:amenity=charging_station with a fixed text, namely 'A charging station is constructed here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key planned:amenity.",
       "value": ""
     },
     {
       "key": "construction:amenity",
-      "description": "Layer 'Charging stations' shows <span class='line-through'>planned:amenity</span>&construction:amenity=charging_station&<span class='line-through'>disused:amenity</span>&<span class='line-through'>operational_status</span>&<span class='line-through'>amenity</span> with a fixed text, namely 'A charging station is constructed here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
+      "description": "Layer 'Charging stations' shows construction:amenity=charging_station with a fixed text, namely 'A charging station is constructed here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
       "value": "charging_station"
     },
     {
       "key": "disused:amenity",
-      "description": "Layer 'Charging stations' shows <span class='line-through'>planned:amenity</span>&construction:amenity=charging_station&<span class='line-through'>disused:amenity</span>&<span class='line-through'>operational_status</span>&<span class='line-through'>amenity</span> with a fixed text, namely 'A charging station is constructed here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key disused:amenity.",
+      "description": "Layer 'Charging stations' shows construction:amenity=charging_station with a fixed text, namely 'A charging station is constructed here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key disused:amenity.",
       "value": ""
     },
     {
       "key": "operational_status",
-      "description": "Layer 'Charging stations' shows <span class='line-through'>planned:amenity</span>&construction:amenity=charging_station&<span class='line-through'>disused:amenity</span>&<span class='line-through'>operational_status</span>&<span class='line-through'>amenity</span> with a fixed text, namely 'A charging station is constructed here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key operational_status.",
+      "description": "Layer 'Charging stations' shows construction:amenity=charging_station with a fixed text, namely 'A charging station is constructed here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key operational_status.",
       "value": ""
     },
     {
       "key": "amenity",
-      "description": "Layer 'Charging stations' shows <span class='line-through'>planned:amenity</span>&construction:amenity=charging_station&<span class='line-through'>disused:amenity</span>&<span class='line-through'>operational_status</span>&<span class='line-through'>amenity</span> with a fixed text, namely 'A charging station is constructed here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key amenity.",
+      "description": "Layer 'Charging stations' shows construction:amenity=charging_station with a fixed text, namely 'A charging station is constructed here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key amenity.",
       "value": ""
     },
     {
       "key": "planned:amenity",
-      "description": "Layer 'Charging stations' shows <span class='line-through'>planned:amenity</span>&<span class='line-through'>construction:amenity</span>&disused:amenity=charging_station&<span class='line-through'>operational_status</span>&<span class='line-through'>amenity</span> with a fixed text, namely 'This charging station has beed permanently disabled and is not in use anymore but is still visible' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key planned:amenity.",
+      "description": "Layer 'Charging stations' shows disused:amenity=charging_station with a fixed text, namely 'This charging station has beed permanently disabled and is not in use anymore but is still visible' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key planned:amenity.",
       "value": ""
     },
     {
       "key": "construction:amenity",
-      "description": "Layer 'Charging stations' shows <span class='line-through'>planned:amenity</span>&<span class='line-through'>construction:amenity</span>&disused:amenity=charging_station&<span class='line-through'>operational_status</span>&<span class='line-through'>amenity</span> with a fixed text, namely 'This charging station has beed permanently disabled and is not in use anymore but is still visible' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key construction:amenity.",
+      "description": "Layer 'Charging stations' shows disused:amenity=charging_station with a fixed text, namely 'This charging station has beed permanently disabled and is not in use anymore but is still visible' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key construction:amenity.",
       "value": ""
     },
     {
       "key": "disused:amenity",
-      "description": "Layer 'Charging stations' shows <span class='line-through'>planned:amenity</span>&<span class='line-through'>construction:amenity</span>&disused:amenity=charging_station&<span class='line-through'>operational_status</span>&<span class='line-through'>amenity</span> with a fixed text, namely 'This charging station has beed permanently disabled and is not in use anymore but is still visible' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
+      "description": "Layer 'Charging stations' shows disused:amenity=charging_station with a fixed text, namely 'This charging station has beed permanently disabled and is not in use anymore but is still visible' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations')",
       "value": "charging_station"
     },
     {
       "key": "operational_status",
-      "description": "Layer 'Charging stations' shows <span class='line-through'>planned:amenity</span>&<span class='line-through'>construction:amenity</span>&disused:amenity=charging_station&<span class='line-through'>operational_status</span>&<span class='line-through'>amenity</span> with a fixed text, namely 'This charging station has beed permanently disabled and is not in use anymore but is still visible' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key operational_status.",
+      "description": "Layer 'Charging stations' shows disused:amenity=charging_station with a fixed text, namely 'This charging station has beed permanently disabled and is not in use anymore but is still visible' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key operational_status.",
       "value": ""
     },
     {
       "key": "amenity",
-      "description": "Layer 'Charging stations' shows <span class='line-through'>planned:amenity</span>&<span class='line-through'>construction:amenity</span>&disused:amenity=charging_station&<span class='line-through'>operational_status</span>&<span class='line-through'>amenity</span> with a fixed text, namely 'This charging station has beed permanently disabled and is not in use anymore but is still visible' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key amenity.",
+      "description": "Layer 'Charging stations' shows disused:amenity=charging_station with a fixed text, namely 'This charging station has beed permanently disabled and is not in use anymore but is still visible' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Charging stations') Picking this answer will delete the key amenity.",
       "value": ""
     },
     {
diff --git a/Docs/TagInfo/mapcomplete_climbing.json b/Docs/TagInfo/mapcomplete_climbing.json
index 66a6de3dbe..022b0b987f 100644
--- a/Docs/TagInfo/mapcomplete_climbing.json
+++ b/Docs/TagInfo/mapcomplete_climbing.json
@@ -36,138 +36,30 @@
       "key": "website",
       "description": "Layer 'Climbing club' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Open Climbing Map')"
     },
+    {
+      "key": "contact:website",
+      "description": "Layer 'Climbing club' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Open Climbing Map')"
+    },
     {
       "key": "email",
       "description": "Layer 'Climbing club' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Open Climbing Map')"
     },
+    {
+      "key": "contact:email",
+      "description": "Layer 'Climbing club' shows contact:email~^..*$ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Open Climbing Map')"
+    },
     {
       "key": "phone",
       "description": "Layer 'Climbing club' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Open Climbing Map')"
     },
+    {
+      "key": "contact:phone",
+      "description": "Layer 'Climbing club' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Open Climbing Map')"
+    },
     {
       "key": "opening_hours",
       "description": "Layer 'Climbing club' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Open Climbing Map')"
     },
-    {
-      "key": "url",
-      "description": "Layer 'Climbing club' shows and asks freeform values for key 'url' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing club' shows access=yes with a fixed text, namely 'Publicly accessible to anyone' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing club' shows access=permit with a fixed text, namely 'You need a permit to access here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "permit"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing club' shows access=customers with a fixed text, namely 'Only custumers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "customers"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing club' shows access=members with a fixed text, namely 'Only club members' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "members"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing club' shows access=no with a fixed text, namely 'Not accessible' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "access:description",
-      "description": "Layer 'Climbing club' shows values with key 'access:description' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:length",
-      "description": "Layer 'Climbing club' shows and asks freeform values for key 'climbing:length' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:grade:french:min",
-      "description": "Layer 'Climbing club' shows and asks freeform values for key 'climbing:grade:french:min' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:grade:french:max",
-      "description": "Layer 'Climbing club' shows and asks freeform values for key 'climbing:grade:french:max' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:boulder",
-      "description": "Layer 'Climbing club' shows climbing:boulder=yes with a fixed text, namely 'Bouldering is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:boulder",
-      "description": "Layer 'Climbing club' shows climbing:boulder=no with a fixed text, namely 'Bouldering is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:boulder",
-      "description": "Layer 'Climbing club' shows climbing:boulder=limited with a fixed text, namely 'Bouldering is possible, allthough there are only a few routes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "limited"
-    },
-    {
-      "key": "climbing:boulder",
-      "description": "Layer 'Climbing club' shows climbing:boulder~^..*$ with a fixed text, namely 'There are {climbing:boulder} boulder routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:toprope",
-      "description": "Layer 'Climbing club' shows climbing:toprope=yes with a fixed text, namely 'Toprope climbing is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:toprope",
-      "description": "Layer 'Climbing club' shows climbing:toprope=no with a fixed text, namely 'Toprope climbing is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:toprope",
-      "description": "Layer 'Climbing club' shows climbing:toprope~^..*$ with a fixed text, namely 'There are {climbing:toprope} toprope routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:sport",
-      "description": "Layer 'Climbing club' shows climbing:sport=yes with a fixed text, namely 'Sport climbing is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:sport",
-      "description": "Layer 'Climbing club' shows climbing:sport=no with a fixed text, namely 'Sport climbing is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:sport",
-      "description": "Layer 'Climbing club' shows climbing:sport~^..*$ with a fixed text, namely 'There are {climbing:sport} sport climbing routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:traditional",
-      "description": "Layer 'Climbing club' shows climbing:traditional=yes with a fixed text, namely 'Traditional climbing is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:traditional",
-      "description": "Layer 'Climbing club' shows climbing:traditional=no with a fixed text, namely 'Traditional climbing is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:traditional",
-      "description": "Layer 'Climbing club' shows climbing:traditional~^..*$ with a fixed text, namely 'There are {climbing:traditional} traditional climbing routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:speed",
-      "description": "Layer 'Climbing club' shows climbing:speed=yes with a fixed text, namely 'There is a speed climbing wall' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:speed",
-      "description": "Layer 'Climbing club' shows climbing:speed=no with a fixed text, namely 'There is no speed climbing wall' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:speed",
-      "description": "Layer 'Climbing club' shows climbing:speed~^..*$ with a fixed text, namely 'There are {climbing:speed} speed climbing walls' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
     {
       "key": "sport",
       "description": "The MapComplete theme Open Climbing Map has a layer Climbing gyms showing features with this tag",
@@ -202,138 +94,30 @@
       "key": "website",
       "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Open Climbing Map')"
     },
+    {
+      "key": "contact:website",
+      "description": "Layer 'Climbing gyms' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Open Climbing Map')"
+    },
     {
       "key": "phone",
       "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Open Climbing Map')"
     },
+    {
+      "key": "contact:phone",
+      "description": "Layer 'Climbing gyms' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Open Climbing Map')"
+    },
     {
       "key": "email",
       "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Open Climbing Map')"
     },
+    {
+      "key": "contact:email",
+      "description": "Layer 'Climbing gyms' shows contact:email~^..*$ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Open Climbing Map')"
+    },
     {
       "key": "opening_hours",
       "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Open Climbing Map')"
     },
-    {
-      "key": "url",
-      "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'url' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing gyms' shows access=yes with a fixed text, namely 'Publicly accessible to anyone' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing gyms' shows access=permit with a fixed text, namely 'You need a permit to access here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "permit"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing gyms' shows access=customers with a fixed text, namely 'Only custumers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "customers"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing gyms' shows access=members with a fixed text, namely 'Only club members' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "members"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing gyms' shows access=no with a fixed text, namely 'Not accessible' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "access:description",
-      "description": "Layer 'Climbing gyms' shows values with key 'access:description' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:length",
-      "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'climbing:length' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:grade:french:min",
-      "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'climbing:grade:french:min' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:grade:french:max",
-      "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'climbing:grade:french:max' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:boulder",
-      "description": "Layer 'Climbing gyms' shows climbing:boulder=yes with a fixed text, namely 'Bouldering is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:boulder",
-      "description": "Layer 'Climbing gyms' shows climbing:boulder=no with a fixed text, namely 'Bouldering is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:boulder",
-      "description": "Layer 'Climbing gyms' shows climbing:boulder=limited with a fixed text, namely 'Bouldering is possible, allthough there are only a few routes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "limited"
-    },
-    {
-      "key": "climbing:boulder",
-      "description": "Layer 'Climbing gyms' shows climbing:boulder~^..*$ with a fixed text, namely 'There are {climbing:boulder} boulder routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:toprope",
-      "description": "Layer 'Climbing gyms' shows climbing:toprope=yes with a fixed text, namely 'Toprope climbing is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:toprope",
-      "description": "Layer 'Climbing gyms' shows climbing:toprope=no with a fixed text, namely 'Toprope climbing is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:toprope",
-      "description": "Layer 'Climbing gyms' shows climbing:toprope~^..*$ with a fixed text, namely 'There are {climbing:toprope} toprope routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:sport",
-      "description": "Layer 'Climbing gyms' shows climbing:sport=yes with a fixed text, namely 'Sport climbing is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:sport",
-      "description": "Layer 'Climbing gyms' shows climbing:sport=no with a fixed text, namely 'Sport climbing is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:sport",
-      "description": "Layer 'Climbing gyms' shows climbing:sport~^..*$ with a fixed text, namely 'There are {climbing:sport} sport climbing routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:traditional",
-      "description": "Layer 'Climbing gyms' shows climbing:traditional=yes with a fixed text, namely 'Traditional climbing is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:traditional",
-      "description": "Layer 'Climbing gyms' shows climbing:traditional=no with a fixed text, namely 'Traditional climbing is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:traditional",
-      "description": "Layer 'Climbing gyms' shows climbing:traditional~^..*$ with a fixed text, namely 'There are {climbing:traditional} traditional climbing routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:speed",
-      "description": "Layer 'Climbing gyms' shows climbing:speed=yes with a fixed text, namely 'There is a speed climbing wall' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:speed",
-      "description": "Layer 'Climbing gyms' shows climbing:speed=no with a fixed text, namely 'There is no speed climbing wall' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:speed",
-      "description": "Layer 'Climbing gyms' shows climbing:speed~^..*$ with a fixed text, namely 'There are {climbing:speed} speed climbing walls' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
     {
       "key": "climbing",
       "description": "The MapComplete theme Open Climbing Map has a layer Climbing routes showing features with this tag",
@@ -361,12 +145,12 @@
     },
     {
       "key": "noname",
-      "description": "Layer 'Climbing routes' shows noname=yes&<span class='line-through'>name</span> with a fixed text, namely 'This climbing route doesn't have a name' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
+      "description": "Layer 'Climbing routes' shows noname=yes with a fixed text, namely 'This climbing route doesn't have a name' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
       "value": "yes"
     },
     {
       "key": "name",
-      "description": "Layer 'Climbing routes' shows noname=yes&<span class='line-through'>name</span> with a fixed text, namely 'This climbing route doesn't have a name' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map') Picking this answer will delete the key name.",
+      "description": "Layer 'Climbing routes' shows noname=yes with a fixed text, namely 'This climbing route doesn't have a name' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map') Picking this answer will delete the key name.",
       "value": ""
     },
     {
@@ -395,126 +179,6 @@
       "key": "description",
       "description": "Layer 'Climbing routes' shows and asks freeform values for key 'description' (in the MapComplete.osm.be theme 'Open Climbing Map')"
     },
-    {
-      "key": "url",
-      "description": "Layer 'Climbing routes' shows and asks freeform values for key 'url' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing routes' shows access=yes with a fixed text, namely 'Publicly accessible to anyone' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing routes' shows access=permit with a fixed text, namely 'You need a permit to access here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "permit"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing routes' shows access=customers with a fixed text, namely 'Only custumers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "customers"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing routes' shows access=members with a fixed text, namely 'Only club members' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "members"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing routes' shows access=no with a fixed text, namely 'Not accessible' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "access:description",
-      "description": "Layer 'Climbing routes' shows values with key 'access:description' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:length",
-      "description": "Layer 'Climbing routes' shows and asks freeform values for key 'climbing:length' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:grade:french:min",
-      "description": "Layer 'Climbing routes' shows and asks freeform values for key 'climbing:grade:french:min' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:grade:french:max",
-      "description": "Layer 'Climbing routes' shows and asks freeform values for key 'climbing:grade:french:max' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:boulder",
-      "description": "Layer 'Climbing routes' shows climbing:boulder=yes with a fixed text, namely 'Bouldering is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:boulder",
-      "description": "Layer 'Climbing routes' shows climbing:boulder=no with a fixed text, namely 'Bouldering is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:boulder",
-      "description": "Layer 'Climbing routes' shows climbing:boulder=limited with a fixed text, namely 'Bouldering is possible, allthough there are only a few routes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "limited"
-    },
-    {
-      "key": "climbing:boulder",
-      "description": "Layer 'Climbing routes' shows climbing:boulder~^..*$ with a fixed text, namely 'There are {climbing:boulder} boulder routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:toprope",
-      "description": "Layer 'Climbing routes' shows climbing:toprope=yes with a fixed text, namely 'Toprope climbing is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:toprope",
-      "description": "Layer 'Climbing routes' shows climbing:toprope=no with a fixed text, namely 'Toprope climbing is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:toprope",
-      "description": "Layer 'Climbing routes' shows climbing:toprope~^..*$ with a fixed text, namely 'There are {climbing:toprope} toprope routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:sport",
-      "description": "Layer 'Climbing routes' shows climbing:sport=yes with a fixed text, namely 'Sport climbing is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:sport",
-      "description": "Layer 'Climbing routes' shows climbing:sport=no with a fixed text, namely 'Sport climbing is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:sport",
-      "description": "Layer 'Climbing routes' shows climbing:sport~^..*$ with a fixed text, namely 'There are {climbing:sport} sport climbing routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:traditional",
-      "description": "Layer 'Climbing routes' shows climbing:traditional=yes with a fixed text, namely 'Traditional climbing is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:traditional",
-      "description": "Layer 'Climbing routes' shows climbing:traditional=no with a fixed text, namely 'Traditional climbing is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:traditional",
-      "description": "Layer 'Climbing routes' shows climbing:traditional~^..*$ with a fixed text, namely 'There are {climbing:traditional} traditional climbing routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:speed",
-      "description": "Layer 'Climbing routes' shows climbing:speed=yes with a fixed text, namely 'There is a speed climbing wall' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:speed",
-      "description": "Layer 'Climbing routes' shows climbing:speed=no with a fixed text, namely 'There is no speed climbing wall' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:speed",
-      "description": "Layer 'Climbing routes' shows climbing:speed~^..*$ with a fixed text, namely 'There are {climbing:speed} speed climbing walls' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
     {
       "key": "sport",
       "description": "The MapComplete theme Open Climbing Map has a layer Climbing opportunities showing features with this tag",
@@ -542,12 +206,12 @@
     },
     {
       "key": "noname",
-      "description": "Layer 'Climbing opportunities' shows noname=yes&<span class='line-through'>name</span> with a fixed text, namely 'This climbing opportunity doesn't have a name' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
+      "description": "Layer 'Climbing opportunities' shows noname=yes with a fixed text, namely 'This climbing opportunity doesn't have a name' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
       "value": "yes"
     },
     {
       "key": "name",
-      "description": "Layer 'Climbing opportunities' shows noname=yes&<span class='line-through'>name</span> with a fixed text, namely 'This climbing opportunity doesn't have a name' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map') Picking this answer will delete the key name.",
+      "description": "Layer 'Climbing opportunities' shows noname=yes with a fixed text, namely 'This climbing opportunity doesn't have a name' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map') Picking this answer will delete the key name.",
       "value": ""
     },
     {
@@ -574,126 +238,6 @@
       "description": "Layer 'Climbing opportunities' shows rock=limestone with a fixed text, namely 'Limestone' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
       "value": "limestone"
     },
-    {
-      "key": "url",
-      "description": "Layer 'Climbing opportunities' shows and asks freeform values for key 'url' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing opportunities' shows access=yes with a fixed text, namely 'Publicly accessible to anyone' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing opportunities' shows access=permit with a fixed text, namely 'You need a permit to access here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "permit"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing opportunities' shows access=customers with a fixed text, namely 'Only custumers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "customers"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing opportunities' shows access=members with a fixed text, namely 'Only club members' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "members"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing opportunities' shows access=no with a fixed text, namely 'Not accessible' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "access:description",
-      "description": "Layer 'Climbing opportunities' shows values with key 'access:description' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:length",
-      "description": "Layer 'Climbing opportunities' shows and asks freeform values for key 'climbing:length' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:grade:french:min",
-      "description": "Layer 'Climbing opportunities' shows and asks freeform values for key 'climbing:grade:french:min' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:grade:french:max",
-      "description": "Layer 'Climbing opportunities' shows and asks freeform values for key 'climbing:grade:french:max' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:boulder",
-      "description": "Layer 'Climbing opportunities' shows climbing:boulder=yes with a fixed text, namely 'Bouldering is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:boulder",
-      "description": "Layer 'Climbing opportunities' shows climbing:boulder=no with a fixed text, namely 'Bouldering is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:boulder",
-      "description": "Layer 'Climbing opportunities' shows climbing:boulder=limited with a fixed text, namely 'Bouldering is possible, allthough there are only a few routes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "limited"
-    },
-    {
-      "key": "climbing:boulder",
-      "description": "Layer 'Climbing opportunities' shows climbing:boulder~^..*$ with a fixed text, namely 'There are {climbing:boulder} boulder routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:toprope",
-      "description": "Layer 'Climbing opportunities' shows climbing:toprope=yes with a fixed text, namely 'Toprope climbing is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:toprope",
-      "description": "Layer 'Climbing opportunities' shows climbing:toprope=no with a fixed text, namely 'Toprope climbing is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:toprope",
-      "description": "Layer 'Climbing opportunities' shows climbing:toprope~^..*$ with a fixed text, namely 'There are {climbing:toprope} toprope routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:sport",
-      "description": "Layer 'Climbing opportunities' shows climbing:sport=yes with a fixed text, namely 'Sport climbing is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:sport",
-      "description": "Layer 'Climbing opportunities' shows climbing:sport=no with a fixed text, namely 'Sport climbing is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:sport",
-      "description": "Layer 'Climbing opportunities' shows climbing:sport~^..*$ with a fixed text, namely 'There are {climbing:sport} sport climbing routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:traditional",
-      "description": "Layer 'Climbing opportunities' shows climbing:traditional=yes with a fixed text, namely 'Traditional climbing is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:traditional",
-      "description": "Layer 'Climbing opportunities' shows climbing:traditional=no with a fixed text, namely 'Traditional climbing is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:traditional",
-      "description": "Layer 'Climbing opportunities' shows climbing:traditional~^..*$ with a fixed text, namely 'There are {climbing:traditional} traditional climbing routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:speed",
-      "description": "Layer 'Climbing opportunities' shows climbing:speed=yes with a fixed text, namely 'There is a speed climbing wall' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:speed",
-      "description": "Layer 'Climbing opportunities' shows climbing:speed=no with a fixed text, namely 'There is no speed climbing wall' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:speed",
-      "description": "Layer 'Climbing opportunities' shows climbing:speed~^..*$ with a fixed text, namely 'There are {climbing:speed} speed climbing walls' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
     {
       "key": "leisure",
       "description": "The MapComplete theme Open Climbing Map has a layer Climbing opportunities? showing features with this tag",
@@ -739,126 +283,6 @@
       "description": "Layer 'Climbing opportunities?' shows climbing=no with a fixed text, namely 'Climbing is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
       "value": "no"
     },
-    {
-      "key": "url",
-      "description": "Layer 'Climbing opportunities?' shows and asks freeform values for key 'url' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing opportunities?' shows access=yes with a fixed text, namely 'Publicly accessible to anyone' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing opportunities?' shows access=permit with a fixed text, namely 'You need a permit to access here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "permit"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing opportunities?' shows access=customers with a fixed text, namely 'Only custumers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "customers"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing opportunities?' shows access=members with a fixed text, namely 'Only club members' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "members"
-    },
-    {
-      "key": "access",
-      "description": "Layer 'Climbing opportunities?' shows access=no with a fixed text, namely 'Not accessible' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "access:description",
-      "description": "Layer 'Climbing opportunities?' shows values with key 'access:description' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:length",
-      "description": "Layer 'Climbing opportunities?' shows and asks freeform values for key 'climbing:length' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:grade:french:min",
-      "description": "Layer 'Climbing opportunities?' shows and asks freeform values for key 'climbing:grade:french:min' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:grade:french:max",
-      "description": "Layer 'Climbing opportunities?' shows and asks freeform values for key 'climbing:grade:french:max' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:boulder",
-      "description": "Layer 'Climbing opportunities?' shows climbing:boulder=yes with a fixed text, namely 'Bouldering is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:boulder",
-      "description": "Layer 'Climbing opportunities?' shows climbing:boulder=no with a fixed text, namely 'Bouldering is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:boulder",
-      "description": "Layer 'Climbing opportunities?' shows climbing:boulder=limited with a fixed text, namely 'Bouldering is possible, allthough there are only a few routes' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "limited"
-    },
-    {
-      "key": "climbing:boulder",
-      "description": "Layer 'Climbing opportunities?' shows climbing:boulder~^..*$ with a fixed text, namely 'There are {climbing:boulder} boulder routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:toprope",
-      "description": "Layer 'Climbing opportunities?' shows climbing:toprope=yes with a fixed text, namely 'Toprope climbing is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:toprope",
-      "description": "Layer 'Climbing opportunities?' shows climbing:toprope=no with a fixed text, namely 'Toprope climbing is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:toprope",
-      "description": "Layer 'Climbing opportunities?' shows climbing:toprope~^..*$ with a fixed text, namely 'There are {climbing:toprope} toprope routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:sport",
-      "description": "Layer 'Climbing opportunities?' shows climbing:sport=yes with a fixed text, namely 'Sport climbing is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:sport",
-      "description": "Layer 'Climbing opportunities?' shows climbing:sport=no with a fixed text, namely 'Sport climbing is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:sport",
-      "description": "Layer 'Climbing opportunities?' shows climbing:sport~^..*$ with a fixed text, namely 'There are {climbing:sport} sport climbing routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:traditional",
-      "description": "Layer 'Climbing opportunities?' shows climbing:traditional=yes with a fixed text, namely 'Traditional climbing is possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:traditional",
-      "description": "Layer 'Climbing opportunities?' shows climbing:traditional=no with a fixed text, namely 'Traditional climbing is not possible here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:traditional",
-      "description": "Layer 'Climbing opportunities?' shows climbing:traditional~^..*$ with a fixed text, namely 'There are {climbing:traditional} traditional climbing routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
-    {
-      "key": "climbing:speed",
-      "description": "Layer 'Climbing opportunities?' shows climbing:speed=yes with a fixed text, namely 'There is a speed climbing wall' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "yes"
-    },
-    {
-      "key": "climbing:speed",
-      "description": "Layer 'Climbing opportunities?' shows climbing:speed=no with a fixed text, namely 'There is no speed climbing wall' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')",
-      "value": "no"
-    },
-    {
-      "key": "climbing:speed",
-      "description": "Layer 'Climbing opportunities?' shows climbing:speed~^..*$ with a fixed text, namely 'There are {climbing:speed} speed climbing walls' (in the MapComplete.osm.be theme 'Open Climbing Map')"
-    },
     {
       "key": "id",
       "description": "The MapComplete theme Open Climbing Map has a layer Your track showing features with this tag",
diff --git a/Docs/TagInfo/mapcomplete_cycle_infra.json b/Docs/TagInfo/mapcomplete_cycle_infra.json
index a101c3e332..6f060da3be 100644
--- a/Docs/TagInfo/mapcomplete_cycle_infra.json
+++ b/Docs/TagInfo/mapcomplete_cycle_infra.json
@@ -132,7 +132,7 @@
     },
     {
       "key": "cyclestreet",
-      "description": "Layer 'Cycleways and roads' shows <span class='line-through'>cyclestreet</span> with a fixed text, namely 'This is not a cyclestreet.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle infrastructure') Picking this answer will delete the key cyclestreet.",
+      "description": "Layer 'Cycleways and roads' shows  with a fixed text, namely 'This is not a cyclestreet.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle infrastructure') Picking this answer will delete the key cyclestreet.",
       "value": ""
     },
     {
@@ -568,6 +568,16 @@
       "description": "Layer 'Barriers' shows bicycle=no with a fixed text, namely 'A cyclist can not go past this.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle infrastructure')",
       "value": "no"
     },
+    {
+      "key": "barrier",
+      "description": "Layer 'Barriers' shows barrier=bollard with a fixed text, namely 'This is a single bollard in the road' (in the MapComplete.osm.be theme 'Bicycle infrastructure')",
+      "value": "bollard"
+    },
+    {
+      "key": "barrier",
+      "description": "Layer 'Barriers' shows barrier=cycle_barrier with a fixed text, namely 'This is a cycle barrier slowing down cyclists' (in the MapComplete.osm.be theme 'Bicycle infrastructure')",
+      "value": "cycle_barrier"
+    },
     {
       "key": "bollard",
       "description": "Layer 'Barriers' shows bollard=removable with a fixed text, namely 'Removable bollard' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle infrastructure')",
@@ -594,23 +604,23 @@
       "value": "rising"
     },
     {
-      "key": "cycle_barrier:type",
-      "description": "Layer 'Barriers' shows cycle_barrier:type=single with a fixed text, namely 'Single, just two barriers with a space inbetween <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle infrastructure')",
+      "key": "cycle_barrier",
+      "description": "Layer 'Barriers' shows cycle_barrier=single with a fixed text, namely 'Single, just two barriers with a space inbetween <img src='./assets/themes/cycle_infra/Cycle_barrier_single.png' style='width:8em'>' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle infrastructure')",
       "value": "single"
     },
     {
-      "key": "cycle_barrier:type",
-      "description": "Layer 'Barriers' shows cycle_barrier:type=double with a fixed text, namely 'Double, two barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_double.svg' style='width:8em'>' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle infrastructure')",
+      "key": "cycle_barrier",
+      "description": "Layer 'Barriers' shows cycle_barrier=double with a fixed text, namely 'Double, two barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_double.svg' style='width:8em'>' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle infrastructure')",
       "value": "double"
     },
     {
-      "key": "cycle_barrier:type",
-      "description": "Layer 'Barriers' shows cycle_barrier:type=triple with a fixed text, namely 'Triple, three barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle infrastructure')",
+      "key": "cycle_barrier",
+      "description": "Layer 'Barriers' shows cycle_barrier=triple with a fixed text, namely 'Triple, three barriers behind each other <img src='./assets/themes/cycle_infra/Cycle_barrier_triple.png' style='width:8em'>' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle infrastructure')",
       "value": "triple"
     },
     {
-      "key": "cycle_barrier:type",
-      "description": "Layer 'Barriers' shows cycle_barrier:type=squeeze with a fixed text, namely 'Squeeze gate, gap is smaller at top, than at the bottom <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle infrastructure')",
+      "key": "cycle_barrier",
+      "description": "Layer 'Barriers' shows cycle_barrier=squeeze with a fixed text, namely 'Squeeze gate, gap is smaller at top, than at the bottom <img src='./assets/themes/cycle_infra/Cycle_barrier_squeeze.png' style='width:8em'>' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle infrastructure')",
       "value": "squeeze"
     },
     {
@@ -654,6 +664,11 @@
       "description": "Layer 'Crossings' shows crossing=zebra with a fixed text, namely 'Zebra crossing' (in the MapComplete.osm.be theme 'Bicycle infrastructure')",
       "value": "zebra"
     },
+    {
+      "key": "crossing",
+      "description": "Layer 'Crossings' shows crossing=unmarked with a fixed text, namely 'Crossing without crossing markings' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle infrastructure')",
+      "value": "unmarked"
+    },
     {
       "key": "crossing_ref",
       "description": "Layer 'Crossings' shows crossing_ref=zebra with a fixed text, namely 'This is a zebra crossing' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle infrastructure')",
@@ -661,7 +676,7 @@
     },
     {
       "key": "crossing_ref",
-      "description": "Layer 'Crossings' shows <span class='line-through'>crossing_ref</span> with a fixed text, namely 'This is not a zebra crossing' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle infrastructure') Picking this answer will delete the key crossing_ref.",
+      "description": "Layer 'Crossings' shows  with a fixed text, namely 'This is not a zebra crossing' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle infrastructure') Picking this answer will delete the key crossing_ref.",
       "value": ""
     },
     {
diff --git a/Docs/TagInfo/mapcomplete_cyclestreets.json b/Docs/TagInfo/mapcomplete_cyclestreets.json
index a85c107e46..f661dbf580 100644
--- a/Docs/TagInfo/mapcomplete_cyclestreets.json
+++ b/Docs/TagInfo/mapcomplete_cyclestreets.json
@@ -31,65 +31,6 @@
       "key": "wikipedia",
       "description": "The layer 'Cyclestreets allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
-    {
-      "key": "cyclestreet",
-      "description": "Layer 'Cyclestreets' shows cyclestreet=yes&maxspeed=30&overtaking:motor_vehicle=no&<span class='line-through'>proposed:cyclestreet</span> with a fixed text, namely 'This street is a cyclestreet (and has a speed limit of 30 km/h)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets')",
-      "value": "yes"
-    },
-    {
-      "key": "maxspeed",
-      "description": "Layer 'Cyclestreets' shows cyclestreet=yes&maxspeed=30&overtaking:motor_vehicle=no&<span class='line-through'>proposed:cyclestreet</span> with a fixed text, namely 'This street is a cyclestreet (and has a speed limit of 30 km/h)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets')",
-      "value": "30"
-    },
-    {
-      "key": "overtaking:motor_vehicle",
-      "description": "Layer 'Cyclestreets' shows cyclestreet=yes&maxspeed=30&overtaking:motor_vehicle=no&<span class='line-through'>proposed:cyclestreet</span> with a fixed text, namely 'This street is a cyclestreet (and has a speed limit of 30 km/h)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets')",
-      "value": "no"
-    },
-    {
-      "key": "proposed:cyclestreet",
-      "description": "Layer 'Cyclestreets' shows cyclestreet=yes&maxspeed=30&overtaking:motor_vehicle=no&<span class='line-through'>proposed:cyclestreet</span> with a fixed text, namely 'This street is a cyclestreet (and has a speed limit of 30 km/h)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets') Picking this answer will delete the key proposed:cyclestreet.",
-      "value": ""
-    },
-    {
-      "key": "cyclestreet",
-      "description": "Layer 'Cyclestreets' shows cyclestreet=yes&<span class='line-through'>proposed:cyclestreet</span> with a fixed text, namely 'This street is a cyclestreet' (in the MapComplete.osm.be theme 'Cyclestreets')",
-      "value": "yes"
-    },
-    {
-      "key": "proposed:cyclestreet",
-      "description": "Layer 'Cyclestreets' shows cyclestreet=yes&<span class='line-through'>proposed:cyclestreet</span> with a fixed text, namely 'This street is a cyclestreet' (in the MapComplete.osm.be theme 'Cyclestreets') Picking this answer will delete the key proposed:cyclestreet.",
-      "value": ""
-    },
-    {
-      "key": "cyclestreet",
-      "description": "Layer 'Cyclestreets' shows <span class='line-through'>cyclestreet</span>&proposed:cyclestreet=yes with a fixed text, namely 'This street will become a cyclstreet soon' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets') Picking this answer will delete the key cyclestreet.",
-      "value": ""
-    },
-    {
-      "key": "proposed:cyclestreet",
-      "description": "Layer 'Cyclestreets' shows <span class='line-through'>cyclestreet</span>&proposed:cyclestreet=yes with a fixed text, namely 'This street will become a cyclstreet soon' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets')",
-      "value": "yes"
-    },
-    {
-      "key": "cyclestreet",
-      "description": "Layer 'Cyclestreets' shows <span class='line-through'>cyclestreet</span>&<span class='line-through'>proposed:cyclestreet</span>&<span class='line-through'>overtaking:motor_vehicle</span> with a fixed text, namely 'This street is not a cyclestreet' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets') Picking this answer will delete the key cyclestreet.",
-      "value": ""
-    },
-    {
-      "key": "proposed:cyclestreet",
-      "description": "Layer 'Cyclestreets' shows <span class='line-through'>cyclestreet</span>&<span class='line-through'>proposed:cyclestreet</span>&<span class='line-through'>overtaking:motor_vehicle</span> with a fixed text, namely 'This street is not a cyclestreet' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets') Picking this answer will delete the key proposed:cyclestreet.",
-      "value": ""
-    },
-    {
-      "key": "overtaking:motor_vehicle",
-      "description": "Layer 'Cyclestreets' shows <span class='line-through'>cyclestreet</span>&<span class='line-through'>proposed:cyclestreet</span>&<span class='line-through'>overtaking:motor_vehicle</span> with a fixed text, namely 'This street is not a cyclestreet' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets') Picking this answer will delete the key overtaking:motor_vehicle.",
-      "value": ""
-    },
-    {
-      "key": "cyclestreet:start_date",
-      "description": "Layer 'Cyclestreets' shows and asks freeform values for key 'cyclestreet:start_date' (in the MapComplete.osm.be theme 'Cyclestreets')"
-    },
     {
       "key": "proposed:cyclestreet",
       "description": "The MapComplete theme Cyclestreets has a layer Future cyclestreet showing features with this tag",
@@ -111,65 +52,6 @@
       "key": "wikipedia",
       "description": "The layer 'Future cyclestreet allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
-    {
-      "key": "cyclestreet",
-      "description": "Layer 'Future cyclestreet' shows cyclestreet=yes&maxspeed=30&overtaking:motor_vehicle=no&<span class='line-through'>proposed:cyclestreet</span> with a fixed text, namely 'This street is a cyclestreet (and has a speed limit of 30 km/h)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets')",
-      "value": "yes"
-    },
-    {
-      "key": "maxspeed",
-      "description": "Layer 'Future cyclestreet' shows cyclestreet=yes&maxspeed=30&overtaking:motor_vehicle=no&<span class='line-through'>proposed:cyclestreet</span> with a fixed text, namely 'This street is a cyclestreet (and has a speed limit of 30 km/h)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets')",
-      "value": "30"
-    },
-    {
-      "key": "overtaking:motor_vehicle",
-      "description": "Layer 'Future cyclestreet' shows cyclestreet=yes&maxspeed=30&overtaking:motor_vehicle=no&<span class='line-through'>proposed:cyclestreet</span> with a fixed text, namely 'This street is a cyclestreet (and has a speed limit of 30 km/h)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets')",
-      "value": "no"
-    },
-    {
-      "key": "proposed:cyclestreet",
-      "description": "Layer 'Future cyclestreet' shows cyclestreet=yes&maxspeed=30&overtaking:motor_vehicle=no&<span class='line-through'>proposed:cyclestreet</span> with a fixed text, namely 'This street is a cyclestreet (and has a speed limit of 30 km/h)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets') Picking this answer will delete the key proposed:cyclestreet.",
-      "value": ""
-    },
-    {
-      "key": "cyclestreet",
-      "description": "Layer 'Future cyclestreet' shows cyclestreet=yes&<span class='line-through'>proposed:cyclestreet</span> with a fixed text, namely 'This street is a cyclestreet' (in the MapComplete.osm.be theme 'Cyclestreets')",
-      "value": "yes"
-    },
-    {
-      "key": "proposed:cyclestreet",
-      "description": "Layer 'Future cyclestreet' shows cyclestreet=yes&<span class='line-through'>proposed:cyclestreet</span> with a fixed text, namely 'This street is a cyclestreet' (in the MapComplete.osm.be theme 'Cyclestreets') Picking this answer will delete the key proposed:cyclestreet.",
-      "value": ""
-    },
-    {
-      "key": "cyclestreet",
-      "description": "Layer 'Future cyclestreet' shows <span class='line-through'>cyclestreet</span>&proposed:cyclestreet=yes with a fixed text, namely 'This street will become a cyclstreet soon' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets') Picking this answer will delete the key cyclestreet.",
-      "value": ""
-    },
-    {
-      "key": "proposed:cyclestreet",
-      "description": "Layer 'Future cyclestreet' shows <span class='line-through'>cyclestreet</span>&proposed:cyclestreet=yes with a fixed text, namely 'This street will become a cyclstreet soon' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets')",
-      "value": "yes"
-    },
-    {
-      "key": "cyclestreet",
-      "description": "Layer 'Future cyclestreet' shows <span class='line-through'>cyclestreet</span>&<span class='line-through'>proposed:cyclestreet</span>&<span class='line-through'>overtaking:motor_vehicle</span> with a fixed text, namely 'This street is not a cyclestreet' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets') Picking this answer will delete the key cyclestreet.",
-      "value": ""
-    },
-    {
-      "key": "proposed:cyclestreet",
-      "description": "Layer 'Future cyclestreet' shows <span class='line-through'>cyclestreet</span>&<span class='line-through'>proposed:cyclestreet</span>&<span class='line-through'>overtaking:motor_vehicle</span> with a fixed text, namely 'This street is not a cyclestreet' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets') Picking this answer will delete the key proposed:cyclestreet.",
-      "value": ""
-    },
-    {
-      "key": "overtaking:motor_vehicle",
-      "description": "Layer 'Future cyclestreet' shows <span class='line-through'>cyclestreet</span>&<span class='line-through'>proposed:cyclestreet</span>&<span class='line-through'>overtaking:motor_vehicle</span> with a fixed text, namely 'This street is not a cyclestreet' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets') Picking this answer will delete the key overtaking:motor_vehicle.",
-      "value": ""
-    },
-    {
-      "key": "cyclestreet:start_date",
-      "description": "Layer 'Future cyclestreet' shows and asks freeform values for key 'cyclestreet:start_date' (in the MapComplete.osm.be theme 'Cyclestreets')"
-    },
     {
       "key": "highway",
       "description": "The MapComplete theme Cyclestreets has a layer All streets showing features with this tag",
@@ -201,65 +83,6 @@
       "key": "wikipedia",
       "description": "The layer 'All streets allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
-    {
-      "key": "cyclestreet",
-      "description": "Layer 'All streets' shows cyclestreet=yes&maxspeed=30&overtaking:motor_vehicle=no&<span class='line-through'>proposed:cyclestreet</span> with a fixed text, namely 'This street is a cyclestreet (and has a speed limit of 30 km/h)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets')",
-      "value": "yes"
-    },
-    {
-      "key": "maxspeed",
-      "description": "Layer 'All streets' shows cyclestreet=yes&maxspeed=30&overtaking:motor_vehicle=no&<span class='line-through'>proposed:cyclestreet</span> with a fixed text, namely 'This street is a cyclestreet (and has a speed limit of 30 km/h)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets')",
-      "value": "30"
-    },
-    {
-      "key": "overtaking:motor_vehicle",
-      "description": "Layer 'All streets' shows cyclestreet=yes&maxspeed=30&overtaking:motor_vehicle=no&<span class='line-through'>proposed:cyclestreet</span> with a fixed text, namely 'This street is a cyclestreet (and has a speed limit of 30 km/h)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets')",
-      "value": "no"
-    },
-    {
-      "key": "proposed:cyclestreet",
-      "description": "Layer 'All streets' shows cyclestreet=yes&maxspeed=30&overtaking:motor_vehicle=no&<span class='line-through'>proposed:cyclestreet</span> with a fixed text, namely 'This street is a cyclestreet (and has a speed limit of 30 km/h)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets') Picking this answer will delete the key proposed:cyclestreet.",
-      "value": ""
-    },
-    {
-      "key": "cyclestreet",
-      "description": "Layer 'All streets' shows cyclestreet=yes&<span class='line-through'>proposed:cyclestreet</span> with a fixed text, namely 'This street is a cyclestreet' (in the MapComplete.osm.be theme 'Cyclestreets')",
-      "value": "yes"
-    },
-    {
-      "key": "proposed:cyclestreet",
-      "description": "Layer 'All streets' shows cyclestreet=yes&<span class='line-through'>proposed:cyclestreet</span> with a fixed text, namely 'This street is a cyclestreet' (in the MapComplete.osm.be theme 'Cyclestreets') Picking this answer will delete the key proposed:cyclestreet.",
-      "value": ""
-    },
-    {
-      "key": "cyclestreet",
-      "description": "Layer 'All streets' shows <span class='line-through'>cyclestreet</span>&proposed:cyclestreet=yes with a fixed text, namely 'This street will become a cyclstreet soon' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets') Picking this answer will delete the key cyclestreet.",
-      "value": ""
-    },
-    {
-      "key": "proposed:cyclestreet",
-      "description": "Layer 'All streets' shows <span class='line-through'>cyclestreet</span>&proposed:cyclestreet=yes with a fixed text, namely 'This street will become a cyclstreet soon' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets')",
-      "value": "yes"
-    },
-    {
-      "key": "cyclestreet",
-      "description": "Layer 'All streets' shows <span class='line-through'>cyclestreet</span>&<span class='line-through'>proposed:cyclestreet</span>&<span class='line-through'>overtaking:motor_vehicle</span> with a fixed text, namely 'This street is not a cyclestreet' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets') Picking this answer will delete the key cyclestreet.",
-      "value": ""
-    },
-    {
-      "key": "proposed:cyclestreet",
-      "description": "Layer 'All streets' shows <span class='line-through'>cyclestreet</span>&<span class='line-through'>proposed:cyclestreet</span>&<span class='line-through'>overtaking:motor_vehicle</span> with a fixed text, namely 'This street is not a cyclestreet' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets') Picking this answer will delete the key proposed:cyclestreet.",
-      "value": ""
-    },
-    {
-      "key": "overtaking:motor_vehicle",
-      "description": "Layer 'All streets' shows <span class='line-through'>cyclestreet</span>&<span class='line-through'>proposed:cyclestreet</span>&<span class='line-through'>overtaking:motor_vehicle</span> with a fixed text, namely 'This street is not a cyclestreet' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclestreets') Picking this answer will delete the key overtaking:motor_vehicle.",
-      "value": ""
-    },
-    {
-      "key": "cyclestreet:start_date",
-      "description": "Layer 'All streets' shows and asks freeform values for key 'cyclestreet:start_date' (in the MapComplete.osm.be theme 'Cyclestreets')"
-    },
     {
       "key": "id",
       "description": "The MapComplete theme Cyclestreets has a layer Your track showing features with this tag",
diff --git a/Docs/TagInfo/mapcomplete_cyclofix.json b/Docs/TagInfo/mapcomplete_cyclofix.json
index 69e50e9ec4..22513e9520 100644
--- a/Docs/TagInfo/mapcomplete_cyclofix.json
+++ b/Docs/TagInfo/mapcomplete_cyclofix.json
@@ -343,14 +343,26 @@
       "key": "website",
       "description": "Layer 'Bicycle library' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
+    {
+      "key": "contact:website",
+      "description": "Layer 'Bicycle library' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+    },
     {
       "key": "phone",
       "description": "Layer 'Bicycle library' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
+    {
+      "key": "contact:phone",
+      "description": "Layer 'Bicycle library' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+    },
     {
       "key": "email",
       "description": "Layer 'Bicycle library' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
+    {
+      "key": "contact:email",
+      "description": "Layer 'Bicycle library' shows contact:email~^..*$ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+    },
     {
       "key": "opening_hours",
       "description": "Layer 'Bicycle library' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
@@ -361,12 +373,12 @@
     },
     {
       "key": "fee",
-      "description": "Layer 'Bicycle library' shows fee=no&<span class='line-through'>charge</span> with a fixed text, namely 'Lending a bicycle is free' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')",
+      "description": "Layer 'Bicycle library' shows fee=no with a fixed text, namely 'Lending a bicycle is free' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')",
       "value": "no"
     },
     {
       "key": "charge",
-      "description": "Layer 'Bicycle library' shows fee=no&<span class='line-through'>charge</span> with a fixed text, namely 'Lending a bicycle is free' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') Picking this answer will delete the key charge.",
+      "description": "Layer 'Bicycle library' shows fee=no with a fixed text, namely 'Lending a bicycle is free' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') Picking this answer will delete the key charge.",
       "value": ""
     },
     {
@@ -477,7 +489,7 @@
     },
     {
       "key": "opening_hours",
-      "description": "Layer 'Bike stations (repair, pump or both)' shows <span class='line-through'>opening_hours</span> with a fixed text, namely 'Always open' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') Picking this answer will delete the key opening_hours.",
+      "description": "Layer 'Bike stations (repair, pump or both)' shows  with a fixed text, namely 'Always open' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') Picking this answer will delete the key opening_hours.",
       "value": ""
     },
     {
@@ -507,7 +519,7 @@
     },
     {
       "key": "service:bicycle:pump:operational_status",
-      "description": "Layer 'Bike stations (repair, pump or both)' shows <span class='line-through'>service:bicycle:pump:operational_status</span> with a fixed text, namely 'The bike pump is operational' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') Picking this answer will delete the key service:bicycle:pump:operational_status.",
+      "description": "Layer 'Bike stations (repair, pump or both)' shows  with a fixed text, namely 'The bike pump is operational' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') Picking this answer will delete the key service:bicycle:pump:operational_status.",
       "value": ""
     },
     {
@@ -570,7 +582,7 @@
     },
     {
       "key": "level",
-      "description": "Layer 'Bike stations (repair, pump or both)' shows <span class='line-through'>level</span> with a fixed text, namely 'Located on the ground floor' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') Picking this answer will delete the key level.",
+      "description": "Layer 'Bike stations (repair, pump or both)' shows  with a fixed text, namely 'Located on the ground floor' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') Picking this answer will delete the key level.",
       "value": ""
     },
     {
@@ -609,7 +621,7 @@
     },
     {
       "key": "operational_status",
-      "description": "Layer 'Bicycle tube vending machine' shows <span class='line-through'>operational_status</span> with a fixed text, namely 'This vending machine works' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') Picking this answer will delete the key operational_status.",
+      "description": "Layer 'Bicycle tube vending machine' shows  with a fixed text, namely 'This vending machine works' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') Picking this answer will delete the key operational_status.",
       "value": ""
     },
     {
@@ -721,7 +733,7 @@
     },
     {
       "key": "operational_status",
-      "description": "Layer 'Drinking water' shows <span class='line-through'>operational_status</span> with a fixed text, namely 'This drinking water works' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') Picking this answer will delete the key operational_status.",
+      "description": "Layer 'Drinking water' shows  with a fixed text, namely 'This drinking water works' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') Picking this answer will delete the key operational_status.",
       "value": ""
     },
     {
@@ -813,14 +825,26 @@
       "key": "website",
       "description": "Layer 'Bike related object' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
+    {
+      "key": "contact:website",
+      "description": "Layer 'Bike related object' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+    },
     {
       "key": "email",
       "description": "Layer 'Bike related object' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
+    {
+      "key": "contact:email",
+      "description": "Layer 'Bike related object' shows contact:email~^..*$ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+    },
     {
       "key": "phone",
       "description": "Layer 'Bike related object' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
+    {
+      "key": "contact:phone",
+      "description": "Layer 'Bike related object' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+    },
     {
       "key": "opening_hours",
       "description": "Layer 'Bike related object' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
@@ -976,7 +1000,7 @@
     },
     {
       "key": "location",
-      "description": "Layer 'Bike parking' shows <span class='line-through'>location</span> with a fixed text, namely 'Surface level parking' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') Picking this answer will delete the key location.",
+      "description": "Layer 'Bike parking' shows  with a fixed text, namely 'Surface level parking' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists') Picking this answer will delete the key location.",
       "value": ""
     },
     {
diff --git a/Docs/TagInfo/mapcomplete_drinking_water.json b/Docs/TagInfo/mapcomplete_drinking_water.json
index 9adab82b3d..ee53cb101c 100644
--- a/Docs/TagInfo/mapcomplete_drinking_water.json
+++ b/Docs/TagInfo/mapcomplete_drinking_water.json
@@ -37,7 +37,7 @@
     },
     {
       "key": "operational_status",
-      "description": "Layer 'Drinking water' shows <span class='line-through'>operational_status</span> with a fixed text, namely 'This drinking water works' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Drinking Water') Picking this answer will delete the key operational_status.",
+      "description": "Layer 'Drinking water' shows  with a fixed text, namely 'This drinking water works' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Drinking Water') Picking this answer will delete the key operational_status.",
       "value": ""
     },
     {
diff --git a/Docs/TagInfo/mapcomplete_entrances.json b/Docs/TagInfo/mapcomplete_entrances.json
index 1fa4ed60c9..350ee1f840 100644
--- a/Docs/TagInfo/mapcomplete_entrances.json
+++ b/Docs/TagInfo/mapcomplete_entrances.json
@@ -62,82 +62,82 @@
     },
     {
       "key": "entrance",
-      "description": "Layer 'Entrance' shows <span class='line-through'>entrance</span>&indoor=door with a fixed text, namely 'This is an indoor door, separating a room or a corridor within a single building' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances') Picking this answer will delete the key entrance.",
+      "description": "Layer 'Entrance' shows indoor=door with a fixed text, namely 'This is an indoor door, separating a room or a corridor within a single building' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances') Picking this answer will delete the key entrance.",
       "value": ""
     },
     {
       "key": "indoor",
-      "description": "Layer 'Entrance' shows <span class='line-through'>entrance</span>&indoor=door with a fixed text, namely 'This is an indoor door, separating a room or a corridor within a single building' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances')",
+      "description": "Layer 'Entrance' shows indoor=door with a fixed text, namely 'This is an indoor door, separating a room or a corridor within a single building' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances')",
       "value": "door"
     },
     {
       "key": "indoor",
-      "description": "Layer 'Entrance' shows <span class='line-through'>indoor</span>&entrance=main with a fixed text, namely 'This is the main entrance' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances') Picking this answer will delete the key indoor.",
+      "description": "Layer 'Entrance' shows entrance=main with a fixed text, namely 'This is the main entrance' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances') Picking this answer will delete the key indoor.",
       "value": ""
     },
     {
       "key": "entrance",
-      "description": "Layer 'Entrance' shows <span class='line-through'>indoor</span>&entrance=main with a fixed text, namely 'This is the main entrance' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances')",
+      "description": "Layer 'Entrance' shows entrance=main with a fixed text, namely 'This is the main entrance' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances')",
       "value": "main"
     },
     {
       "key": "indoor",
-      "description": "Layer 'Entrance' shows <span class='line-through'>indoor</span>&entrance=secondary with a fixed text, namely 'This is a secondary entrance' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances') Picking this answer will delete the key indoor.",
+      "description": "Layer 'Entrance' shows entrance=secondary with a fixed text, namely 'This is a secondary entrance' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances') Picking this answer will delete the key indoor.",
       "value": ""
     },
     {
       "key": "entrance",
-      "description": "Layer 'Entrance' shows <span class='line-through'>indoor</span>&entrance=secondary with a fixed text, namely 'This is a secondary entrance' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances')",
+      "description": "Layer 'Entrance' shows entrance=secondary with a fixed text, namely 'This is a secondary entrance' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances')",
       "value": "secondary"
     },
     {
       "key": "indoor",
-      "description": "Layer 'Entrance' shows <span class='line-through'>indoor</span>&entrance=service with a fixed text, namely 'This is a service entrance - normally only used for employees, delivery, ...' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances') Picking this answer will delete the key indoor.",
+      "description": "Layer 'Entrance' shows entrance=service with a fixed text, namely 'This is a service entrance - normally only used for employees, delivery, ...' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances') Picking this answer will delete the key indoor.",
       "value": ""
     },
     {
       "key": "entrance",
-      "description": "Layer 'Entrance' shows <span class='line-through'>indoor</span>&entrance=service with a fixed text, namely 'This is a service entrance - normally only used for employees, delivery, ...' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances')",
+      "description": "Layer 'Entrance' shows entrance=service with a fixed text, namely 'This is a service entrance - normally only used for employees, delivery, ...' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances')",
       "value": "service"
     },
     {
       "key": "indoor",
-      "description": "Layer 'Entrance' shows <span class='line-through'>indoor</span>&entrance=exit with a fixed text, namely 'This is an exit where one can not enter' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances') Picking this answer will delete the key indoor.",
+      "description": "Layer 'Entrance' shows entrance=exit with a fixed text, namely 'This is an exit where one can not enter' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances') Picking this answer will delete the key indoor.",
       "value": ""
     },
     {
       "key": "entrance",
-      "description": "Layer 'Entrance' shows <span class='line-through'>indoor</span>&entrance=exit with a fixed text, namely 'This is an exit where one can not enter' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances')",
+      "description": "Layer 'Entrance' shows entrance=exit with a fixed text, namely 'This is an exit where one can not enter' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances')",
       "value": "exit"
     },
     {
       "key": "indoor",
-      "description": "Layer 'Entrance' shows <span class='line-through'>indoor</span>&entrance=entrance with a fixed text, namely 'This is an entrance where one can only enter (but not exit)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances') Picking this answer will delete the key indoor.",
+      "description": "Layer 'Entrance' shows entrance=entrance with a fixed text, namely 'This is an entrance where one can only enter (but not exit)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances') Picking this answer will delete the key indoor.",
       "value": ""
     },
     {
       "key": "entrance",
-      "description": "Layer 'Entrance' shows <span class='line-through'>indoor</span>&entrance=entrance with a fixed text, namely 'This is an entrance where one can only enter (but not exit)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances')",
+      "description": "Layer 'Entrance' shows entrance=entrance with a fixed text, namely 'This is an entrance where one can only enter (but not exit)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances')",
       "value": "entrance"
     },
     {
       "key": "indoor",
-      "description": "Layer 'Entrance' shows <span class='line-through'>indoor</span>&entrance=emergency with a fixed text, namely 'This is emergency exit' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances') Picking this answer will delete the key indoor.",
+      "description": "Layer 'Entrance' shows entrance=emergency with a fixed text, namely 'This is emergency exit' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances') Picking this answer will delete the key indoor.",
       "value": ""
     },
     {
       "key": "entrance",
-      "description": "Layer 'Entrance' shows <span class='line-through'>indoor</span>&entrance=emergency with a fixed text, namely 'This is emergency exit' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances')",
+      "description": "Layer 'Entrance' shows entrance=emergency with a fixed text, namely 'This is emergency exit' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances')",
       "value": "emergency"
     },
     {
       "key": "indoor",
-      "description": "Layer 'Entrance' shows <span class='line-through'>indoor</span>&entrance=home with a fixed text, namely 'This is the entrance to a private home' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances') Picking this answer will delete the key indoor.",
+      "description": "Layer 'Entrance' shows entrance=home with a fixed text, namely 'This is the entrance to a private home' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances') Picking this answer will delete the key indoor.",
       "value": ""
     },
     {
       "key": "entrance",
-      "description": "Layer 'Entrance' shows <span class='line-through'>indoor</span>&entrance=home with a fixed text, namely 'This is the entrance to a private home' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances')",
+      "description": "Layer 'Entrance' shows entrance=home with a fixed text, namely 'This is the entrance to a private home' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Entrances')",
       "value": "home"
     },
     {
diff --git a/Docs/TagInfo/mapcomplete_food.json b/Docs/TagInfo/mapcomplete_food.json
index 429f7579a7..fd1efec039 100644
--- a/Docs/TagInfo/mapcomplete_food.json
+++ b/Docs/TagInfo/mapcomplete_food.json
@@ -58,14 +58,26 @@
       "key": "website",
       "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Restaurants and fast food')"
     },
+    {
+      "key": "contact:website",
+      "description": "Layer 'Restaurants and fast food' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Restaurants and fast food')"
+    },
     {
       "key": "email",
       "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Restaurants and fast food')"
     },
+    {
+      "key": "contact:email",
+      "description": "Layer 'Restaurants and fast food' shows contact:email~^..*$ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Restaurants and fast food')"
+    },
     {
       "key": "phone",
       "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Restaurants and fast food')"
     },
+    {
+      "key": "contact:phone",
+      "description": "Layer 'Restaurants and fast food' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Restaurants and fast food')"
+    },
     {
       "key": "payment:cash",
       "description": "Layer 'Restaurants and fast food' shows payment:cash=yes with a fixed text, namely 'Cash is accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Restaurants and fast food')",
diff --git a/Docs/TagInfo/mapcomplete_fritures.json b/Docs/TagInfo/mapcomplete_fritures.json
index 3a9d48c659..4544e6d296 100644
--- a/Docs/TagInfo/mapcomplete_fritures.json
+++ b/Docs/TagInfo/mapcomplete_fritures.json
@@ -63,14 +63,26 @@
       "key": "website",
       "description": "Layer 'Fries shop' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Friturenkaart')"
     },
+    {
+      "key": "contact:website",
+      "description": "Layer 'Fries shop' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Friturenkaart')"
+    },
     {
       "key": "email",
       "description": "Layer 'Fries shop' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Friturenkaart')"
     },
+    {
+      "key": "contact:email",
+      "description": "Layer 'Fries shop' shows contact:email~^..*$ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Friturenkaart')"
+    },
     {
       "key": "phone",
       "description": "Layer 'Fries shop' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Friturenkaart')"
     },
+    {
+      "key": "contact:phone",
+      "description": "Layer 'Fries shop' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Friturenkaart')"
+    },
     {
       "key": "payment:cash",
       "description": "Layer 'Fries shop' shows payment:cash=yes with a fixed text, namely 'Cash is accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Friturenkaart')",
@@ -398,14 +410,26 @@
       "key": "website",
       "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Friturenkaart')"
     },
+    {
+      "key": "contact:website",
+      "description": "Layer 'Restaurants and fast food' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Friturenkaart')"
+    },
     {
       "key": "email",
       "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Friturenkaart')"
     },
+    {
+      "key": "contact:email",
+      "description": "Layer 'Restaurants and fast food' shows contact:email~^..*$ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Friturenkaart')"
+    },
     {
       "key": "phone",
       "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Friturenkaart')"
     },
+    {
+      "key": "contact:phone",
+      "description": "Layer 'Restaurants and fast food' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Friturenkaart')"
+    },
     {
       "key": "payment:cash",
       "description": "Layer 'Restaurants and fast food' shows payment:cash=yes with a fixed text, namely 'Cash is accepted here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Friturenkaart')",
diff --git a/Docs/TagInfo/mapcomplete_hackerspaces.json b/Docs/TagInfo/mapcomplete_hackerspaces.json
index 800086b201..729ccf73da 100644
--- a/Docs/TagInfo/mapcomplete_hackerspaces.json
+++ b/Docs/TagInfo/mapcomplete_hackerspaces.json
@@ -22,7 +22,7 @@
     },
     {
       "key": "hackerspace",
-      "description": "Layer 'Hackerspace' shows <span class='line-through'>hackerspace</span> with a fixed text, namely 'This is a traditional (software oriented) hackerspace' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Hackerspaces') Picking this answer will delete the key hackerspace.",
+      "description": "Layer 'Hackerspace' shows  with a fixed text, namely 'This is a traditional (software oriented) hackerspace' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Hackerspaces') Picking this answer will delete the key hackerspace.",
       "value": ""
     },
     {
@@ -33,14 +33,26 @@
       "key": "website",
       "description": "Layer 'Hackerspace' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Hackerspaces')"
     },
+    {
+      "key": "contact:website",
+      "description": "Layer 'Hackerspace' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Hackerspaces')"
+    },
     {
       "key": "email",
       "description": "Layer 'Hackerspace' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Hackerspaces')"
     },
+    {
+      "key": "contact:email",
+      "description": "Layer 'Hackerspace' shows contact:email~^..*$ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Hackerspaces')"
+    },
     {
       "key": "phone",
       "description": "Layer 'Hackerspace' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Hackerspaces')"
     },
+    {
+      "key": "contact:phone",
+      "description": "Layer 'Hackerspace' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Hackerspaces')"
+    },
     {
       "key": "opening_hours",
       "description": "Layer 'Hackerspace' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Hackerspaces')"
diff --git a/Docs/TagInfo/mapcomplete_hailhydrant.json b/Docs/TagInfo/mapcomplete_hailhydrant.json
index 48f1fc0d60..f7bc882ad0 100644
--- a/Docs/TagInfo/mapcomplete_hailhydrant.json
+++ b/Docs/TagInfo/mapcomplete_hailhydrant.json
@@ -21,7 +21,7 @@
     },
     {
       "key": "colour",
-      "description": "Layer 'Map of hydrants' shows <span class='line-through'>colour</span> with a fixed text, namely 'The hydrant color is unknown.' (in the MapComplete.osm.be theme 'Hydrants, Extinguishers, Fire stations, and Ambulance stations.') Picking this answer will delete the key colour.",
+      "description": "Layer 'Map of hydrants' shows  with a fixed text, namely 'The hydrant color is unknown.' (in the MapComplete.osm.be theme 'Hydrants, Extinguishers, Fire stations, and Ambulance stations.') Picking this answer will delete the key colour.",
       "value": ""
     },
     {
@@ -40,7 +40,7 @@
     },
     {
       "key": "fire_hydrant:type",
-      "description": "Layer 'Map of hydrants' shows <span class='line-through'>fire_hydrant:type</span> with a fixed text, namely 'The hydrant type is unknown.' (in the MapComplete.osm.be theme 'Hydrants, Extinguishers, Fire stations, and Ambulance stations.') Picking this answer will delete the key fire_hydrant:type.",
+      "description": "Layer 'Map of hydrants' shows  with a fixed text, namely 'The hydrant type is unknown.' (in the MapComplete.osm.be theme 'Hydrants, Extinguishers, Fire stations, and Ambulance stations.') Picking this answer will delete the key fire_hydrant:type.",
       "value": ""
     },
     {
@@ -70,22 +70,22 @@
     },
     {
       "key": "disused:emergency",
-      "description": "Layer 'Map of hydrants' shows disused:emergency=fire_hydrant&<span class='line-through'>emergency</span> with a fixed text, namely 'The hydrant is unavailable' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Hydrants, Extinguishers, Fire stations, and Ambulance stations.')",
+      "description": "Layer 'Map of hydrants' shows disused:emergency=fire_hydrant with a fixed text, namely 'The hydrant is unavailable' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Hydrants, Extinguishers, Fire stations, and Ambulance stations.')",
       "value": "fire_hydrant"
     },
     {
       "key": "emergency",
-      "description": "Layer 'Map of hydrants' shows disused:emergency=fire_hydrant&<span class='line-through'>emergency</span> with a fixed text, namely 'The hydrant is unavailable' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Hydrants, Extinguishers, Fire stations, and Ambulance stations.') Picking this answer will delete the key emergency.",
+      "description": "Layer 'Map of hydrants' shows disused:emergency=fire_hydrant with a fixed text, namely 'The hydrant is unavailable' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Hydrants, Extinguishers, Fire stations, and Ambulance stations.') Picking this answer will delete the key emergency.",
       "value": ""
     },
     {
       "key": "removed:emergency",
-      "description": "Layer 'Map of hydrants' shows removed:emergency=fire_hydrant&<span class='line-through'>emergency</span> with a fixed text, namely 'The hydrant has been removed' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Hydrants, Extinguishers, Fire stations, and Ambulance stations.')",
+      "description": "Layer 'Map of hydrants' shows removed:emergency=fire_hydrant with a fixed text, namely 'The hydrant has been removed' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Hydrants, Extinguishers, Fire stations, and Ambulance stations.')",
       "value": "fire_hydrant"
     },
     {
       "key": "emergency",
-      "description": "Layer 'Map of hydrants' shows removed:emergency=fire_hydrant&<span class='line-through'>emergency</span> with a fixed text, namely 'The hydrant has been removed' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Hydrants, Extinguishers, Fire stations, and Ambulance stations.') Picking this answer will delete the key emergency.",
+      "description": "Layer 'Map of hydrants' shows removed:emergency=fire_hydrant with a fixed text, namely 'The hydrant has been removed' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Hydrants, Extinguishers, Fire stations, and Ambulance stations.') Picking this answer will delete the key emergency.",
       "value": ""
     },
     {
diff --git a/Docs/TagInfo/mapcomplete_maps.json b/Docs/TagInfo/mapcomplete_maps.json
index 3890e93361..a930aa1b78 100644
--- a/Docs/TagInfo/mapcomplete_maps.json
+++ b/Docs/TagInfo/mapcomplete_maps.json
@@ -42,12 +42,12 @@
     },
     {
       "key": "map_source",
-      "description": "Layer 'Maps' shows map_source=OpenStreetMap&<span class='line-through'>not:map_source</span> with a fixed text, namely 'This map is based on OpenStreetMap' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'A map of maps')",
+      "description": "Layer 'Maps' shows map_source=OpenStreetMap with a fixed text, namely 'This map is based on OpenStreetMap' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'A map of maps')",
       "value": "OpenStreetMap"
     },
     {
       "key": "not:map_source",
-      "description": "Layer 'Maps' shows map_source=OpenStreetMap&<span class='line-through'>not:map_source</span> with a fixed text, namely 'This map is based on OpenStreetMap' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'A map of maps') Picking this answer will delete the key not:map_source.",
+      "description": "Layer 'Maps' shows map_source=OpenStreetMap with a fixed text, namely 'This map is based on OpenStreetMap' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'A map of maps') Picking this answer will delete the key not:map_source.",
       "value": ""
     },
     {
diff --git a/Docs/TagInfo/mapcomplete_nature.json b/Docs/TagInfo/mapcomplete_nature.json
index 3ab3c58606..db56810a20 100644
--- a/Docs/TagInfo/mapcomplete_nature.json
+++ b/Docs/TagInfo/mapcomplete_nature.json
@@ -37,7 +37,7 @@
     },
     {
       "key": "operational_status",
-      "description": "Layer 'Drinking water' shows <span class='line-through'>operational_status</span> with a fixed text, namely 'This drinking water works' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in') Picking this answer will delete the key operational_status.",
+      "description": "Layer 'Drinking water' shows  with a fixed text, namely 'This drinking water works' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in') Picking this answer will delete the key operational_status.",
       "value": ""
     },
     {
@@ -83,17 +83,17 @@
     },
     {
       "key": "shelter",
-      "description": "Layer 'Vogelkijkhutten' shows shelter=no&<span class='line-through'>building</span>&<span class='line-through'>amenity</span> with a fixed text, namely 'Vogelkijkwand' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in')",
+      "description": "Layer 'Vogelkijkhutten' shows shelter=no with a fixed text, namely 'Vogelkijkwand' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in')",
       "value": "no"
     },
     {
       "key": "building",
-      "description": "Layer 'Vogelkijkhutten' shows shelter=no&<span class='line-through'>building</span>&<span class='line-through'>amenity</span> with a fixed text, namely 'Vogelkijkwand' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in') Picking this answer will delete the key building.",
+      "description": "Layer 'Vogelkijkhutten' shows shelter=no with a fixed text, namely 'Vogelkijkwand' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in') Picking this answer will delete the key building.",
       "value": ""
     },
     {
       "key": "amenity",
-      "description": "Layer 'Vogelkijkhutten' shows shelter=no&<span class='line-through'>building</span>&<span class='line-through'>amenity</span> with a fixed text, namely 'Vogelkijkwand' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in') Picking this answer will delete the key amenity.",
+      "description": "Layer 'Vogelkijkhutten' shows shelter=no with a fixed text, namely 'Vogelkijkwand' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in') Picking this answer will delete the key amenity.",
       "value": ""
     },
     {
@@ -202,12 +202,12 @@
     },
     {
       "key": "map_source",
-      "description": "Layer 'Maps' shows map_source=OpenStreetMap&<span class='line-through'>not:map_source</span> with a fixed text, namely 'This map is based on OpenStreetMap' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in')",
+      "description": "Layer 'Maps' shows map_source=OpenStreetMap with a fixed text, namely 'This map is based on OpenStreetMap' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in')",
       "value": "OpenStreetMap"
     },
     {
       "key": "not:map_source",
-      "description": "Layer 'Maps' shows map_source=OpenStreetMap&<span class='line-through'>not:map_source</span> with a fixed text, namely 'This map is based on OpenStreetMap' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in') Picking this answer will delete the key not:map_source.",
+      "description": "Layer 'Maps' shows map_source=OpenStreetMap with a fixed text, namely 'This map is based on OpenStreetMap' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in') Picking this answer will delete the key not:map_source.",
       "value": ""
     },
     {
@@ -288,52 +288,52 @@
     },
     {
       "key": "access",
-      "description": "Layer 'Natuurgebied' shows access=yes&<span class='line-through'>fee</span> with a fixed text, namely 'Vrij toegankelijk' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in')",
+      "description": "Layer 'Natuurgebied' shows access=yes with a fixed text, namely 'Vrij toegankelijk' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in')",
       "value": "yes"
     },
     {
       "key": "fee",
-      "description": "Layer 'Natuurgebied' shows access=yes&<span class='line-through'>fee</span> with a fixed text, namely 'Vrij toegankelijk' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in') Picking this answer will delete the key fee.",
+      "description": "Layer 'Natuurgebied' shows access=yes with a fixed text, namely 'Vrij toegankelijk' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in') Picking this answer will delete the key fee.",
       "value": ""
     },
     {
       "key": "access",
-      "description": "Layer 'Natuurgebied' shows access=no&<span class='line-through'>fee</span> with a fixed text, namely 'Niet toegankelijk' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in')",
+      "description": "Layer 'Natuurgebied' shows access=no with a fixed text, namely 'Niet toegankelijk' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in')",
       "value": "no"
     },
     {
       "key": "fee",
-      "description": "Layer 'Natuurgebied' shows access=no&<span class='line-through'>fee</span> with a fixed text, namely 'Niet toegankelijk' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in') Picking this answer will delete the key fee.",
+      "description": "Layer 'Natuurgebied' shows access=no with a fixed text, namely 'Niet toegankelijk' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in') Picking this answer will delete the key fee.",
       "value": ""
     },
     {
       "key": "access",
-      "description": "Layer 'Natuurgebied' shows access=private&<span class='line-through'>fee</span> with a fixed text, namely 'Niet toegankelijk, want privégebied' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in')",
+      "description": "Layer 'Natuurgebied' shows access=private with a fixed text, namely 'Niet toegankelijk, want privégebied' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in')",
       "value": "private"
     },
     {
       "key": "fee",
-      "description": "Layer 'Natuurgebied' shows access=private&<span class='line-through'>fee</span> with a fixed text, namely 'Niet toegankelijk, want privégebied' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in') Picking this answer will delete the key fee.",
+      "description": "Layer 'Natuurgebied' shows access=private with a fixed text, namely 'Niet toegankelijk, want privégebied' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in') Picking this answer will delete the key fee.",
       "value": ""
     },
     {
       "key": "access",
-      "description": "Layer 'Natuurgebied' shows access=permissive&<span class='line-through'>fee</span> with a fixed text, namely 'Toegankelijk, ondanks dat het privegebied is' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in')",
+      "description": "Layer 'Natuurgebied' shows access=permissive with a fixed text, namely 'Toegankelijk, ondanks dat het privegebied is' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in')",
       "value": "permissive"
     },
     {
       "key": "fee",
-      "description": "Layer 'Natuurgebied' shows access=permissive&<span class='line-through'>fee</span> with a fixed text, namely 'Toegankelijk, ondanks dat het privegebied is' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in') Picking this answer will delete the key fee.",
+      "description": "Layer 'Natuurgebied' shows access=permissive with a fixed text, namely 'Toegankelijk, ondanks dat het privegebied is' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in') Picking this answer will delete the key fee.",
       "value": ""
     },
     {
       "key": "access",
-      "description": "Layer 'Natuurgebied' shows access=guided&<span class='line-through'>fee</span> with a fixed text, namely 'Enkel toegankelijk met een gids of tijdens een activiteit' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in')",
+      "description": "Layer 'Natuurgebied' shows access=guided with a fixed text, namely 'Enkel toegankelijk met een gids of tijdens een activiteit' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in')",
       "value": "guided"
     },
     {
       "key": "fee",
-      "description": "Layer 'Natuurgebied' shows access=guided&<span class='line-through'>fee</span> with a fixed text, namely 'Enkel toegankelijk met een gids of tijdens een activiteit' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in') Picking this answer will delete the key fee.",
+      "description": "Layer 'Natuurgebied' shows access=guided with a fixed text, namely 'Enkel toegankelijk met een gids of tijdens een activiteit' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in') Picking this answer will delete the key fee.",
       "value": ""
     },
     {
@@ -374,12 +374,12 @@
     },
     {
       "key": "noname",
-      "description": "Layer 'Natuurgebied' shows noname=yes&<span class='line-through'>name</span> with a fixed text, namely 'Dit gebied heeft geen naam' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in')",
+      "description": "Layer 'Natuurgebied' shows noname=yes with a fixed text, namely 'Dit gebied heeft geen naam' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in')",
       "value": "yes"
     },
     {
       "key": "name",
-      "description": "Layer 'Natuurgebied' shows noname=yes&<span class='line-through'>name</span> with a fixed text, namely 'Dit gebied heeft geen naam' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in') Picking this answer will delete the key name.",
+      "description": "Layer 'Natuurgebied' shows noname=yes with a fixed text, namely 'Dit gebied heeft geen naam' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'De Natuur in') Picking this answer will delete the key name.",
       "value": ""
     },
     {
@@ -427,7 +427,7 @@
     },
     {
       "key": "wikidata",
-      "description": "Layer 'Natuurgebied' shows <span class='line-through'>wikidata</span> with a fixed text, namely 'No Wikipedia page has been linked yet' (in the MapComplete.osm.be theme 'De Natuur in') Picking this answer will delete the key wikidata.",
+      "description": "Layer 'Natuurgebied' shows  with a fixed text, namely 'No Wikipedia page has been linked yet' (in the MapComplete.osm.be theme 'De Natuur in') Picking this answer will delete the key wikidata.",
       "value": ""
     },
     {
diff --git a/Docs/TagInfo/mapcomplete_observation_towers.json b/Docs/TagInfo/mapcomplete_observation_towers.json
index b24590b65d..54cd526c00 100644
--- a/Docs/TagInfo/mapcomplete_observation_towers.json
+++ b/Docs/TagInfo/mapcomplete_observation_towers.json
@@ -52,18 +52,22 @@
       "key": "website",
       "description": "Layer 'Observation towers' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Observation towers')"
     },
+    {
+      "key": "contact:website",
+      "description": "Layer 'Observation towers' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Observation towers')"
+    },
     {
       "key": "charge",
       "description": "Layer 'Observation towers' shows and asks freeform values for key 'charge' (in the MapComplete.osm.be theme 'Observation towers')"
     },
     {
       "key": "fee",
-      "description": "Layer 'Observation towers' shows fee=no&<span class='line-through'>charge</span> with a fixed text, namely 'Free to visit' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Observation towers')",
+      "description": "Layer 'Observation towers' shows fee=no with a fixed text, namely 'Free to visit' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Observation towers')",
       "value": "no"
     },
     {
       "key": "charge",
-      "description": "Layer 'Observation towers' shows fee=no&<span class='line-through'>charge</span> with a fixed text, namely 'Free to visit' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Observation towers') Picking this answer will delete the key charge.",
+      "description": "Layer 'Observation towers' shows fee=no with a fixed text, namely 'Free to visit' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Observation towers') Picking this answer will delete the key charge.",
       "value": ""
     },
     {
@@ -102,7 +106,7 @@
     },
     {
       "key": "wikidata",
-      "description": "Layer 'Observation towers' shows <span class='line-through'>wikidata</span> with a fixed text, namely 'No Wikipedia page has been linked yet' (in the MapComplete.osm.be theme 'Observation towers') Picking this answer will delete the key wikidata.",
+      "description": "Layer 'Observation towers' shows  with a fixed text, namely 'No Wikipedia page has been linked yet' (in the MapComplete.osm.be theme 'Observation towers') Picking this answer will delete the key wikidata.",
       "value": ""
     },
     {
diff --git a/Docs/TagInfo/mapcomplete_playgrounds.json b/Docs/TagInfo/mapcomplete_playgrounds.json
index 6e333859fb..08803526aa 100644
--- a/Docs/TagInfo/mapcomplete_playgrounds.json
+++ b/Docs/TagInfo/mapcomplete_playgrounds.json
@@ -99,7 +99,7 @@
     },
     {
       "key": "access",
-      "description": "Layer 'Playgrounds' shows <span class='line-through'>access</span> with a fixed text, namely 'Accessible to the general public' (in the MapComplete.osm.be theme 'Playgrounds') Picking this answer will delete the key access.",
+      "description": "Layer 'Playgrounds' shows  with a fixed text, namely 'Accessible to the general public' (in the MapComplete.osm.be theme 'Playgrounds') Picking this answer will delete the key access.",
       "value": ""
     },
     {
@@ -161,7 +161,7 @@
     },
     {
       "key": "opening_hours",
-      "description": "Layer 'Playgrounds' shows <span class='line-through'>opening_hours</span> with a fixed text, namely 'Always accessible' (in the MapComplete.osm.be theme 'Playgrounds') Picking this answer will delete the key opening_hours.",
+      "description": "Layer 'Playgrounds' shows  with a fixed text, namely 'Always accessible' (in the MapComplete.osm.be theme 'Playgrounds') Picking this answer will delete the key opening_hours.",
       "value": ""
     },
     {
diff --git a/Docs/TagInfo/mapcomplete_sport_pitches.json b/Docs/TagInfo/mapcomplete_sport_pitches.json
index 7654c2cfef..1a5ceff5b8 100644
--- a/Docs/TagInfo/mapcomplete_sport_pitches.json
+++ b/Docs/TagInfo/mapcomplete_sport_pitches.json
@@ -148,7 +148,7 @@
     },
     {
       "key": "opening_hours",
-      "description": "Layer 'Sport pitches' shows <span class='line-through'>opening_hours</span> with a fixed text, namely '24/7 toegankelijk' (in the MapComplete.osm.be theme 'Sport pitches') Picking this answer will delete the key opening_hours.",
+      "description": "Layer 'Sport pitches' shows  with a fixed text, namely '24/7 toegankelijk' (in the MapComplete.osm.be theme 'Sport pitches') Picking this answer will delete the key opening_hours.",
       "value": ""
     },
     {
diff --git a/Docs/TagInfo/mapcomplete_surveillance.json b/Docs/TagInfo/mapcomplete_surveillance.json
index d6bc9d84c0..4223f2a7b9 100644
--- a/Docs/TagInfo/mapcomplete_surveillance.json
+++ b/Docs/TagInfo/mapcomplete_surveillance.json
@@ -75,12 +75,12 @@
     },
     {
       "key": "camera:direction",
-      "description": "Layer 'Surveillance camera's' shows <span class='line-through'>camera:direction</span>&direction~^..*$ with a fixed text, namely 'Films to a compass heading of {direction}' (in the MapComplete.osm.be theme 'Surveillance under Surveillance') Picking this answer will delete the key camera:direction.",
+      "description": "Layer 'Surveillance camera's' shows direction~^..*$ with a fixed text, namely 'Films to a compass heading of {direction}' (in the MapComplete.osm.be theme 'Surveillance under Surveillance') Picking this answer will delete the key camera:direction.",
       "value": ""
     },
     {
       "key": "direction",
-      "description": "Layer 'Surveillance camera's' shows <span class='line-through'>camera:direction</span>&direction~^..*$ with a fixed text, namely 'Films to a compass heading of {direction}' (in the MapComplete.osm.be theme 'Surveillance under Surveillance')"
+      "description": "Layer 'Surveillance camera's' shows direction~^..*$ with a fixed text, namely 'Films to a compass heading of {direction}' (in the MapComplete.osm.be theme 'Surveillance under Surveillance')"
     },
     {
       "key": "operator",
@@ -113,7 +113,7 @@
     },
     {
       "key": "indoor",
-      "description": "Layer 'Surveillance camera's' shows <span class='line-through'>indoor</span> with a fixed text, namely 'This camera is probably located outdoors' (in the MapComplete.osm.be theme 'Surveillance under Surveillance') Picking this answer will delete the key indoor.",
+      "description": "Layer 'Surveillance camera's' shows  with a fixed text, namely 'This camera is probably located outdoors' (in the MapComplete.osm.be theme 'Surveillance under Surveillance') Picking this answer will delete the key indoor.",
       "value": ""
     },
     {
diff --git a/Docs/TagInfo/mapcomplete_toilets.json b/Docs/TagInfo/mapcomplete_toilets.json
index bb3b061a39..f1daf8345a 100644
--- a/Docs/TagInfo/mapcomplete_toilets.json
+++ b/Docs/TagInfo/mapcomplete_toilets.json
@@ -193,7 +193,7 @@
     },
     {
       "key": "level",
-      "description": "Layer 'Toilets' shows <span class='line-through'>level</span> with a fixed text, namely 'Located on the ground floor' (in the MapComplete.osm.be theme 'Open Toilet Map') Picking this answer will delete the key level.",
+      "description": "Layer 'Toilets' shows  with a fixed text, namely 'Located on the ground floor' (in the MapComplete.osm.be theme 'Open Toilet Map') Picking this answer will delete the key level.",
       "value": ""
     },
     {
diff --git a/Docs/TagInfo/mapcomplete_trees.json b/Docs/TagInfo/mapcomplete_trees.json
index abf1e435ef..0e6f4fe95d 100644
--- a/Docs/TagInfo/mapcomplete_trees.json
+++ b/Docs/TagInfo/mapcomplete_trees.json
@@ -106,12 +106,12 @@
     },
     {
       "key": "name",
-      "description": "Layer 'Tree' shows <span class='line-through'>name</span>&noname=yes with a fixed text, namely 'The tree does not have a name.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Trees') Picking this answer will delete the key name.",
+      "description": "Layer 'Tree' shows noname=yes with a fixed text, namely 'The tree does not have a name.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Trees') Picking this answer will delete the key name.",
       "value": ""
     },
     {
       "key": "noname",
-      "description": "Layer 'Tree' shows <span class='line-through'>name</span>&noname=yes with a fixed text, namely 'The tree does not have a name.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Trees')",
+      "description": "Layer 'Tree' shows noname=yes with a fixed text, namely 'The tree does not have a name.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Trees')",
       "value": "yes"
     },
     {
@@ -136,22 +136,22 @@
     },
     {
       "key": "heritage",
-      "description": "Layer 'Tree' shows heritage=yes&<span class='line-through'>heritage:operator</span> with a fixed text, namely 'Registered as heritage by a different organisation' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Trees')",
+      "description": "Layer 'Tree' shows heritage=yes with a fixed text, namely 'Registered as heritage by a different organisation' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Trees')",
       "value": "yes"
     },
     {
       "key": "heritage:operator",
-      "description": "Layer 'Tree' shows heritage=yes&<span class='line-through'>heritage:operator</span> with a fixed text, namely 'Registered as heritage by a different organisation' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Trees') Picking this answer will delete the key heritage:operator.",
+      "description": "Layer 'Tree' shows heritage=yes with a fixed text, namely 'Registered as heritage by a different organisation' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Trees') Picking this answer will delete the key heritage:operator.",
       "value": ""
     },
     {
       "key": "heritage",
-      "description": "Layer 'Tree' shows heritage=no&<span class='line-through'>heritage:operator</span> with a fixed text, namely 'Not registered as heritage' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Trees')",
+      "description": "Layer 'Tree' shows heritage=no with a fixed text, namely 'Not registered as heritage' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Trees')",
       "value": "no"
     },
     {
       "key": "heritage:operator",
-      "description": "Layer 'Tree' shows heritage=no&<span class='line-through'>heritage:operator</span> with a fixed text, namely 'Not registered as heritage' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Trees') Picking this answer will delete the key heritage:operator.",
+      "description": "Layer 'Tree' shows heritage=no with a fixed text, namely 'Not registered as heritage' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Trees') Picking this answer will delete the key heritage:operator.",
       "value": ""
     },
     {
diff --git a/Docs/TagInfo/mapcomplete_waste_basket.json b/Docs/TagInfo/mapcomplete_waste_basket.json
index 6aa6be0ad4..ff89c53f35 100644
--- a/Docs/TagInfo/mapcomplete_waste_basket.json
+++ b/Docs/TagInfo/mapcomplete_waste_basket.json
@@ -17,7 +17,7 @@
     },
     {
       "key": "waste",
-      "description": "Layer 'Waste Basket' shows <span class='line-through'>waste</span> with a fixed text, namely 'A waste basket for general waste' (in the MapComplete.osm.be theme 'Waste Basket') Picking this answer will delete the key waste.",
+      "description": "Layer 'Waste Basket' shows  with a fixed text, namely 'A waste basket for general waste' (in the MapComplete.osm.be theme 'Waste Basket') Picking this answer will delete the key waste.",
       "value": ""
     },
     {
@@ -47,27 +47,27 @@
     },
     {
       "key": "vending",
-      "description": "Layer 'Waste Basket' shows vending=dog_excrement_bag&<span class='line-through'>not:vending</span> with a fixed text, namely 'This waste basket has a dispenser for (dog) excrement bags' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste Basket')",
+      "description": "Layer 'Waste Basket' shows vending=dog_excrement_bag with a fixed text, namely 'This waste basket has a dispenser for (dog) excrement bags' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste Basket')",
       "value": "dog_excrement_bag"
     },
     {
       "key": "not:vending",
-      "description": "Layer 'Waste Basket' shows vending=dog_excrement_bag&<span class='line-through'>not:vending</span> with a fixed text, namely 'This waste basket has a dispenser for (dog) excrement bags' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste Basket') Picking this answer will delete the key not:vending.",
+      "description": "Layer 'Waste Basket' shows vending=dog_excrement_bag with a fixed text, namely 'This waste basket has a dispenser for (dog) excrement bags' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste Basket') Picking this answer will delete the key not:vending.",
       "value": ""
     },
     {
       "key": "not:vending",
-      "description": "Layer 'Waste Basket' shows not:vending=dog_excrement_bag&<span class='line-through'>vending</span> with a fixed text, namely 'This waste basket <b>does not</b> have a dispenser for (dog) excrement bags' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste Basket')",
+      "description": "Layer 'Waste Basket' shows not:vending=dog_excrement_bag with a fixed text, namely 'This waste basket <b>does not</b> have a dispenser for (dog) excrement bags' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste Basket')",
       "value": "dog_excrement_bag"
     },
     {
       "key": "vending",
-      "description": "Layer 'Waste Basket' shows not:vending=dog_excrement_bag&<span class='line-through'>vending</span> with a fixed text, namely 'This waste basket <b>does not</b> have a dispenser for (dog) excrement bags' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste Basket') Picking this answer will delete the key vending.",
+      "description": "Layer 'Waste Basket' shows not:vending=dog_excrement_bag with a fixed text, namely 'This waste basket <b>does not</b> have a dispenser for (dog) excrement bags' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste Basket') Picking this answer will delete the key vending.",
       "value": ""
     },
     {
       "key": "vending",
-      "description": "Layer 'Waste Basket' shows <span class='line-through'>vending</span> with a fixed text, namely 'This waste basket <b>does not</b> have a dispenser for (dog) excrement bags' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste Basket') Picking this answer will delete the key vending.",
+      "description": "Layer 'Waste Basket' shows  with a fixed text, namely 'This waste basket <b>does not</b> have a dispenser for (dog) excrement bags' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Waste Basket') Picking this answer will delete the key vending.",
       "value": ""
     },
     {
diff --git a/Logic/ExtraFunctions.ts b/Logic/ExtraFunctions.ts
index 8687196e18..f8da9a1d1d 100644
--- a/Logic/ExtraFunctions.ts
+++ b/Logic/ExtraFunctions.ts
@@ -44,10 +44,7 @@ class OverlapFunc implements ExtraFunction {
     _f(params, feat) {
         return (...layerIds: string[]) => {
             const result: { feat: any, overlap: number }[] = []
-
-            console.log("Calculating overlap")
             const bbox = BBox.get(feat)
-
             for (const layerId of layerIds) {
                 const otherLayers = params.getFeaturesWithin(layerId, bbox)
                 if (otherLayers === undefined) {
diff --git a/Logic/Osm/OsmConnection.ts b/Logic/Osm/OsmConnection.ts
index 04d6db059f..6345477649 100644
--- a/Logic/Osm/OsmConnection.ts
+++ b/Logic/Osm/OsmConnection.ts
@@ -223,6 +223,12 @@ export class OsmConnection {
         if ((text ?? "") !== "") {
             textSuffix = "?text=" + encodeURIComponent(text)
         }
+        if(this._dryRun){
+            console.warn("Dryrun enabled - not actually closing note ", id, " with text ", text)
+            return new Promise((ok, error) => {
+                ok()
+            });
+        }
         return new Promise((ok, error) => {
             this.auth.xhr({
                 method: 'POST',
@@ -240,6 +246,12 @@ export class OsmConnection {
     }
 
     public reopenNote(id: number | string, text?: string): Promise<any> {
+        if(this._dryRun){
+            console.warn("Dryrun enabled - not actually reopening note ", id, " with text ", text)
+            return new Promise((ok, error) => {
+                ok()
+            });
+        }
         let textSuffix = ""
         if ((text ?? "") !== "") {
             textSuffix = "?text=" + encodeURIComponent(text)
@@ -261,6 +273,12 @@ export class OsmConnection {
     }
 
     public addCommentToNode(id: number | string, text: string): Promise<any> {
+        if(this._dryRun){
+            console.warn("Dryrun enabled - not actually adding comment ",text, "to  note ", id)
+            return new Promise((ok, error) => {
+                ok()
+            });
+        }
         if ((text ?? "") === "") {
             throw "Invalid text!"
         }
diff --git a/Models/Constants.ts b/Models/Constants.ts
index 8b437b79ff..187d3e0c5e 100644
--- a/Models/Constants.ts
+++ b/Models/Constants.ts
@@ -22,7 +22,7 @@ export default class Constants {
     /**
      * Layer IDs of layers which have special properties through built-in hooks
      */
-    public static readonly priviliged_layers: string[] = [...Constants.added_by_default, "type_node", "notes", ...Constants.no_include]
+    public static readonly priviliged_layers: string[] = [...Constants.added_by_default, "type_node", "note", ...Constants.no_include]
 
  
     // The user journey states thresholds when a new feature gets unlocked
diff --git a/UI/BigComponents/ThemeIntroductionPanel.ts b/UI/BigComponents/ThemeIntroductionPanel.ts
index ae37813252..1a5d24a45c 100644
--- a/UI/BigComponents/ThemeIntroductionPanel.ts
+++ b/UI/BigComponents/ThemeIntroductionPanel.ts
@@ -4,46 +4,33 @@ import LanguagePicker from "../LanguagePicker";
 import Translations from "../i18n/Translations";
 import Toggle from "../Input/Toggle";
 import {SubtleButton} from "../Base/SubtleButton";
-import Svg from "../../Svg";
 import {UIEventSource} from "../../Logic/UIEventSource";
+import {LoginToggle} from "../Popup/LoginButton";
 
 export default class ThemeIntroductionPanel extends Combine {
 
     constructor(isShown: UIEventSource<boolean>) {
+        const t = Translations.t.general
         const layout = State.state.layoutToUse
 
-        const languagePicker = LanguagePicker.CreateLanguagePicker(layout.language, Translations.t.general.pickLanguage.Clone())
+        const languagePicker = LanguagePicker.CreateLanguagePicker(layout.language, t.pickLanguage.Clone())
 
         const toTheMap = new SubtleButton(
             undefined,
-            Translations.t.general.openTheMap.Clone().SetClass("text-xl font-bold w-full text-center")
+            t.openTheMap.Clone().SetClass("text-xl font-bold w-full text-center")
         ).onClick(() => {
             isShown.setData(false)
         }).SetClass("only-on-mobile")
 
-        const plzLogIn =
-            new SubtleButton(
-                Svg.osm_logo_ui(),
-
-                new Combine([Translations.t.general.loginWithOpenStreetMap
-                    .Clone().SetClass("text-xl font-bold"),
-                    Translations.t.general.loginOnlyNeededToEdit.Clone().SetClass("font-bold")]
-                ).SetClass("flex flex-col text-center w-full")
-            )
-                .onClick(() => {
-                    State.state.osmConnection.AttemptLogin()
-                });
-
-
-        const welcomeBack = Translations.t.general.welcomeBack.Clone();
-
 
         const loginStatus =
             new Toggle(
-                new Toggle(
-                    welcomeBack,
-                    plzLogIn,
-                    State.state.osmConnection.isLoggedIn
+                new LoginToggle(
+                    t.welcomeBack,
+                    new Combine([Translations.t.general.loginWithOpenStreetMap.SetClass("text-xl font-bold"),
+                        Translations.t.general.loginOnlyNeededToEdit.Clone().SetClass("font-bold")]
+                    ).SetClass("flex flex-col"),
+                    State.state
                 ),
                 undefined,
                 State.state.featureSwitchUserbadge
diff --git a/UI/Input/InputElementWrapper.ts b/UI/Input/InputElementWrapper.ts
index 765a0d3b4b..5a6633ade3 100644
--- a/UI/Input/InputElementWrapper.ts
+++ b/UI/Input/InputElementWrapper.ts
@@ -3,13 +3,14 @@ import {UIEventSource} from "../../Logic/UIEventSource";
 import BaseUIElement from "../BaseUIElement";
 import {Translation} from "../i18n/Translation";
 import {SubstitutedTranslation} from "../SubstitutedTranslation";
+import FeaturePipelineState from "../../Logic/State/FeaturePipelineState";
 
 export default class InputElementWrapper<T> extends InputElement<T> {
     public readonly IsSelected: UIEventSource<boolean>;
     private readonly _inputElement: InputElement<T>;
     private readonly _renderElement: BaseUIElement
 
-    constructor(inputElement: InputElement<T>, translation: Translation, key: string, tags: UIEventSource<any>) {
+    constructor(inputElement: InputElement<T>, translation: Translation, key: string, tags: UIEventSource<any>, state: FeaturePipelineState) {
         super()
         this._inputElement = inputElement;
         this.IsSelected = inputElement.IsSelected
@@ -17,7 +18,12 @@ export default class InputElementWrapper<T> extends InputElement<T> {
 
         mapping.set(key, inputElement)
 
-        this._renderElement = new SubstitutedTranslation(translation, tags, mapping)
+        // Bit of a hack: the SubstitutedTranslation expects a special rendering, but those are formatted '{key()}' instead of '{key}', so we substitute it first
+        const newTranslations ={}
+        for (const lang in translation.translations) {
+           newTranslations[lang] = translation.translations[lang].replace("{"+key+"}", "{"+key+"()}") 
+        }
+        this._renderElement = new SubstitutedTranslation(new Translation(newTranslations), tags, state, mapping)
     }
 
     GetValue(): UIEventSource<T> {
diff --git a/UI/Popup/ImportButton.ts b/UI/Popup/ImportButton.ts
index 77d13427f4..4d7c409d3a 100644
--- a/UI/Popup/ImportButton.ts
+++ b/UI/Popup/ImportButton.ts
@@ -37,7 +37,6 @@ import TagApplyButton from "./TagApplyButton";
 import LayerConfig from "../../Models/ThemeConfig/LayerConfig";
 import * as conflation_json from "../../assets/layers/conflation/conflation.json";
 import {GeoOperations} from "../../Logic/GeoOperations";
-import {Or} from "../../Logic/Tags/Or";
 
 
 abstract class AbstractImportButton implements SpecialVisualizations {
@@ -93,7 +92,7 @@ ${Utils.special_visualizations_importRequirementDocs}
                               onCancelClicked: () => void): BaseUIElement;
 
 
-    constr(state, tagSource, argsRaw, guiState) {
+    constr(state, tagSource: UIEventSource<any>, argsRaw, guiState) {
         const self = this;
         /**
          * Some generic import button pre-validation is implemented here:
@@ -135,7 +134,14 @@ ${Utils.special_visualizations_importRequirementDocs}
 
 
         // Explanation of the tags that will be applied onto the imported/conflated object
-        const newTags = TagApplyButton.generateTagsToApply(args.tags, tagSource)
+        
+        let tagSpec = args.tags;
+        if(tagSpec.indexOf(" ")< 0 && tagSpec.indexOf(";") < 0){
+            // This is probably a key
+            tagSpec = tagSource.data[args.tags]
+        }
+        
+        const newTags = TagApplyButton.generateTagsToApply(tagSpec, tagSource)
         const appliedTags = new Toggle(
             new VariableUiElement(
                 newTags.map(tgs => {
@@ -503,6 +509,9 @@ export class ImportPointButton extends AbstractImportButton {
                     name: "max_snap_distance",
                     doc: "The maximum distance that the imported point will be moved to snap onto a way in an already existing layer (in meters). This is previewed to the contributor, similar to the 'add new point'-action of MapComplete",
                     defaultValue: "5"
+                },{
+                name:"note_id",
+                    doc:"If given, this key will be read. The corresponding note on OSM will be closed, stating 'imported'"
                 }],
             false
         )
@@ -524,7 +533,7 @@ export class ImportPointButton extends AbstractImportButton {
     }
 
     private static createConfirmPanelForPoint(
-        args: { max_snap_distance: string, snap_onto_layers: string, icon: string, text: string, newTags: UIEventSource<any>, targetLayer: string },
+        args: { max_snap_distance: string, snap_onto_layers: string, icon: string, text: string, newTags: UIEventSource<any>, targetLayer: string, note_id: string },
         state: FeaturePipelineState,
         guiState: DefaultGuiState,
         originalFeatureTags: UIEventSource<any>,
@@ -550,6 +559,11 @@ export class ImportPointButton extends AbstractImportButton {
             state.selectedElement.setData(state.allElements.ContainingFeatures.get(
                 newElementAction.newElementId
             ))
+            if(args.note_id !== undefined){
+                state.osmConnection.closeNote(args.note_id, "imported")
+                originalFeatureTags.data["closed_at"] = new Date().toISOString()
+                originalFeatureTags.ping()
+            }
         }
 
         const presetInfo = <PresetInfo>{
diff --git a/UI/Popup/TagRenderingQuestion.ts b/UI/Popup/TagRenderingQuestion.ts
index fdaf1e5329..76313e2fd3 100644
--- a/UI/Popup/TagRenderingQuestion.ts
+++ b/UI/Popup/TagRenderingQuestion.ts
@@ -418,7 +418,7 @@ export default class TagRenderingQuestion extends Combine {
         if (freeform.inline) {
 
             inputTagsFilter.SetClass("w-16-imp")
-            inputTagsFilter = new InputElementWrapper(inputTagsFilter, configuration.render, freeform.key, tags)
+            inputTagsFilter = new InputElementWrapper(inputTagsFilter, configuration.render, freeform.key, tags, State.state)
             inputTagsFilter.SetClass("block")
 
         }
diff --git a/UI/SpecialVisualizations.ts b/UI/SpecialVisualizations.ts
index 0991250ba2..28611fcb55 100644
--- a/UI/SpecialVisualizations.ts
+++ b/UI/SpecialVisualizations.ts
@@ -45,6 +45,7 @@ import NoteCommentElement from "./Popup/NoteCommentElement";
 import ImgurUploader from "../Logic/ImageProviders/ImgurUploader";
 import FileSelectorButton from "./Input/FileSelectorButton";
 import {LoginToggle} from "./Popup/LoginButton";
+import {start} from "repl";
 
 export interface SpecialVisualization {
     funcName: string,
@@ -650,7 +651,7 @@ export default class SpecialVisualizations {
                 },
                 {
                     funcName: "close_note",
-                    docs: "Button to close a note - eventually with a prefixed text",
+                    docs: "Button to close a note. A predifined text can be defined to close the note with. If the note is already closed, will show a small text.",
                     args: [
                         {
                             name: "text",
@@ -675,8 +676,8 @@ export default class SpecialVisualizations {
                         const t = Translations.t.notes;
 
                         let icon = Svg.checkmark_svg()
-                        if (args[2] !== "checkmark.svg" && (args[2] ?? "") !== "") {
-                            icon = new Img(args[2])
+                        if (args[1] !== "checkmark.svg" && (args[2] ?? "") !== "") {
+                            icon = new Img(args[1])
                         }
                         let textToShow = t.closeNote;
                         if ((args[0] ?? "") !== "") {
@@ -684,14 +685,11 @@ export default class SpecialVisualizations {
                         }
 
                         const closeButton = new SubtleButton(icon, textToShow)
-                        const isClosed = tags.map(tags => (tags["closed_at"] ?? "") === "");
+                        const isClosed = tags.map(tags => (tags["closed_at"] ?? "") !== "");
                         closeButton.onClick(() => {
-                            const id = tags.data[args[1] ?? "id"]
-                            if (state.featureSwitchIsTesting.data) {
-                                console.log("Not actually closing note...")
-                                return;
-                            }
-                            state.osmConnection.closeNote(id, args[3]).then(_ => {
+                            const id = tags.data[args[2] ?? "id"]
+                            state.osmConnection.closeNote(id, args[3])
+                                ?.then(_ => {
                                 tags.data["closed_at"] = new Date().toISOString();
                                 tags.ping()
                             })
@@ -720,7 +718,7 @@ export default class SpecialVisualizations {
                         textField.SetClass("rounded-l border border-grey")
                         const txt = textField.GetValue()
 
-                        const addCommentButton = new SubtleButton(undefined, t.addCommentPlaceholder)
+                        const addCommentButton = new SubtleButton(Svg.addSmall_svg().SetClass("max-h-7"), t.addCommentPlaceholder)
                             .onClick(async () => {
                                 const id = tags.data[args[1] ?? "id"]
 
@@ -740,7 +738,7 @@ export default class SpecialVisualizations {
                             })
 
 
-                        const close = new SubtleButton(undefined, new VariableUiElement(txt.map(txt => {
+                        const close = new SubtleButton(Svg.resolved_svg().SetClass("max-h-7"), new VariableUiElement(txt.map(txt => {
                             if (txt === undefined || txt === "") {
                                 return t.closeNote
                             }
@@ -757,7 +755,7 @@ export default class SpecialVisualizations {
                             })
                         })
 
-                        const reopen = new SubtleButton(undefined, new VariableUiElement(txt.map(txt => {
+                        const reopen = new SubtleButton(Svg.note_svg().SetClass("max-h-7"), new VariableUiElement(txt.map(txt => {
                             if (txt === undefined || txt === "") {
                                 return t.reopenNote
                             }
@@ -788,12 +786,17 @@ export default class SpecialVisualizations {
                 },
                 {
                     funcName: "visualize_note_comments",
-                    docs: "Visualises the comments for nodes",
+                    docs: "Visualises the comments for notes",
                     args: [
                         {
                             name: "commentsKey",
                             doc: "The property name of the comments, which should be stringified json",
                             defaultValue: "comments"
+                        },
+                        {
+                            name: "start",
+                            doc:"Drop the first 'start' comments",
+                            defaultValue: "0"
                         }
                     ]
                     , constr: (state, tags, args) =>
@@ -801,6 +804,10 @@ export default class SpecialVisualizations {
                             tags.map(tags => tags[args[0]])
                                 .map(commentsStr => {
                                     const comments: any[] = JSON.parse(commentsStr)
+                                    const startLoc = Number(args[1] ?? 0)
+                                    if(!isNaN(startLoc) && startLoc > 0){
+                                        comments.splice(0, startLoc)
+                                    }
                                     return new Combine(comments
                                         .filter(c => c.text !== "")
                                         .map(c => new NoteCommentElement(c))).SetClass("flex flex-col")
diff --git a/UI/SubstitutedTranslation.ts b/UI/SubstitutedTranslation.ts
index 98a889952e..a71598d5f2 100644
--- a/UI/SubstitutedTranslation.ts
+++ b/UI/SubstitutedTranslation.ts
@@ -8,13 +8,14 @@ import {VariableUiElement} from "./Base/VariableUIElement";
 import Combine from "./Base/Combine";
 import BaseUIElement from "./BaseUIElement";
 import {DefaultGuiState} from "./DefaultGuiState";
+import FeaturePipelineState from "../Logic/State/FeaturePipelineState";
 
 export class SubstitutedTranslation extends VariableUiElement {
 
     public constructor(
         translation: Translation,
         tagsSource: UIEventSource<any>,
-        state,
+        state: FeaturePipelineState,
         mapping: Map<string, BaseUIElement> = undefined) {
 
         const extraMappings: SpecialVisualization[] = [];
@@ -71,7 +72,7 @@ export class SubstitutedTranslation extends VariableUiElement {
             style: string
         }
     }[] {
-
+        
         for (const knownSpecial of SpecialVisualizations.specialVisualizations.concat(extraMappings)) {
 
             // Note: the '.*?' in the regex reads as 'any character, but in a non-greedy way'
diff --git a/Utils.ts b/Utils.ts
index 949645408e..3971075cf1 100644
--- a/Utils.ts
+++ b/Utils.ts
@@ -277,7 +277,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
                 }
                 v = v.replace(/\n/g, "<br/>")
             }
-            txt = txt.replace("{" + key + "}", v ?? "")
+            txt = txt.replace("{" + key + "}", v)
             match = txt.match(regex)
         }
 
diff --git a/assets/layers/note_import/note_import.json b/assets/layers/note_import/note_import.json
index 0d4389a3ea..58b0919f43 100644
--- a/assets/layers/note_import/note_import.json
+++ b/assets/layers/note_import/note_import.json
@@ -1,13 +1,16 @@
 {
   "id": "note_import",
-  "description": "Te template for note note imports.",
+  "name": {
+    "en": "Possible bookcases"
+  },
+  "description": "Template for note note imports.",
   "source": {
     "osmTags": {
       "and": [
         "id~*"
       ]
     },
-    "geoJson": "https://api.openstreetmap.org/api/0.6/notes.json?closed=7&bbox={x_min},{y_min},{x_max},{y_max}",
+    "geoJson": "https://api.openstreetmap.org/api/0.6/notes.json?closed=0&bbox={x_min},{y_min},{x_max},{y_max}",
     "geoJsonZoomLevel": 12,
     "maxCacheAge": 0
   },
@@ -19,8 +22,17 @@
   },
   "calculatedTags": [
     "_first_comment:=feat.get('comments')[0].text.toLowerCase()",
-    "_is_import_comment:=(() => {const parsed = feat.properties._first_comment.match('\\(.*\\)https:\\/\\/mapcomplete\\.osm\\.be\\/\\([a-zA-Z0-9_-]*\\)[^\\n]*}')()"
+    "_trigger_index:=(() => {const lines = feat.properties['_first_comment'].split('\\n'); const matchesMapCompleteURL = lines.map(l => l.match(\".*https://mapcomplete.osm.be/\\([a-zA-Z_-]+\\)\\(.html\\).*#import\")); const matchedIndexes = matchesMapCompleteURL.map((doesMatch, i) => [doesMatch !== null, i]).filter(v => v[0]).map(v => v[1]); return matchedIndexes[0] })()",
+    "_intro:=(() => {const lines = feat.properties['_first_comment'].split('\\n'); lines.splice(feat.get('_trigger_index')-1, lines.length); return lines.map(l => l == '' ? '<br/>' : l).join('');})()",
+    "_tags:=(() => {let lines = feat.properties['_first_comment'].split('\\n').map(l => l.trim()); lines.splice(0, feat.get('_trigger_index') + 1); lines = lines.filter(l => l != ''); return lines.join(';');})()"
   ],
+  "isShown": {
+    "render": "yes",
+    "mappings": [{
+      "if": "_trigger_index=",
+      "then": "no"
+    }]
+  },
   "titleIcons": [
     {
       "render": "<a href='https://openstreetmap.org/note/{id}' target='_blank'><img src='./assets/svg/osm-logo-us.svg'></a>"
@@ -29,15 +41,32 @@
   "tagRenderings": [
     {
       "id": "conversation",
-      "render": "{visualize_note_comments()}"
+      "render": "{visualize_note_comments(comments,1)}"
+    },
+    {
+      "id": "Intro",
+      "render": "{_intro}"
+    },
+    {
+      "id": "import",
+      "render": "{import_button(public_bookcase, _tags, There might be a public bookcase here,./assets/svg/addSmall.svg,,,id)}"
+    },
+    {
+      "id": "close_note_",
+      "render": "{close_note(Does not exist<br/>, ./assets/svg/close.svg, id, This feature does not exist)}"
+    },
+    {
+      "id": "close_note_mapped",
+      "render": "{close_note(Already mapped, ./assets/svg/checkmark.svg, id, Already mapped)}"
+    },
+  
+    {
+      "id": "comment",
+      "render": "{add_note_comment()}"
     },
     {
       "id": "add_image",
       "render": "{add_image_to_note()}"
-    },
-    {
-      "id": "comment",
-      "render": "{add_note_comment()}"
     }
   ],
   "mapRendering": [
diff --git a/css/index-tailwind-output.css b/css/index-tailwind-output.css
index 592b02f86b..ad30d41445 100644
--- a/css/index-tailwind-output.css
+++ b/css/index-tailwind-output.css
@@ -868,14 +868,14 @@ video {
   margin-right: 0.5rem;
 }
 
-.mr-4 {
-  margin-right: 1rem;
-}
-
 .mt-1 {
   margin-top: 0.25rem;
 }
 
+.mr-4 {
+  margin-right: 1rem;
+}
+
 .mt-2 {
   margin-top: 0.5rem;
 }
@@ -1032,6 +1032,10 @@ video {
   height: 12rem;
 }
 
+.max-h-7 {
+  max-height: 1.75rem;
+}
+
 .max-h-20vh {
   max-height: 20vh;
 }
@@ -1068,10 +1072,6 @@ video {
   width: 2rem;
 }
 
-.w-6 {
-  width: 1.5rem;
-}
-
 .w-0 {
   width: 0px;
 }
@@ -1084,6 +1084,10 @@ video {
   width: 2.75rem;
 }
 
+.w-6 {
+  width: 1.5rem;
+}
+
 .w-16 {
   width: 4rem;
 }
@@ -1126,6 +1130,10 @@ video {
   flex-shrink: 0;
 }
 
+.flex-shrink {
+  flex-shrink: 1;
+}
+
 .flex-grow {
   flex-grow: 1;
 }
@@ -1526,9 +1534,9 @@ video {
   line-height: 1.75rem;
 }
 
-.text-3xl {
-  font-size: 1.875rem;
-  line-height: 2.25rem;
+.text-4xl {
+  font-size: 2.25rem;
+  line-height: 2.5rem;
 }
 
 .text-sm {
@@ -1536,16 +1544,16 @@ video {
   line-height: 1.25rem;
 }
 
+.text-3xl {
+  font-size: 1.875rem;
+  line-height: 2.25rem;
+}
+
 .text-base {
   font-size: 1rem;
   line-height: 1.5rem;
 }
 
-.text-4xl {
-  font-size: 2.25rem;
-  line-height: 2.5rem;
-}
-
 .font-bold {
   font-weight: 700;
 }