PIR-839 Modify Group By to support Having Formula filter