Improve normalization of city name and city postal code
Improve location method