Raid tag for Witches

We've all been there, fighting a raid in a village trying to find the last raid member only to discover that it's a witch that was buried underground since you were on Hard difficulty.

How about instead of allowing witches to join raids, we add a tag to witches spawned in raids to allow them to be part of the raid?
Naturally spawned witches will not be counted, and will produce much less headaches to end-game players.