minor improvements on the autocompleter