Don't let cities hide country and state names

This resolves #1157