added support for url-quoting and encoding