fix more filter issue