Patch geonames, include country for foreign cities, fix qs_locality SRID