YH-137: Fixed all custom fields in dataset