Modify filtering methods