Changed from Uri.EscapeUrlString to HttpUtility.UrlEncode