Added more terminating filters