fix(watch_group): prevent removed watches from firing
fix(scope): skip scopes whithot event on broadcast