fix more tag stuff