Autocompletion UI fix5