We have a few fixes for this issue internally, it will be part of an upcoming content patch. I will see if we can be clearer about when that fix is going in.
devtrackers.gg
