Have you figured out how to solve this problem yet? I'm having the exact same problem, and I really can't bear to lose everything I've already entered on my return.
