Corrected autocomplete