Thanks for the suggestion!
I managed to solve my issues with:
I’ll give yours a go sometime to see if it saves me doing my workaround!