[OE-3660] Additional markup fixes