fix more backstack related bugs