Non-compliant data fix - CDS page