EQ-1012 More urlencode() fixes