Finish some features of autocomplete