UHM-980 - Row-per-encounter data export
Added some more columns