fix grouping of observations by client