You're welcome. I had to waste my entire Sunday afternoon for this issue trying out several patchwork things.
Basically an entire afternoon of throwing stuff at the wall and see what sticks. This stuck for me, I'm happy it stuck for you too and hopefully saved you a lot of fruitless experimenting trying to fix it.