Added fix to city name handling