Fixed data filtering issue