SOC-3472 | Notification Emails - Improves template generates