Fix group tag management