Improvements to cases exporter