Refactor stories and start using limit on queries