rest of the fix for the urlencoding issue