I think you've nailed it. I created a quick test, and it worked. I'll try it on the real package on Monday.

Thank you both very much!