tag refactor