[OE-3622] markup tweaks