Further EventQuery2 implementation. Refactoring.