Make wildcards in filter optional