Pass Membership Organization criteria with standard Output Set to WordFly?

Hello all,

We use a dedicated List and Output Set to WordFly to generate membership expiry dates in triggered emails. The tricky part is when a customer has multiple Memberships, the expiry date is not always the relevant one for the WordFly email.

When testing the Output Set using the 'Execute an Output Set' report, we can correctly use the Membership Organization criteria to get the desired result, but obviously this is not baked into the Output Set used by WordFly.

Has anyone dealt with this and discovered a solution, or would the only solution be to create a custom Output Set Element that sets the Membership Organisation?

Thanks!

Nicholas