DDF-513 updated notifications to use Subject if it is available