content views - minor updates based on PR 1847 comments