BZ-12025:Fix mark-up issues