Make autocomplete do a better job of completing