[OE-3684] Markup tweaks