Added condition to tag