BZ-9493: improvements to markup