Add examples of queries
Add a complex query in tests
Fix NOT by only applying to next group