bugfixes including geoname model