Dear @Adam_Turner , welcome to the community!
For the time being the solution of @Federico_Stefanato works for me the best.