Content views: addressing feedback from PR #1592