Fix issue with geocoding special cases.