fixed filtering. (except for List)