adding matchall query, and-filter, or-filter