added TermsAndFilter / TermsOrFilter