Changes on groupBy option for choices