updated after consulting geonames.org