added support for autocompletion with return