Thanks, I think I have found a way to resolve this. Please let me know how it works out for you in the next beta.