refactor code for dataset_type 7 compatibility and add safe mode to skip corrupted batches