Fixed Json exporting