Adding unescaping of HTML entities