Corrected performance issue in groupings fetching (2)