Fix for storyEmpty and forceRefresh