It seems to work OK the way I re-coded except for this problem I had before and have now :(

See attached - when I select something, everything goes blank - do you know a solution here?

BTW, don't be surprised about the test data - I let my older son test this form and he found a lot of bugs.