[OE-3619] new mmarkup tweaks