implemented correct watch/unwatch list order