I am just making a note that all of this was addressed with a custom script that I shared over here on this thread: