Notification templates fixed