perfs improvment
CSV export not operationnal