more work on autocomplete