more tag fixes