More geocoding improvements and logic updates