fix data filtering