Improve handling for just teasers use case