feat: improve groupBy functionality

What does this MR do and why?

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.