fix more query