Escape where needed
Corrections from review