fix filter and handle order bug.