Further improve story query performance.