Simplify tagging logic. Retagging always pick up old tag.