Updated more issues with email template.