content views - address PR 1641 comments