Add URL encoding to handle-url