diff --git a/communication.json b/communication.json
index 51308a7..62ac514 100644
--- a/communication.json
+++ b/communication.json
@@ -6,10 +6,9 @@
     },
     "minZoom": 13,
     "feature": {
-        "title": "{{ tags.name|default(tags.operator)|default(tagTrans('amenity', tags.amenity)) }}",
+        "title": "{{ localizedTag(tags, 'name') |default(localizedTag(tags, 'operator')) |default(tagTrans('amenity', tags.amenity)) }}",
         "markerSign": "{% if tags.amenity=='post_office' %}🏤{% elseif tags.amenity=='post_box'%}📮{% elseif tags.amenity=='internet_cafe' %}💻{% elseif tags.amenity=='telephone' %}✆{% endif %}",
-        "body": "{{ tagTrans('amenity', tags.amenity) }}<br/>{% if tags.operator %}Operator: {{ tags.operator }}<br/>{% endif %}",
+        "body": "{{ tagTrans('amenity', tags.amenity) }}<br/>{% if tags.operator %}{{ tagTrans('operator') }}: {{ localizedTag(tags, 'operator') }}<br/>{% endif %}",
         "description": "{{ tagTrans('amenity', tags.amenity) }}"
     }
 }
-
diff --git a/gastro.json b/gastro.json
index c8d4c4b..a9629db 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": "{{ tagTrans('amenity', tags.amenity) }}<br/>{{ tagTrans('cuisine') }}: {{ tagTransList('cuisine', tags.cuisine)|default('unknown') }}",
+        "body": "{{ tagTrans('amenity', tags.amenity) }}<br/>{{ tagTrans('cuisine') }}: {{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}",
         "description": "{{ tagTrans('amenity', tags.amenity) }}"
     }
 }
diff --git a/public.json b/public.json
index 7364bcf..7417e0a 100644
--- a/public.json
+++ b/public.json
@@ -8,7 +8,7 @@
     "feature": {
         "title": "{{ tags.name|default(tags.operator)|default(tagTrans('amenity', tags.amenity)) }}",
         "markerSign": "{% if tags.amenity=='post_office' %}&#127972;{% elseif tags.amenity=='post_box'%}&#128238;{% elseif tags.amenity=='internet_cafe' %}&#128187;{% elseif tags.amenity=='telephone' %}&#9990;{% endif %}",
-        "body": "{{ tagTrans('amenity', tags.amenity) }}<br/>{% if tags.operator %}Operator: {{ tags.operator }}<br/>{% endif %}",
+        "body": "{{ tagTrans('amenity', tags.amenity) }}<br/>{% if tags.operator %}{{ tagTrans('operator'): {{ tags.operator }}<br/>{% endif %}",
         "description": "{{ tagTrans('amenity', tags.amenity) }}"
     }
 }