diff --git a/input/fsh/SD_Extensions.fsh b/input/fsh/SD_Extensions.fsh
index da20658..ef5ed7f 100644
--- a/input/fsh/SD_Extensions.fsh
+++ b/input/fsh/SD_Extensions.fsh
@@ -322,14 +322,10 @@ Severity: #error
 //* SCT#717193008 "Cone beam computed tomography (procedure)" // Cone beam CT
 Expression: "extension.where(url = 'energy').exists() implies \n
                (extension.where(url = 'modality').exists() and \n
-                (extension.where(url = 'modality').value.exists(\n
-                    (coding.system = 'http://snomed.info/sct') and \n
-                      (coding.code = '168537006' or \n
-                      coding.code = '44491008' or \n
-                      coding.code = '77477000' or \n
-                      coding.code = '717193008' \n
-                    )\n
-                  )\n
-                )\n
-              )"
+                extension.where(url = 'modality').value.exists() and \n
+                extension.where(url = 'modality').value.coding.all(\n
+                    (system = 'http://snomed.info/sct') and \n
+                    (code = '168537006' or code  = '44491008' or code  = '77477000' or code  = '717193008') \n
+                 )\n
+               )"
 XPath: "true()"
diff --git a/input/ignoreWarnings.txt b/input/ignoreWarnings.txt
index 3fa4e09..7f1c812 100644
--- a/input/ignoreWarnings.txt
+++ b/input/ignoreWarnings.txt
@@ -192,6 +192,7 @@ WARNING: ValueSet.where(id = 'codexrt-radiotherapy-adverse-event-termVS'): Error
 
 # Suppress warning relating to EVS/Thesaurus.owl....even if it says 0 uses 
 WARNING: ValueSet/codexrt-radiotherapy-adverse-event-termVS: ValueSet.compose[0].include[1]: Unknown System 'http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl' specified, so Concepts and Filters can't be checked (Details: The CodeSystem http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl is unknown (from Tx-Server))
+INFORMATION: AdverseEvent/RadiotherapyAdverseEvent-XRTS-07-22B: AdverseEvent.event.coding[0]: The definition for the Code System with URI 'http://ncicb.nci.nih.gov/xml/owl/EVS/Thesaurus.owl' doesnt provide any codes so the code cannot be validated
 
 # All of these are isotope terms, and they are as expected
 INFORMATION: ValueSet/codexrt-radiotherapy-isotope-vs: ValueSet.compose[0].include[0]: This SNOMED-CT based include has some concepts with semantic tags (FSN terms) and some without (preferred terms) - check that this is what is intended