diff --git a/layers/place/style.json b/layers/place/style.json
index 9d832b9a..45b8d693 100644
--- a/layers/place/style.json
+++ b/layers/place/style.json
@@ -384,9 +384,10 @@
           "city"
         ],
         [
-          "!=",
-          "rank",
-          1
+          "!in",
+          "capital",
+          1,
+          2
         ]
       ],
       "order": 244
diff --git a/layers/poi/style.json b/layers/poi/style.json
index 2f081489..1acf25f2 100644
--- a/layers/poi/style.json
+++ b/layers/poi/style.json
@@ -959,18 +959,17 @@
           ]
         ],
         "text-anchor": "top",
-        "text-field": {
-          "stops": [
-            [
-              15,
-              ""
-            ],
-            [
-              16,
-              "{name}"
-            ]
+        "text-field": [
+          "coalesce",
+          [
+            "get",
+            "name:en"
+          ],
+          [
+            "get",
+            "name"
           ]
-        },
+        ],
         "text-font": [
           "Open Sans Semibold",
           "Noto Sans Bold"
@@ -1298,18 +1297,17 @@
           ]
         ],
         "text-anchor": "top",
-        "text-field": {
-          "stops": [
-            [
-              17,
-              ""
-            ],
-            [
-              18,
-              "{name}"
-            ]
+        "text-field": [
+          "coalesce",
+          [
+            "get",
+            "name:en"
+          ],
+          [
+            "get",
+            "name"
           ]
-        },
+        ],
         "text-font": [
           "Open Sans Semibold",
           "Noto Sans Bold"
@@ -1319,6 +1317,7 @@
           0,
           0.6
         ],
+        "text-optional": true,
         "text-padding": 2,
         "text-size": {
           "stops": [
@@ -1374,18 +1373,17 @@
         ],
         "text-allow-overlap": false,
         "text-anchor": "top",
-        "text-field": {
-          "stops": [
-            [
-              15,
-              ""
-            ],
-            [
-              16,
-              "{name}"
-            ]
+        "text-field": [
+          "coalesce",
+          [
+            "get",
+            "name:en"
+          ],
+          [
+            "get",
+            "name"
           ]
-        },
+        ],
         "text-font": [
           "Open Sans Semibold",
           "Noto Sans Bold"