Theres a simple fix to this for content... they make it so you cant switch inside an Instance.. there you go.. no need overhauling their entire system.