Change to query watcher instead of assignee