CDB-1801 WIP Add different internal geocoding options