fix filter mixup, add category for subgroup