Changed $escapeValueHtml to $escape