You can use the Adaptive Single Target for AHC bosses. For me adds T21 options for best in bag and such. However, I only have this option for my DPS specs. It isn’t available for tank and healing. Well, not that I have seen. As you, I hope this gets fixed soon. I know I’ll only be wearing two piece T21 but not way to find out which without guessing.