Fixed adding to watch list logic