Updated code to return data grouped by keyFilter
Updated versions