Thanks for all the work you have put into finding an imperfect solution and posting results. Have the same problem. Have already spent too much time entering much manually to start over, but thanks for this. Hopefully the glitches I have run into this year will be fixed for next year, but made sure I bookmarked this in case not.
