Fixed data filtering for new dataset