Hack in data set selector