MOB-91: Refactored watch list for stories to own tree