Permanent fix on the URL Encode of the params.
Revert "Moved namespaces."

This reverts commit fa8dc9d97e9644bc05935ff3283a5ed382db4149.
Permanent fix on the Url Ecode of params