More changes to ensure the right data is exported for all of our options