fix tag flow