Fix auto complete system