Make tags more international