Aggregations refactoring. Not persisting events in memory, when executing join-less queries