* remove parameter default that didn't make sense
* properly escape values in output
Thanks to Jeff Wheeler from GHOP!