cpbased view bug fixes