Add filterQuery to Filter
Some changes to text analysis