small tag refactoring