Better resolution of city address components