content views - couple of small bug fixes

This contains a couple of small fixes.  See commit list for details.