Don't let cities hide country and state names

This resolves #1157
Merge pull request #1159 from math1985/city-country-order

Don't let cities hide country and state names