BF: storing proper file name and subjectkey in non-bogus runs