refactor
fix tag probulem