more fixes for watchlist stuff