Add support for [city, state] and [city] (worldwide)