Escape with RFC5987, not encodeURIComponent(). [finishes #62556676]