Data splitter - handling new strange cases