Tag plugin changes