diff --git a/layers/place/merge_country_rank.sql b/layers/place/merge_country_rank.sql
index 898bb96..40e905e 100644
--- a/layers/place/merge_country_rank.sql
+++ b/layers/place/merge_country_rank.sql
@@ -22,5 +22,10 @@ UPDATE osm_country_point AS osm
 SET "rank" = 6
 WHERE "rank" IS NULL;
 
+-- TODO: This shouldn't be necessary? The rank function makes something wrong...
+UPDATE osm_country_point AS osm
+SET "rank" = 1
+WHERE "rank" = 0;
+
 ALTER TABLE osm_country_point ADD CONSTRAINT osm_country_point_rank_constraint CHECK("rank" BETWEEN 1 AND 6);
-CREATE INDEX IF NOT EXISTS osm_country_point_rank_idx ON osm_country_point("rank");
\ No newline at end of file
+CREATE INDEX IF NOT EXISTS osm_country_point_rank_idx ON osm_country_point("rank");
diff --git a/layers/place/merge_state_rank.sql b/layers/place/merge_state_rank.sql
index 51181ba..0e2a8b4 100644
--- a/layers/place/merge_state_rank.sql
+++ b/layers/place/merge_state_rank.sql
@@ -16,6 +16,11 @@ SET "rank" = LEAST(6, CEILING((scalerank + labelrank + datarank)/3.0))
 FROM important_state_point AS ne
 WHERE osm.osm_id = ne.osm_id;
 
+-- TODO: This shouldn't be necessary? The rank function makes something wrong...
+UPDATE osm_state_point AS osm
+SET "rank" = 1
+WHERE "rank" = 0;
+
 DELETE FROM osm_state_point WHERE "rank" IS NULL;
 
 ALTER TABLE osm_state_point ADD CONSTRAINT osm_state_point_rank_constraint CHECK("rank" BETWEEN 1 AND 6);