Improved: geocoding enricher and bug fixes