Refactored Xporter to save csv rows rather than JSON