Save forms back out with output fields included