Your original data and the solution offered go together and appear to work correctly. Be wary of adding new designs that toss out working stuff. But yes, if this question is resolved, mark this thread as solved and present new scenarios/needs in new threads.