modified some problematic tags