Fixed some issues with the tab auto-completion