improve autocomplete
improve loading