[bug 663524] Allow managing of the watch list