Refs #15669; Updated analyzer for new field names