fixup! fix issue when grouping by primary key(s) or routing column