Feature/intelligent autocomplete