Clean up CityMatcher city lookup
Implement better fix for bug encountered when cities have ‘ in name