Added code for filtering DataSets