Added tagging properly now