If only it was as simple as that - it's not an encoding issue - it's the disgusting regexp that matches the url string. I made a change to it that works, but hopefully it doesn't break anything else.
I was *hoping* that was the solution (laughs) - my reply above was not a rebuke of any kind, just some self-pity after realizing what I had to do to fix it.