Query Refactoring for Modern Engines

Update older aggregation patterns to leverage newer, faster engine capabilities.