Autocomplete & option list fixes