[OE-3658] Examination markup fixes