Fix escaping
Merge branch 'hotfix/fixescaping'