content views - addressing PR 1794 comments