Added urldecode/encode support