[OE-3500] Fixed HTML encoding of data