diff --git a/geocoder/namedplace/sql/build_data_table.sql b/geocoder/namedplace/sql/build_data_table.sql
index e43eeab..084bb7a 100644
--- a/geocoder/namedplace/sql/build_data_table.sql
+++ b/geocoder/namedplace/sql/build_data_table.sql
@@ -16,7 +16,7 @@ DELETE FROM global_cities_points_limited;
 -- it assumes that the source is called "allcountries"
 INSERT INTO global_cities_points_limited (the_geom, admin1, admin2, admin3, admin4, altnames, asciiname, cc2, featclass, featcode, geoname_id, gtopo30, iso2, lowername, name, population)
     SELECT the_geom, admin1, admin2, admin3, admin4, altnames, asciiname, cc2, featclass, featcode, geonameid::int, gtopo30, country, lower(name) as lowername, name, population
-    FROM points_cities
+    FROM allcountries
     WHERE featcode = '';
 
 -- insert data from source table (allcountries) to the table
diff --git a/geocoder/setup/indexes.sql b/geocoder/setup/indexes.sql
index 9b2bbb0..abacd0b 100644
--- a/geocoder/setup/indexes.sql
+++ b/geocoder/setup/indexes.sql
@@ -13,3 +13,12 @@ CREATE UNIQUE INDEX idx_ne_admin0_v3_adm0_a3 ON ne_admin0_v3 (adm0_a3);
 
 -- create indexes on postal code polygon table
 CREATE UNIQUE INDEX idx_postal_code_polygons_a3_code ON postal_code_polygons (adm0_a3, postal_code)
+
+-- create indexes on named places table
+CREATE INDEX idx_global_cities_points_limited_a ON global_cities_points_limited (lowername, iso2)
+CREATE INDEX idx_global_cities_points_limited_admin1 ON global_cities_points_limited (admin1)
+CREATE INDEX idx_global_cities_points_limited_geoname_id ON global_cities_points_limited (geoname_id)
+
+CREATE INDEX idx_global_cities_alternates_limited_admin1 ON global_cities_alternates_limited (admin1)
+CREATE INDEX idx_global_cities_alternates_limited_admin1_geonameid ON global_cities_alternates_limited (admin1_geonameid)
+CREATE INDEX idx_global_cities_alternates_limited_lowername ON global_cities_alternates_limited (lowername)