Autocompletion UI fix2