yr: Fix brokenness for cities, countries and counties with spaces
yr: Fix brokenness for cities, countries and counties with spaces

Former-commit-id: 2c1015d34d9619cb01d07154a35bb61b8e6d9e51 [formerly 2b50e8efe9d9b13ce0d41f055d5cb237d54d4256]
Former-commit-id: 8c37db82128c94a84892ef4b3857c44eb9a9efe7
torhve/ivar2,haste/ivar2,torhve/ivar2,torhve/ivar2