Fix geocoder with a new geocoder