BZ-8443 - revising markup