Reducing KO dependencies
Fixed regression with csv export