Added in option to disallow geocoding