EncodeURIComponent rather than escape. Fixes #2.