Update plan and outcome data
Fix invalid markup from CREQ editors