RT# 82092 - updated escaping html to use encode-entities