Aggregations refactoring. Skipping events persistence when executing join-less wueries