URI escape city and state. Fixes #2