More work on autocomplete