diff --git a/religion.json b/religion.json
index 89d23b3..5c1df92 100644
--- a/religion.json
+++ b/religion.json
@@ -71,7 +71,7 @@
             "  {{ tagTrans(key, value) }}",
             "{% endif %}"
         ],
-        "details": "{{ tagTransList('religion', tags.religion) }}{% if tags.denomination %} - {{ tagTransList('denomination', tags.denomination) }}{% endif %}",
+        "listDetails": "{{ tagTransList('religion', tags.religion) }}{% if tags.denomination %} - {{ tagTransList('denomination', tags.denomination) }}{% endif %}",
         "body": [
             "{% if tags.building %}",
             "  {{ keyTrans('building') }}: {{ tagTrans('building', tags.building) }}<br/>",
diff --git a/sport.json b/sport.json
index eb0ef33..de8bc35 100644
--- a/sport.json
+++ b/sport.json
@@ -20,8 +20,18 @@
         "14": "(node[sport];way[sport];relation[sport];)"
     },
     "feature": {
-        "title": "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) |default(tagTransList('sport', tags.sport)) }}",
-        "description": "{{ tagTransList('sport', tags.sport) }}",
+        "description": [
+            "{% if tags.leisure %}{{ tagTrans('leisure', tags.leisure) }}",
+            "{% elseif tags.amenity %}{{ tagTrans('amenity', tags.amenity) }}",
+            "{% elseif tags.shop %}{{ tags.shop == 'yes' ? keyTrans('shop') : tagTrans('shop', tags.shop) }}",
+            "{% elseif tags.landuse %}{{ tagTrans('landuse', tags.landuse) }}",
+            "{% elseif tags.building %}{{ tags.building == 'yes' ? keyTrans('building') : tagTrans('building', tags.building) }}",
+            "{% elseif tags.highway %}{{ tagTrans('highway', tags.highway) }}",
+            "{% else %}{{ keyTrans('sport') }}",
+            "{% endif %}"
+        ],
+        "listDetails": "{{ tagTransList('sport', tags.sport) }}",
+        "body": "{{ keyTrans('sport') }}: {{ tagTransList('sport', tags.sport) }}",
         "markerSign": [
             "{% set firstSport = tags.sport|split(';')[0] %}",
             "{{ const[firstSport] }}"