UHM-1182 - Move visit id to end of exports