SOC-3472 | Notification Emails - Notification Template improvement