Fix addto/remove from for watchlist