Fix data set with spaces issue