Fix bug with filter(..).and(..) resolving into OR in query.