Trying new autocompletion logic