added wildcards to filter