refs #5441; + urlencode on ndo too