update to feed query grouping