fixup! fixup! fixup! wip: fix group by plans