Added tagging check