Updated autocompletion to match Usabillity test script