#831 - Finalized updates on events export