change auto complete implementation