R2.1 fixes

Fixes for CV schema compliance, cms_ids, and specific occurrence generation