fix more ES index management