Autocompletion UI fix1