Big fixes for cases exporter