fixed csv export bugs
merge