Fixed escaping and unescaping problems.