Fix a tag display bug.
Remove needless var.
Merge remote-tracking branch 'origin/master'