Added autocomplete feature (w/ fixes)