Switch to official URL-encode method introduced in 7.0/10.9