Bug 4068: (follow-up) use URI::Escape