More amends to tag code