Thanks for the follow up.
Yes, what you described in your 1st paragraph, is exactly how this is going to work if the presumed changes I posted in my previous post are made, but once again, I will have to carefully test everything so that nothing breaks if that change is made before going in release 🙂