Updated filters to reuse word boundaries but include wildcards