repair watcher-to-following migration problem

both of the above will find cards in trash