A few geocoding improvements