Better way to fix empty string split results