re r64962 clean up the logic for watchlist a little