Jeff,

I will help you testing it and see if it solves the scenario of @maneljn...

Thanks to you too...