improve geocoding robustness