More e-tag fixes