Fixes ZEN-7751. HTML tags work properly