Better fix for bug that occurs when city name has apostrophe