Improvements for cases exporter