slightly better geoname handling