fixed filtering issue