fixup! fixup! fixup! correctly handle empty clustered by values or values containing commas