Fixes to geolocation enricher