content views - fix couple of issues with migrations

Refer to commits for details.  The PR replaces an earlier one.