Followup on #17, improving query. Also changed width of geonames_adm1.adm1_code, which was 2, too short