Tag adding/removal fixes