fix more sort issues