Fix autocompletion

@tailsu @teobugslayer @Fatme