group_by should consistently be an array now