including correct fields in various outputs