It's a bummer Apple does not provide more support for this common issue but your approach is the cleanest I have found in my research. Thanks mate.