MOB-117: Fix to switches; retain story_id