Revert "Escape all city names"

This reverts commit 4fb2a9974f0e46c0f5e6385506a880f1ffd37a13.