Tag unit closures and restructuring