(PDB-1034) fix some escaping issues

Signed-off-by: Ken Barber <ken@bob.sh>