Set group_by_annotation=False in several places.