CON-531 | Fix escaping