Add to do some modifications for the tags