Imporve auto complete system