updated tag management