Change `groupByValue` to use values not 'channel'

- Before we were hard coding 'channel' as the group_by value