Improving the tagging