better template and filter for the autocomplete