FIXES SDEV-309
Reformatted CSV data, added new field and fixed nonetype bug