diff --git a/children.json b/children.json
index 8236df178..3d0f3ce95 100644
--- a/children.json
+++ b/children.json
@@ -4,7 +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 %}",
-        "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 %}"
+        "body": "{% if tags.leisure=='playground' %}{{ tagTrans('leisure', 'playground') }}{% elseif tags.leisure=='summer_camp'%}{{ tagTrans('leisure', 'summer_camp') }}{% elseif tags.leisure=='indoor_play' %}{{ tagTrans('leisure', 'indoor_play') }}{% elseif tags.kids_area %}{{ tagTrans('kids_area') }}{% elseif tags.shop=='baby_goods' or tags.shop=='toys' %}{{ tagTrans('shop') }}: {{ tagTrans('shop', tags.shop) }}{% elseif tags.amenity=='toilets' and tags.diaper %}{{ tagTrans('amenity', 'toilets') }} with diaper changing table{% endif %}",
+        "description": "{% if tags.leisure=='playground' %}{{ tagTrans('leisure', 'playground') }}{% elseif tags.leisure=='summer_camp'%}{{ tagTrans('leisure', 'summer_camp') }}{% elseif tags.leisure=='indoor_play' %}{{ tagTrans('leisure', 'indoor_play') }}{% elseif tags.kids_area %}{{ tagTrans('kids_area') }}{% elseif tags.shop=='baby_goods' or tags.shop=='toys' %}{{ tagTrans('shop') }}: {{ tagTrans('shop', tags.shop) }}{% elseif tags.amenity=='toilets' and tags.diaper %}{{ tagTrans('amenity', 'toilets') }} with diaper changing table{% endif %}"
     }
 }
diff --git a/gastro.json b/gastro.json
index 1cf1d23df..19a361977 100644
--- a/gastro.json
+++ b/gastro.json
@@ -4,7 +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') }}",
-        "description": "{{ tags.amenity }}"
+        "body": "{{ tagTrans('amenity', tags.amenity) }}<br/>{{ tagTrans('cuisine') }}: {{ tagTrans('cuisine', tags.cuisine)|default('unknown') }}",
+        "description": "{{ tagTrans('amenity', tags.amenity) }}"
     }
 }
diff --git a/shop.json b/shop.json
index 6c06ef5f9..dadc6bb3d 100644
--- a/shop.json
+++ b/shop.json
@@ -3,8 +3,8 @@
     "query": "(node[shop];way[shop];relation[shop];);",
     "minZoom": 16,
     "feature": {
-        "body": "{{ tags.shop }}",
-        "description": "{{ tags.shop }}",
+        "body": "{{ tagTrans('shop', tags.shop) }}",
+        "description": "{{ tagTrans('shop', 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"