fixed watched/unwatched handling