Further work on geocoding