consolidate autocomplete into ocs