BZ-9194: Updating Mark-up For Events