BZ-9314: updates to markup