Correction. After some more testing the snippet works. Can this be a a feature in the release so you can turn it on and off.

We tested it on 3 site and it solves the problems on and

Dragan