change handling of tag