Add uri-encoding to webclient