improved auto complete