More work on integrating better geocoding