Refactoring out the story fillter per email discussion