Email Notification: Empty fields are showing in notifications created through the new interface