remove more url-encode invocations