Could you make it so this count+groupBy is short circuited if we have numCommonBuckets = 1