[wip] fix autocomplete regressions