modify tag,label text
Merge remote-tracking branch 'sui/dev' into dev