Improving the context tags