Changed the way that #short_or_long_name works, in an attempt to bias results towards localities. See comment on #geolocate.