changes the return structure to match for all event groupings