Tag model improve