fix autocompletion and ui