Conform response for grouping query to api design

@abersager
@maxfliri