Added uriencoding