Ok, looks like 2) was indeed fixed by my code but it introduced some other issues so I'll look for a better fix.
Ok, looks like 2) was indeed fixed by my code but it introduced some other issues so I'll look for a better fix.