Tools > User Options gives an option on Query > Advanced to automatically add all fields used in the Criteria section to the Output. This feature should be offered for Export, too, since Blackbaud encourages users to rely on Export for creating output files rather than Query. An option to include all Criteria associated with a selected query being used in an Export would be very useful.