diff --git a/website/src/lib/assets/custom/satellite.json b/website/src/lib/assets/custom/satellite.json
index 3957b2da9..1a0b46989 100644
--- a/website/src/lib/assets/custom/satellite.json
+++ b/website/src/lib/assets/custom/satellite.json
@@ -1698,7 +1698,12 @@
       "layout": {
         "icon-image": "mountain_11",
         "text-anchor": "top",
-        "text-field": ["get", "name"],
+        "text-field": [
+          "case",
+          ["has", "name:nonlatin"],
+          ["concat", ["get", "name:latin"], " ", ["get", "name:nonlatin"]],
+          ["coalesce", ["get", "name_en"], ["get", "name"]]
+        ],
         "text-font": ["Noto Sans Regular"],
         "text-max-width": 9,
         "text-offset": [0, 0.6],
@@ -1727,7 +1732,12 @@
       "layout": {
         "icon-image": "attraction_11",
         "text-anchor": "top",
-        "text-field": ["get", "name"],
+        "text-field": [
+          "case",
+          ["has", "name:nonlatin"],
+          ["concat", ["get", "name:latin"], " ", ["get", "name:nonlatin"]],
+          ["coalesce", ["get", "name_en"], ["get", "name"]]
+        ],
         "text-font": ["Noto Sans Regular"],
         "text-max-width": 9,
         "text-offset": [0, 0.6],
diff --git a/website/src/lib/assets/custom/topo.json b/website/src/lib/assets/custom/topo.json
index 631bcf380..18e40c4d5 100644
--- a/website/src/lib/assets/custom/topo.json
+++ b/website/src/lib/assets/custom/topo.json
@@ -2631,7 +2631,12 @@
       "layout": {
         "icon-image": "mountain_11",
         "text-anchor": "top",
-        "text-field": ["get", "name"],
+        "text-field": [
+          "case",
+          ["has", "name:nonlatin"],
+          ["concat", ["get", "name:latin"], " ", ["get", "name:nonlatin"]],
+          ["coalesce", ["get", "name_en"], ["get", "name"]]
+        ],
         "text-font": ["Noto Sans Regular"],
         "text-max-width": 9,
         "text-offset": [0, 0.6],
@@ -2660,7 +2665,12 @@
       "layout": {
         "icon-image": "attraction_11",
         "text-anchor": "top",
-        "text-field": ["get", "name"],
+        "text-field": [
+          "case",
+          ["has", "name:nonlatin"],
+          ["concat", ["get", "name:latin"], " ", ["get", "name:nonlatin"]],
+          ["coalesce", ["get", "name_en"], ["get", "name"]]
+        ],
         "text-font": ["Noto Sans Regular"],
         "text-max-width": 9,
         "text-offset": [0, 0.6],
diff --git a/website/src/lib/components/map/style.ts b/website/src/lib/components/map/style.ts
index d6cdac33e..37205e076 100644
--- a/website/src/lib/components/map/style.ts
+++ b/website/src/lib/components/map/style.ts
@@ -233,12 +233,13 @@ export class StyleManager {
                 const textField = layer.layout['text-field'];
                 if (
                     Array.isArray(textField) &&
-                    textField.length >= 2 &&
-                    textField[0] === 'coalesce' &&
-                    Array.isArray(textField[1]) &&
-                    textField[1][0] === 'get' &&
-                    typeof textField[1][1] === 'string' &&
-                    textField[1][1].startsWith('name')
+                    textField.length == 4 &&
+                    Array.isArray(textField[3]) &&
+                    textField[3][0] === 'coalesce' &&
+                    Array.isArray(textField[3][1]) &&
+                    textField[3][1][0] === 'get' &&
+                    typeof textField[3][1][1] === 'string' &&
+                    textField[3][1][1].startsWith('name')
                 ) {
                     layer.layout['text-field'] = [
                         'coalesce',