Revert "No need to URL encode  fields as they are automatically"

This reverts commit bbeaff703c5271b473df1db0380091e38eaa0991.