Improve geocoding for #430 by stopping use of NONE and related for postal_code