diff --git a/layers/place/mapping.yaml b/layers/place/mapping.yaml
index efa17880..c7c4e509 100644
--- a/layers/place/mapping.yaml
+++ b/layers/place/mapping.yaml
@@ -124,6 +124,9 @@ tables:
     - *name_de
     - name: tags
       type: hstore_tags
+    - name: place
+      key: place
+      type: string
     - name: is_in_country
       key: is_in:country
       type: string
@@ -140,6 +143,7 @@ tables:
     mapping:
       place:
       - state
+      - province
 
   # etldoc: imposm3 -> osm_city_point
   city_point:
diff --git a/layers/place/mapping_diagram.png b/layers/place/mapping_diagram.png
index 6203fa82..ae358136 100644
Binary files a/layers/place/mapping_diagram.png and b/layers/place/mapping_diagram.png differ
diff --git a/layers/place/place.sql b/layers/place/place.sql
index f394d234..c232124c 100644
--- a/layers/place/place.sql
+++ b/layers/place/place.sql
@@ -70,7 +70,7 @@ FROM (
              COALESCE(NULLIF(name_en, ''), name) AS name_en,
              COALESCE(NULLIF(name_de, ''), name, name_en) AS name_de,
              tags,
-             'state' AS class,
+             place::text AS class,
              "rank",
              NULL::int AS capital,
              NULL::text AS iso_a2
diff --git a/layers/place/place.yaml b/layers/place/place.yaml
index 00611690..3d084132 100644
--- a/layers/place/place.yaml
+++ b/layers/place/place.yaml
@@ -32,6 +32,7 @@ layer:
       - continent
       - country
       - state
+      - province
       - city
       - town
       - village
diff --git a/layers/place/update_state_point.sql b/layers/place/update_state_point.sql
index d1ba1bd2..fa155802 100644
--- a/layers/place/update_state_point.sql
+++ b/layers/place/update_state_point.sql
@@ -29,8 +29,8 @@ $$
           -- because name matching is difficult
             ST_Within(osm.geometry, ne.geometry)
           -- We leave out leess important states
-          AND ne.scalerank <= 3
-          AND ne.labelrank <= 2
+          AND ne.scalerank <= 6
+          AND ne.labelrank <= 7
     )
     UPDATE osm_state_point AS osm
         -- Normalize both scalerank and labelrank into a ranking system from 1 to 6.