Add grand_label argument to aggr_by