changes to coordinator/watchlist flows for routing/broadcast to work properly