Fix issues with watchlist