innerGroupBy bug fixes