More changes for exact replace of style stag