Fixed the script to generate watchlists so it works with more data.