More work on autocomplete control