DS-841: allowing html inside tags