diff --git a/children.json b/children.json
index 70e1eee1c..8236df178 100644
--- a/children.json
+++ b/children.json
@@ -4,6 +4,7 @@
     "minZoom": 15,
     "feature": {
         "markerSign": "{% if tags.leisure=='playground' %}&#9977;{% elseif tags.leisure=='summer_camp'%}&#127957;{% elseif tags.leisure=='indoor_play' or tags.kids_area %}&#127968;{% elseif tags.shop=='baby_goods' or tags.shop=='toys' %}<i class=\"fa fa-shopping-cart\"></i>{% elseif tags.amenity=='toilets' and tags.diaper %}&#128701;&#128700;{% endif %}",
-        "body": "{% if tags.leisure=='playground' %}playground{% elseif tags.leisure=='summer_camp'%}summer_camp{% elseif tags.leisure=='indoor_play' %}indoor_play{% elseif tags.kids_area %}kids_area{% elseif tags.shop=='baby_goods' or tags.shop=='toys' %}shop for {{ tags.shop }}{% elseif tags.amenity=='toilets' and tags.diaper %}toilets with diaper changing table{% endif %}"
+        "body": "{% if tags.leisure=='playground' %}playground{% elseif tags.leisure=='summer_camp'%}summer_camp{% elseif tags.leisure=='indoor_play' %}indoor_play{% elseif tags.kids_area %}kids_area{% elseif tags.shop=='baby_goods' or tags.shop=='toys' %}shop for {{ tags.shop }}{% elseif tags.amenity=='toilets' and tags.diaper %}toilets with diaper changing table{% endif %}",
+        "description": "{% if tags.leisure=='playground' %}playground{% elseif tags.leisure=='summer_camp'%}summer_camp{% elseif tags.leisure=='indoor_play' %}indoor_play{% elseif tags.kids_area %}kids_area{% elseif tags.shop=='baby_goods' or tags.shop=='toys' %}shop for {{ tags.shop }}{% elseif tags.amenity=='toilets' and tags.diaper %}toilets with diaper changing table{% endif %}"
     }
 }
diff --git a/gastro.json b/gastro.json
index 1ae686849..1cf1d23df 100644
--- a/gastro.json
+++ b/gastro.json
@@ -4,6 +4,7 @@
     "minZoom": 16,
     "feature": {
         "markerSign": "{% if tags.amenity=='bar' %}&#127864;{% elseif tags.amenity=='biergarten'%}&#127867;{% elseif tags.amenity=='cafe' %}&#9749;{% elseif tags.amenity=='fast_food' %}&#127828;{% elseif tags.amenity=='ice_cream' %}&#127848;{% elseif tags.amenity=='pub' %}&#127866;{% else %}&#127860;{% endif %}",
-        "body": "{{ tags.amenity }}<br/>Cuisine: {{ tags.cuisine|default('unknown') }}"
+        "body": "{{ tags.amenity }}<br/>Cuisine: {{ tags.cuisine|default('unknown') }}",
+        "description": "{{ tags.amenity }}"
     }
 }
diff --git a/shop.json b/shop.json
index 8104cd2fd..6c06ef5f9 100644
--- a/shop.json
+++ b/shop.json
@@ -4,6 +4,7 @@
     "minZoom": 16,
     "feature": {
         "body": "{{ tags.shop }}",
+        "description": "{{ tags.shop }}",
         "markerSign": "{% set c = { alcohol: 'fa-beer', baby_goods: '&#128700;', bag: 'fa-shopping-bag', bakery: 'fa-birthday-cake', beverages: 'fa-beer', boutique: '&#128090;', butcher: 'fa-cutlery', cheese: 'fa-cutlery', chocolate: 'fa-cutlery', clothes: '&#128090;', coffee: 'ia-coffee', confectionery: 'fa-birthday-cake', convenience: 'fa-shopping-basket', deli: 'fa-cutlery', dairy: 'fa-cutlery', department_store: 'fa-building', fabric: '&#128090;', farm: 'fa-cutlery', fashion: '&#128090;', general: 'fa-shopping-bag', greengrocer: 'fa-cutlery', hairdresser: '&#128113;', ice_cream: '&#127848;', jewelry: '&#128141;', kiosk: 'fa-newspaper-o', leather: '&#128090;', mall: 'fa-building', pasta: 'fa-cutlery', pastry: 'fa-birthday-cake', seafood: 'fa-cutlery', sewing: '&#128090;', shoes: '&#128095;', spices: 'fa-cutlery', supermarket: 'fa-shopping-cart', tailor: '&#128090;', tea: 'fa-coffee', watches: '&#8986;' }[tags.shop]|default('fa-shopping-bag') %}{% if c|slice(0, 3) == 'fa-' %}<i class=\"fa {{ c }}\"></i>{% else %}{{ c|raw }}{% endif %}",
         "__": "need better icons for: bakery, butcher, cheese, ice_cream, ",
         "__": "no icons for: brewing_supplies, charity, second_hand, variety_store"
diff --git a/trees.json b/trees.json
index b6b4c5bd5..67cbabd8c 100644
--- a/trees.json
+++ b/trees.json
@@ -3,7 +3,9 @@
     "query": "node[natural=tree];",
     "minZoom": 17,
     "feature": {
-        "title": "{{ tags.species|default('Tree') }}",
+        "title": "{% if tags.ref %}{{ tags.ref }} - {% endif %}{{ tags.name|default('Tree') }}",
+        "description": "{{ tags.species }}",
+        "body": "{{ tags.species }}",
         "style": {
               "nodeFeature": "CircleMarker",
               "color": "red",