A big thanks to several community members for pointing, suggesting and testing the above, its a huge help!
*Breaking Changes*