improve autocomplete for CDC selector