Improve city regex