fixes #2480 - undefined method `html_raw'
fixes #2478 - smart-variable in ENC stopped working