Awesome!  I made the adjustment and tested, with all checking out ok.  Thanks for the suggestion.  I had previously attempted to use save/restoreSelection(), but I think the lack of removal of the wrapper was the issue.

You came up with a very clean method of dealing with this.