[CHS] Tweaks to the autocomplete