updated jsonstream with "grouped" and empties support