fix more deep-linking bugs