Add support for SHUFFLE
Fix bug with shuffling and null columns.