diff --git a/input/includes/observation_parameters.md b/input/includes/observation_parameters.md
index e28d1de7..7ddd3419 100644
--- a/input/includes/observation_parameters.md
+++ b/input/includes/observation_parameters.md
@@ -46,31 +46,31 @@
         <td>patient.identifier</td>
         <td><b>SHOULD</b></td>
         <td><code>reference</code>.<code>token</code></td>
-        <td>The requester <b>SHALL</b> provide both the system and code values. The responder <b>SHALL</b> support both. The requester <b>SHOULD</b> support search using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile. The responder <b>SHOULD</b> support search using the using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile.</td>
+        <td>The requester <b>SHALL</b> provide both the system and code values. The responder <b>SHALL</b> support both.<br/><br/>The requester <strong>SHOULD</strong> support search using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile. The responder <strong>SHOULD</strong> support search using the using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile.</td>
   </tr>
   <tr>
         <td>category</td>
         <td><b>MAY</b></td>
         <td><code>token</code></td>
-        <td>The requester <b>SHALL</b> provide at least a code value and <b>MAY</b> provide both the system and code values. The responder <b>SHALL</b> support both.</td>
+        <td>The requester <strong>SHALL</strong> provide at least a code value and <strong>MAY</strong> provide both the system and code values. The responder <strong>SHALL</strong> support both.<br/><br/>The requester <strong>SHALL</strong> support search using the category code defined in this profile. The responder <strong>SHALL</strong> support search using the category code defined in this profile.</td>
   </tr>
   <tr>
         <td>code</td>
         <td><b>MAY</b></td>
         <td><code>token</code></td>
-        <td>The requester <b>SHALL</b> provide at least a code value and <b>MAY</b> provide both the system and code values. The responder <b>SHALL</b> support both.</td>
+        <td>The requester <b>SHALL</b> provide at least a code value and <b>MAY</b> provide both the system and code values. The responder <b>SHALL</b> support both.<br/><br/>The requester <strong>SHALL</strong> support search using the LOINC codes defined in this profile. The responder <strong>SHALL</strong> support search using the LOINC codes defined in this profile.<br/><br/>The requester <strong>SHALL</strong> support <code>multipleOr</code>. The responder <strong>SHALL</strong> support <code>multipleOr</code>.</td>
   </tr>
   <tr>
         <td>date</td>
         <td><b>MAY</b></td>
         <td><code>date</code></td>
-        <td>A requester <b>SHALL</b> provide a value precise to the second + time offset. A responder <b>SHALL</b> support a value precise to the second + time offset.</td>
+        <td>A requester <b>SHALL</b> provide a value precise to the second + time offset. A responder <b>SHALL</b> support a value precise to the second + time offset.<br/><br/>The requester <strong>SHALL</strong> support these search comparators <code>gt</code>, <code>lt</code>, <code>ge</code>, <code>le</code>. The responder <strong>SHALL</strong> support these search comparators <code>gt</code>, <code>lt</code>, <code>ge</code>, <code>le</code>.<br/><br/>The requester <strong>SHOULD</strong> support <code>multipleAnd</code>. The responder <strong>SHOULD</strong> support <code>multipleAnd</code>.</td>
   </tr>
   <tr>
         <td>status</td>
         <td><b>MAY</b></td>
         <td><code>token</code></td>
-        <td>The requester <b>SHALL</b> provide at least a code value and <b>MAY</b> provide both the system and code values. The responder <b>SHALL</b> support both.</td>
+        <td>The requester <b>SHALL</b> provide at least a code value and <b>MAY</b> provide both the system and code values. The responder <b>SHALL</b> support both.<br/><br/>The requester <strong>SHALL</strong> support <code>multipleOr</code>.The responder <strong>SHALL</strong> support <code>multipleOr</code>.</td>
   </tr>
  </tbody>
 </table>
diff --git a/input/includes/observation_vitalsigns_parameters.md b/input/includes/observation_vitalsigns_parameters.md
index 05c8333b..e8d77358 100644
--- a/input/includes/observation_vitalsigns_parameters.md
+++ b/input/includes/observation_vitalsigns_parameters.md
@@ -46,31 +46,31 @@
         <td>patient.identifier</td>
         <td><b>SHOULD</b></td>
         <td><code>reference</code>.<code>token</code></td>
-        <td>The requester <b>SHALL</b> provide both the system and code values. The responder <b>SHALL</b> support both. The requester <b>SHOULD</b> support search using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile. The responder <b>SHOULD</b> support search using the using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile.</td>
+        <td>The requester <b>SHALL</b> provide both the system and code values. The responder <b>SHALL</b> support both.<br/><br/>The requester <strong>SHOULD</strong> support search using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile. The responder <strong>SHOULD</strong> support search using the using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile.</td>
   </tr>
   <tr>
         <td>category</td>
         <td><b>MAY</b></td>
         <td><code>token</code></td>
-        <td>The requester <b>SHALL</b> provide at least a code value and <b>MAY</b> provide both the system and code values. The responder <b>SHALL</b> support both. The requester <b>SHALL</b> support search using the 'vital-signs' category defined in each profile. The responder <b>SHALL</b> support search using the 'vital-signs' category defined in each profile.</td>
+        <td>The requester <b>SHALL</b> provide at least a code value and <b>MAY</b> provide both the system and code values. The responder <b>SHALL</b> support both.<br/><br/>The requester <b>SHALL</b> support search using the 'vital-signs' category defined in this profile. The responder <b>SHALL</b> support search using the 'vital-signs' category defined in this profile.</td>
   </tr>
   <tr>
         <td>code</td>
         <td><b>MAY</b></td>
         <td><code>token</code></td>
-        <td>The requester <b>SHALL</b> provide at least a code value and <b>MAY</b> provide both the system and code values. The responder <b>SHALL</b> support both. The requester <b>SHALL</b> support search using the LOINC codes defined in each profile. The responder <b>SHALL</b> support search using the LOINC codes defined in each profile.</td>
+        <td>The requester <b>SHALL</b> provide at least a code value and <b>MAY</b> provide both the system and code values. The responder <b>SHALL</b> support both.<br/><br/>The requester <b>SHALL</b> support search using the LOINC codes defined in this profile. The responder <b>SHALL</b> support search using the LOINC codes defined in this profile.</td>
   </tr>
   <tr>
         <td>date</td>
         <td><b>MAY</b></td>
         <td><code>date</code></td>
-        <td>A requester <b>SHALL</b> provide a value precise to the second + time offset. A responder <b>SHALL</b> support a value precise to the second + time offset.</td>
+        <td>A requester <b>SHALL</b> provide a value precise to the second + time offset. A responder <b>SHALL</b> support a value precise to the second + time offset.<br/><br/>The requester <strong>SHALL</strong> support these search comparators <code>gt</code>, <code>lt</code>, <code>ge</code>, <code>le</code>. The responder <strong>SHALL</strong> support these search comparators <code>gt</code>, <code>lt</code>, <code>ge</code>, <code>le</code>.<br/><br/>The requester <strong>SHOULD</strong> support <code>multipleAnd</code>. The responder <strong>SHOULD</strong> support <code>multipleAnd</code>.</td>
   </tr>
   <tr>
         <td>status</td>
         <td><b>MAY</b></td>
         <td><code>token</code></td>
-        <td>The requester <b>SHALL</b> provide at least a code value and <b>MAY</b> provide both the system and code values. The responder <b>SHALL</b> support both.</td>
+        <td>The requester <b>SHALL</b> provide at least a code value and <b>MAY</b> provide both the system and code values. The responder <b>SHALL</b> support both.<br/><br/>The requester <strong>SHALL</strong> support <code>multipleOr</code>.The responder <strong>SHALL</strong> support <code>multipleOr</code>.</td>
   </tr>
  </tbody>
 </table>
diff --git a/input/intro-notes/StructureDefinition-au-core-allergyintolerance-notes.md b/input/intro-notes/StructureDefinition-au-core-allergyintolerance-notes.md
index c35ff37b..21d1f39f 100644
--- a/input/intro-notes/StructureDefinition-au-core-allergyintolerance-notes.md
+++ b/input/intro-notes/StructureDefinition-au-core-allergyintolerance-notes.md
@@ -23,7 +23,7 @@
         <td>patient.identifier</td>
         <td><b>SHOULD</b></td>
         <td><code>reference</code>.<code>token</code></td>
-        <td>The requester <b>SHALL</b> provide both the system and code values. The responder <b>SHALL</b> support both. <br/><br/> The requester <b>SHOULD</b> support search using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile. The responder <b>SHOULD</b> support search using the using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile.</td>
+        <td>The requester <b>SHALL</b> provide both the system and code values. The responder <b>SHALL</b> support both.<br/><br/> The requester <b>SHOULD</b> support search using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile. The responder <b>SHOULD</b> support search using the using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile.</td>
   </tr>
   <tr>
         <td>clinical-status</td>
diff --git a/input/intro-notes/StructureDefinition-au-core-condition-notes.md b/input/intro-notes/StructureDefinition-au-core-condition-notes.md
index c35a5abb..549acc9a 100644
--- a/input/intro-notes/StructureDefinition-au-core-condition-notes.md
+++ b/input/intro-notes/StructureDefinition-au-core-condition-notes.md
@@ -41,7 +41,7 @@
         <td>patient.identifier</td>
         <td><b>SHOULD</b></td>
         <td><code>reference</code>.<code>token</code></td>
-        <td>The requester <b>SHALL</b> provide both the system and code values. The responder <b>SHALL</b> support both. <br/><br/> The requester <b>SHOULD</b> support search using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile. The responder <b>SHOULD</b> support search using the using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile.</td>
+        <td>The requester <b>SHALL</b> provide both the system and code values. The responder <b>SHALL</b> support both.<br/><br/>The requester <b>SHOULD</b> support search using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile. The responder <b>SHOULD</b> support search using the using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile.</td>
   </tr>
   <tr>
         <td>patient+onset-date</td>
@@ -65,13 +65,13 @@
         <td>code</td>
         <td><b>MAY</b></td>
         <td><code>token</code></td>
-        <td>The requester <b>SHALL</b> provide at least a code value and <b>MAY</b> provide both the system and code values. The responder <b>SHALL</b> support both.</td>
+        <td>The requester <b>SHALL</b> provide at least a code value and <b>MAY</b> provide both the system and code values. The responder <b>SHALL</b> support both.<br/><br/>The requester <strong>SHOULD</strong> support <code>multipleOr</code>. The responder <strong>SHOULD</strong> support <code>multipleOr</code>.</td>
   </tr>
   <tr>
         <td>onset-date</td>
         <td><b>MAY</b></td>
         <td><code>date</code></td>
-        <td>A requester <b>SHALL</b> provide a value precise to the second + time offset. A responder <b>SHALL</b> support a value precise to the second + time offset.</td>
+        <td>A requester <b>SHALL</b> provide a value precise to the second + time offset. A responder <b>SHALL</b> support a value precise to the second + time offset.<br/><br/>The requester <strong>SHALL</strong> support these search comparators <code>gt</code>, <code>lt</code>, <code>ge</code>, <code>le</code>. The responder <strong>SHALL</strong> support these search comparators <code>gt</code>, <code>lt</code>, <code>ge</code>, <code>le</code>.<br/><br/>The requester <strong>SHOULD</strong> support <code>multipleAnd</code>. The responder <strong>SHOULD</strong> support <code>multipleAnd</code>.</td>
   </tr>
  </tbody>
 </table>
diff --git a/input/intro-notes/StructureDefinition-au-core-encounter-intro.md b/input/intro-notes/StructureDefinition-au-core-encounter-intro.md
index ae61aa77..c9205971 100644
--- a/input/intro-notes/StructureDefinition-au-core-encounter-intro.md
+++ b/input/intro-notes/StructureDefinition-au-core-encounter-intro.md
@@ -18,6 +18,6 @@ Conformance in reverse is not guaranteed, i.e. a resource conforming to [US Core
 
 
 ### Profile specific implementation guidance
-- The Encounter resource can represent a reason as a code with `Encounter.reasonCode`, or a reference with `Encounter.reasonReference` to a Condition or other resource.
+- The Encounter resource can represent a clinical indication with `Encounter.reasonCode`, or a reference with `Encounter.reasonReference` to a Condition or other resource.
   - Although both are marked as *Must Support*, responders are not required to support both a code and a reference, but they **SHALL** support *at least one* of these elements
   - A requester **SHALL** support both elements
\ No newline at end of file
diff --git a/input/intro-notes/StructureDefinition-au-core-encounter-notes.md b/input/intro-notes/StructureDefinition-au-core-encounter-notes.md
index 617521cd..653834ca 100644
--- a/input/intro-notes/StructureDefinition-au-core-encounter-notes.md
+++ b/input/intro-notes/StructureDefinition-au-core-encounter-notes.md
@@ -29,7 +29,7 @@
         <td>patient.identifier</td>
         <td><b>SHOULD</b></td>
          <td><code>reference</code>.<code>token</code></td>
-         <td>The requester <b>SHALL</b> provide both the system and code values. The responder <b>SHALL</b> support both. <br/><br/> The requester <b>SHOULD</b> support search using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile. The responder <b>SHOULD</b> support search using the using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile.</td>
+         <td>The requester <b>SHALL</b> provide both the system and code values. The responder <b>SHALL</b> support both.<br/><br/>The requester <b>SHOULD</b> support search using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile. The responder <b>SHOULD</b> support search using the using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile.</td>
   </tr>
    <tr>
         <td>patient+location</td>
@@ -53,7 +53,7 @@
         <td>date</td>
         <td><b>MAY</b></td>
         <td><code>date</code></td>
-        <td>A requester <b>SHALL</b> provide a value precise to the second + time offset. A responder <b>SHALL</b> support a value precise to the second + time offset.</td>
+        <td>A requester <b>SHALL</b> provide a value precise to the second + time offset. A responder <b>SHALL</b> support a value precise to the second + time offset.<br/><br/>The requester <strong>SHALL</strong> support these search comparators <code>gt</code>, <code>lt</code>, <code>ge</code>, <code>le</code>. The responder <strong>SHALL</strong> support these search comparators <code>gt</code>, <code>lt</code>, <code>ge</code>, <code>le</code>.<br/><br/>The requester <strong>SHOULD</strong> support <code>multipleAnd</code>. The responder <strong>SHOULD</strong> support <code>multipleAnd</code>.</td>
   </tr>
   <tr>
         <td>location</td>
@@ -65,7 +65,7 @@
         <td>status</td>
         <td><b>MAY</b></td>
         <td><code>token</code></td>
-        <td>The requester <b>SHALL</b> provide at least a code value and <b>MAY</b> provide both the system and code values. The responder <b>SHALL</b> support both.</td>
+        <td>The requester <b>SHALL</b> provide at least a code value and <b>MAY</b> provide both the system and code values. The responder <b>SHALL</b> support both.<br/><br/>The requester <strong>SHALL</strong> support <code>multipleOr</code>.The responder <strong>SHALL</strong> support <code>multipleOr</code>.</td>
   </tr>
  </tbody>
 </table>
diff --git a/input/intro-notes/StructureDefinition-au-core-immunization-notes.md b/input/intro-notes/StructureDefinition-au-core-immunization-notes.md
index 692d7dc4..e74ce228 100644
--- a/input/intro-notes/StructureDefinition-au-core-immunization-notes.md
+++ b/input/intro-notes/StructureDefinition-au-core-immunization-notes.md
@@ -27,18 +27,19 @@
         <td>patient.identifier</td>
         <td><b>SHOULD</b></td>
         <td><code>reference</code>.<code>token</code></td>
-        <td>The requester <b>SHALL</b> provide both the system and code values. The responder <b>SHALL</b> support both. <br/><br/> The requester <b>SHOULD</b> support search using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile. The responder <b>SHOULD</b> support search using the using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile.</td>
+        <td>The requester <b>SHALL</b> provide both the system and code values. The responder <b>SHALL</b> support both.<br/><br/>The requester <b>SHOULD</b> support search using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile. The responder <b>SHOULD</b> support search using the using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile.</td>
   </tr>
   <tr>
         <td>date</td>
         <td><b>MAY</b></td>
         <td><code>date</code></td>
-        <td>A requester <b>SHALL</b> provide a value precise to the second + time offset. A responder <b>SHALL</b> support a value precise to the second + time offset.</td>
+        <td>A requester <b>SHALL</b> provide a value precise to the second + time offset. A responder <b>SHALL</b> support a value precise to the second + time offset.<br/><br/>The requester <strong>SHALL</strong> support these search comparators <code>gt</code>, <code>lt</code>, <code>ge</code>, <code>le</code>. The responder <strong>SHALL</strong> support these search comparators <code>gt</code>, <code>lt</code>, <code>ge</code>, <code>le</code>.<br/><br/>The requester <strong>SHOULD</strong> support <code>multipleAnd</code>. The responder <strong>SHOULD</strong> support <code>multipleAnd</code>.</td>
   </tr>
   <tr>
         <td>patient+vaccine-code</td>
         <td><b>MAY</b></td>
         <td><code>reference</code>+<code>token</code></td>
+        <td></td>
   </tr>
    <tr>
         <td>status</td>
diff --git a/input/intro-notes/StructureDefinition-au-core-location-notes.md b/input/intro-notes/StructureDefinition-au-core-location-notes.md
index 6528b540..c5eff46a 100644
--- a/input/intro-notes/StructureDefinition-au-core-location-notes.md
+++ b/input/intro-notes/StructureDefinition-au-core-location-notes.md
@@ -51,7 +51,7 @@
 
 The following search parameters **SHALL** be supported:
 
-1. **SHALL** support searching for a location based on text address using the **[`address`](https://hl7.org/fhir/R4/location.html#search)** search parameter:
+1. **SHALL** support searching based on text address using the **[`address`](https://hl7.org/fhir/R4/location.html#search)** search parameter:
     
     `GET [base]/Location?address=[string]`
 
@@ -62,7 +62,7 @@ The following search parameters **SHALL** be supported:
 
     *Implementation Notes:* Fetches a bundle of all Location resources matching the name ([how to search by string](http://hl7.org/fhir/R4/search.html#string))
 
-1. **SHALL** support searching for a location based on text name using the **[`name`](https://hl7.org/fhir/R4/location.html#search)** search parameter:
+1. **SHALL** support searching based on text name using the **[`name`](https://hl7.org/fhir/R4/location.html#search)** search parameter:
     
     `GET [base]/Location?name=[string]`
 
@@ -77,7 +77,7 @@ The following search parameters **SHALL** be supported:
 
 The following search parameters **SHOULD** be supported:
 
-1. **SHOULD** support searching for a location based on the **[`address-city`](https://hl7.org/fhir/R4/location.html#search)** search parameter:
+1. **SHOULD** support searching using the **[`address-city`](https://hl7.org/fhir/R4/location.html#search)** search parameter:
     
     `GET [base]/Location?address-city=[string]`
 
@@ -87,7 +87,7 @@ The following search parameters **SHOULD** be supported:
 
     *Implementation Notes:* Fetches a bundle of all Location resources for the city ([how to search by string](http://hl7.org/fhir/R4/search.html#string))
 
-1. **SHOULD** support searching for a location based on the **[`addresss-postalcode`](https://hl7.org/fhir/R4/location.html#search)** search parameter:
+1. **SHOULD** support searching using the **[`addresss-postalcode`](https://hl7.org/fhir/R4/location.html#search)** search parameter:
     
     `GET [base]/Location?addresss-postalcode=[string]`
 
@@ -97,7 +97,7 @@ The following search parameters **SHOULD** be supported:
 
     *Implementation Notes:* Fetches a bundle of all Location resources matching the post code ([how to search by string](http://hl7.org/fhir/R4/search.html#string))
 
-1. **SHOULD** support searching for a location based on the **[`address-state`](https://hl7.org/fhir/R4/location.html#search)** search parameter:
+1. **SHOULD** support searching using the **[`address-state`](https://hl7.org/fhir/R4/location.html#search)** search parameter:
     
     `GET [base]/Location?address-state=[string]`
 
diff --git a/input/intro-notes/StructureDefinition-au-core-medicationrequest-intro.md b/input/intro-notes/StructureDefinition-au-core-medicationrequest-intro.md
index f947b4df..a067de37 100644
--- a/input/intro-notes/StructureDefinition-au-core-medicationrequest-intro.md
+++ b/input/intro-notes/StructureDefinition-au-core-medicationrequest-intro.md
@@ -24,6 +24,8 @@ Conformance in reverse is not guaranteed, i.e. a resource conforming to [Interna
   - Although both are marked as *Must Support*, responders are not required to support both a code and a reference, but they **SHALL** support *at least one* of these elements
   - A requester **SHALL** support both elements
   - When referencing a Medication resource, it is preferred the resource is [contained](http://hl7.org/fhir/R4/references.html#contained) but it may be an external resource
-- The MedicationRequest resource can represent a reason as a code with `MedicationRequest.reasonCode`, or a reference with `MedicationRequest.reasonReference` to a Condition or other resource.
+  - If an external reference to a Medication resource is used, the responder **SHALL** support the `_include` parameter for searching this element
+  - The requester **SHALL** support all method
+- The MedicationRequest resource can represent the clinical indication as a code with `MedicationRequest.reasonCode`, or a reference with `MedicationRequest.reasonReference` to a Condition or other resource.
   - Although both are marked as *Must Support*, responders are not required to support both a code and a reference, but they **SHALL** support *at least one* of these elements
   - A requester **SHALL** support both elements  
diff --git a/input/intro-notes/StructureDefinition-au-core-medicationrequest-notes.md b/input/intro-notes/StructureDefinition-au-core-medicationrequest-notes.md
index 9d9810dd..c2db71d8 100644
--- a/input/intro-notes/StructureDefinition-au-core-medicationrequest-notes.md
+++ b/input/intro-notes/StructureDefinition-au-core-medicationrequest-notes.md
@@ -35,7 +35,7 @@
         <td>patient.identifier</td>
         <td><b>SHOULD</b></td>
         <td><code>reference</code>.<code>token</code></td>
-        <td>The requester <b>SHALL</b> provide both the system and code values. The responder <b>SHALL</b> support both. <br/><br/> The requester <b>SHOULD</b> support search using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile. The responder <b>SHOULD</b> support search using the using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile.</td>
+        <td>The requester <b>SHALL</b> provide both the system and code values. The responder <b>SHALL</b> support both.<br/><br/>The requester <b>SHOULD</b> support search using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile. The responder <b>SHOULD</b> support search using the using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile.</td>
   </tr>
    <tr>
         <td>patient+intent+authoredon</td>
@@ -47,7 +47,7 @@
         <td>authoredon</td>
         <td><b>MAY</b></td>
         <td><code>date</code></td>
-        <td>A requester <b>SHALL</b> provide a value precise to the second + time offset. A responder <b>SHALL</b> support a value precise to the second + time offset.</td>
+        <td>A requester <b>SHALL</b> provide a value precise to the second + time offset. A responder <b>SHALL</b> support a value precise to the second + time offset.<br/><br/>The requester <strong>SHALL</strong> support these search comparators <code>gt</code>, <code>lt</code>, <code>ge</code>, <code>le</code>. The responder <strong>SHALL</strong> support these search comparators <code>gt</code>, <code>lt</code>, <code>ge</code>, <code>le</code>.<br/><br/>The requester <strong>SHOULD</strong> support <code>multipleAnd</code>. The responder <strong>SHOULD</strong> support <code>multipleAnd</code>.</td>
   </tr>
   <tr>
         <td>intent</td>
@@ -59,7 +59,7 @@
         <td>status</td>
         <td><b>MAY</b></td>
         <td><code>token</code></td>
-        <td>The requester <b>SHALL</b> provide at least a code value and <b>MAY</b> provide both the system and code values. The responder <b>SHALL</b> support both.</td>
+        <td>The requester <b>SHALL</b> provide at least a code value and <b>MAY</b> provide both the system and code values. The responder <b>SHALL</b> support both.<br/><br/>The requester <strong>SHALL</strong> support <code>multipleOr</code>. The responder <strong>SHALL</strong> support <code>multipleOr</code>.</td>
   </tr>
  </tbody>
 </table>
@@ -118,19 +118,18 @@ The following search parameters and search parameter combinations **SHALL** be s
 
 The following search parameters and search parameter combinations **SHOULD** be supported:
 
-1. **SHOULD** support fetching a MedicationRequest using the **[`_id`](https://hl7.org/fhir/R4/medicationrequest.html#search)** search parameter:
+1. **SHOULD** support searching using the **[`_id`](https://hl7.org/fhir/R4/medicationrequest.html#search)** search parameter:
     - **SHOULD** support these **[`_include`](http://hl7.org/fhir/R4/search.html#include)** parameters: `MedicationRequest:medication`
 
  
-    `GET [base]/MedicationRequest/[id]` or `GET [base]/MedicationRequest?_id=[id]`
+    `GET [base]/MedicationRequest?_id=[id]`
 
     Example:
     
-      1. GET [base]/MedicationRequest/2169591
       1. GET [base]/MedicationRequest?_id=2169591
       1. GET [base]/MedicationRequest?_id=2169591&amp;_include=MedicationRequest:medication
 
-    *Implementation Notes:* Fetches a single MedicationRequest ([how to search by id of the resource](https://hl7.org/fhir/r4/search.html#id))
+    *Implementation Notes:* Fetches a bundle with the requested MedicationRequest, instead of just the resource itself, and allows for the inclusion of additional search parameters such as _include, _revinclude, or _lastUpdated ([how to search by id of the resource](https://hl7.org/fhir/r4/search.html#id))
 
 1. **SHOULD** support searching using the combination of the **[`patient`](https://hl7.org/fhir/R4/medicationrequest.html#search)** and **[`intent`](https://hl7.org/fhir/R4/medicationrequest.html#search)** and **[`authoredon`](https://hl7.org/fhir/R4/medicationrequest.html#search)** search parameters:
     - **SHOULD** support these **[`_include`](http://hl7.org/fhir/R4/search.html#include)** parameters: `MedicationRequest:medication`
diff --git a/input/intro-notes/StructureDefinition-au-core-organization-notes.md b/input/intro-notes/StructureDefinition-au-core-organization-notes.md
index 6016f36f..8c96bed0 100644
--- a/input/intro-notes/StructureDefinition-au-core-organization-notes.md
+++ b/input/intro-notes/StructureDefinition-au-core-organization-notes.md
@@ -38,7 +38,7 @@
 
 The following search parameters **SHALL** be supported:
 
-1. **SHALL** support searching an organisation by an identifier using the **[`identifier`](https://hl7.org/fhir/R4/organization.html#search)** search parameter:
+1. **SHALL** support searching using the **[`identifier`](https://hl7.org/fhir/R4/organization.html#search)** search parameter:
     
     `GET [base]/Organization?identifier={system|}[code]`
 
@@ -46,6 +46,7 @@ The following search parameters **SHALL** be supported:
     
       1. GET [base]/Organization?identifier=http://ns.electronichealth.net.au/id/hi/hpio/1.0\|8003621566684455
       1. GET [base]/Organization?identifier=http://hl7.org.au/id/abn\|23964200000
+      1. GET [base]/Organization?identifier=23964200000
 
     *Implementation Notes:* Fetches a bundle containing any Organization resources matching the identifier ([how to search by token](http://hl7.org/fhir/R4/search.html#token))
 
@@ -54,7 +55,7 @@ The following search parameters **SHALL** be supported:
 
 The following search parameters **SHOULD** be supported:
 
-1. **SHOULD** support searching for an organisation based on text address using the **[`address`](https://hl7.org/fhir/R4/organization.html#search)** search parameter:
+1. **SHOULD** support searching based on text address using the **[`address`](https://hl7.org/fhir/R4/organization.html#search)** search parameter:
     
     `GET [base]/Organization?address=[string]`
 
@@ -64,7 +65,7 @@ The following search parameters **SHOULD** be supported:
 
     *Implementation Notes:* Fetches a bundle of all Organization resources matching the address ([how to search by string](http://hl7.org/fhir/R4/search.html#string))
     
-1. **SHOULD** support searching for an organisation based on text name using the **[`name`](https://hl7.org/fhir/R4/organization.html#search)** search parameter:
+1. **SHOULD** support searching based on text name using the **[`name`](https://hl7.org/fhir/R4/organization.html#search)** search parameter:
     
     `GET [base]/Organization?name=[string]`
 
@@ -74,13 +75,13 @@ The following search parameters **SHOULD** be supported:
 
     *Implementation Notes:* Fetches a bundle of all Organization resources matching the name ([how to search by string](http://hl7.org/fhir/R4/search.html#string))
     
-1. **SHOULD** support fetching an Organization using the **[`_id`](https://hl7.org/fhir/R4/organization.html#search)** search parameter:
+1. **SHOULD** support searching using the **[`_id`](https://hl7.org/fhir/R4/organization.html#search)** search parameter:
     
-    `GET [base]/Organization/[id]` or `GET [base]/Organization?_id=[id]`
+    `GET [base]/Organization?_id=[id]`
 
     Example:
     
       1. GET [base]/Organization?_id=5678
 
-    *Implementation Notes:* Fetches a single Organization ([how to search by id of the resource](https://hl7.org/fhir/r4/search.html#id))
+    *Implementation Notes:* Fetches a bundle with the requested Organization, instead of just the resource itself, and allows for the inclusion of additional search parameters such as _include, _revinclude, or _lastUpdated ([how to search by id of the resource](https://hl7.org/fhir/r4/search.html#id))
 
diff --git a/input/intro-notes/StructureDefinition-au-core-patient-notes.md b/input/intro-notes/StructureDefinition-au-core-patient-notes.md
index 951007f3..187d2965 100644
--- a/input/intro-notes/StructureDefinition-au-core-patient-notes.md
+++ b/input/intro-notes/StructureDefinition-au-core-patient-notes.md
@@ -17,7 +17,7 @@
         <td>identifier</td>
         <td><b>SHALL</b></td>
         <td><code>token</code></td>
-        <td>The requester <b>SHALL</b> provide both the system and code values. The responder <b>SHALL</b> support both. <br/><br/> The requester <b>SHOULD</b> support search using IHI, Medicare Number, and DVA Number identifiers as defined in the profile. The responder <b>SHOULD</b> support search using the using IHI, Medicare Number, and DVA Number identifiers as defined in the profile.</td>
+        <td>The requester <b>SHALL</b> provide both the system and code values. The responder <b>SHALL</b> support both.<br/><br/>The requester <b>SHOULD</b> support search using IHI, Medicare Number, and DVA Number identifiers as defined in the profile. The responder <b>SHOULD</b> support search using the using IHI, Medicare Number, and DVA Number identifiers as defined in the profile.</td>
   </tr>
   <tr>
         <td>birthdate+family</td>
@@ -59,7 +59,7 @@
         <td>birthdate</td>
         <td><b>MAY</b></td>
         <td><code>date</code></td>
-        <td>A requester <b>SHALL</b> provide a value precise to the day. A responder <b>SHALL</b> support a value precise to the day offset.</td>
+        <td>A requester <b>SHALL</b> provide a value precise to the day. A responder <b>SHALL</b> support a value precise to the day offset.<br/><br/>The requester <strong>SHOULD</strong> support these search comparators <code>gt</code>, <code>lt</code>, <code>ge</code>, <code>le</code>. The responder <strong>SHOULD</strong> support these search comparators <code>gt</code>, <code>lt</code>, <code>ge</code>, <code>le</code>.<br/><br/>The requester <strong>SHOULD</strong> support <code>multipleAnd</code> and if <code>multipleAnd</code> is supported, the search comparators <code>gt</code>, <code>lt</code>, <code>ge</code>, <code>le</code> <strong>SHALL</strong> be supported. The responder <strong>SHOULD</strong> support <code>multipleAnd</code> and if <code>multipleAnd</code> is supported, the search comparators <code>gt</code>, <code>lt</code>, <code>ge</code>, <code>le</code> <strong>SHALL</strong> be supported.</td>
   </tr>
   <tr>
         <td>gender</td>
@@ -85,16 +85,15 @@
 
 #### Mandatory Search Parameters
 
-1. **SHALL** support fetching a Patient using the **[`_id`](https://hl7.org/fhir/R4/patient.html#search)** search parameter:
+1. **SHALL** support searching using the **[`_id`](https://hl7.org/fhir/R4/patient.html#search)** search parameter:
     
-    `GET [base]/Patient/[id]` or `GET [base]/Patient?_id=[id]`
+    `GET [base]/Patient?_id=[id]`
 
     Example:
     
-      1. GET [base]/Patient/5678
       1. GET [base]/Patient?_id=5678
 
-    *Implementation Notes:* Returns a single Patient resource ([how to search by id of the resource](https://hl7.org/fhir/r4/search.html#id))
+    *Implementation Notes:* Fetches a bundle with the requested Patient, instead of just the resource itself, and allows for the inclusion of additional search parameters such as _include, _revinclude, or _lastUpdated ([how to search by id of the resource](https://hl7.org/fhir/r4/search.html#id))
 
 1. **SHALL** support searching a patient by an identifier using the **[`identifier`](https://hl7.org/fhir/R4/patient.html#search)** search parameter:
     
@@ -113,7 +112,7 @@
 
 The following search parameters and search parameter combinations **SHOULD** be supported:
 
-1. **SHOULD** support searching for a patient by a responder-defined search that matches any of the string fields in the HumanName, including family, given, prefix, suffix, and/or text using the **[`name`](https://hl7.org/fhir/R4/patient.html#search)** search parameter:
+1. **SHOULD** support searching by a responder-defined search that matches any of the string fields in the HumanName, including family, given, prefix, suffix, and/or text using the **[`name`](https://hl7.org/fhir/R4/patient.html#search)** search parameter:
     
     `GET [base]/Patient?name=[string]`
 
diff --git a/input/intro-notes/StructureDefinition-au-core-practitioner-notes.md b/input/intro-notes/StructureDefinition-au-core-practitioner-notes.md
index 50634771..a61de8a3 100644
--- a/input/intro-notes/StructureDefinition-au-core-practitioner-notes.md
+++ b/input/intro-notes/StructureDefinition-au-core-practitioner-notes.md
@@ -32,13 +32,14 @@
 
 The following search parameters **SHALL** be supported:
 
-1. **SHALL** support searching a practitioner by an identifier using the **[`identifier`](https://hl7.org/fhir/R4/practitioner.html#search)** search parameter:
+1. **SHALL** support searching using the **[`identifier`](https://hl7.org/fhir/R4/practitioner.html#search)** search parameter:
 
     `GET [base]/Practitioner?identifier={system|}[code]`
 
     Example:
     
       1. GET [base]/Practitioner?identifier=http://ns.electronichealth.net.au/id/hi/hpii/1.0\|8003619900015717
+      1. GET [base]/Practitioner?identifier=8003619900015717
 
     *Implementation Notes:* Fetches a bundle containing any Practitioner resources matching the identifier ([how to search by token](http://hl7.org/fhir/R4/search.html#token))
 
@@ -46,16 +47,15 @@ The following search parameters **SHALL** be supported:
 
 The following search parameters **SHOULD** be supported:
 
-1. **SHOULD** support fetching a Practitioner using the **[`_id`](https://hl7.org/fhir/R4/practitioner.html#search)** search parameter:
+1. **SHOULD** support searching using the **[`_id`](https://hl7.org/fhir/R4/practitioner.html#search)** search parameter:
 
-    `GET [base]/Practitioner/[id]` or `GET [base]/Practitioner?_id=[id]`
+    `GET [base]/Practitioner?_id=[id]`
 
     Example:
     
-      1. GET [base]/Practitioner/5678
       1. GET [base]/Practitioner?_id=5678
 
-    *Implementation Notes:* Returns a single Practitioner resource ([how to search by id of the resource](https://hl7.org/fhir/r4/search.html#id))
+    *Implementation Notes:* Fetches a bundle with the requested Practitioner, instead of just the resource itself, and allows for the inclusion of additional search parameters such as _include, _revinclude, or _lastUpdated ([how to search by id of the resource](https://hl7.org/fhir/r4/search.html#id))
 
 1. **SHOULD** support searching for a practitioner based on text name using the **[`name`](https://hl7.org/fhir/R4/practitioner.html#search)** search parameter:
 
diff --git a/input/intro-notes/StructureDefinition-au-core-practitionerrole-intro.md b/input/intro-notes/StructureDefinition-au-core-practitionerrole-intro.md
index 091a8571..d503bde4 100644
--- a/input/intro-notes/StructureDefinition-au-core-practitionerrole-intro.md
+++ b/input/intro-notes/StructureDefinition-au-core-practitionerrole-intro.md
@@ -18,3 +18,4 @@ Conformance in reverse is not guaranteed, i.e. a resource conforming to [Interna
 
 ### Profile specific implementation guidance
 - See guidance on the construction of an identifier on the relevant Identifier profile page and the section on [Business Identifiers](https://build.fhir.org/ig/hl7au/au-fhir-base/guidance.html#business-identifiers) in AU Base.
+- Requesters can request responders return the Practitioner resource using `_include`, see the Notes section below.
diff --git a/input/intro-notes/StructureDefinition-au-core-practitionerrole-notes.md b/input/intro-notes/StructureDefinition-au-core-practitionerrole-notes.md
index 76b5b6c4..c839b3cc 100644
--- a/input/intro-notes/StructureDefinition-au-core-practitionerrole-notes.md
+++ b/input/intro-notes/StructureDefinition-au-core-practitionerrole-notes.md
@@ -12,7 +12,7 @@
         <td>identifier</td>
         <td><b>SHALL</b></td>
         <td><code>token</code></td>
-        <td>The requester <b>SHALL</b> provide at least a code value and <b>SHOULD</b> provide both the system and code values. The responder <b>SHALL</b> support both. <br/><br/> The requester <b>SHOULD</b> support search using a Medicare Provider Number identifier as defined in the profile. The responder <b>SHOULD</b> support search using a Medicare Provider Number identifier as defined in the profile.</td>
+        <td>The requester <b>SHALL</b> provide at least a code value and <b>SHOULD</b> provide both the system and code values. The responder <b>SHALL</b> support both. <br/><br/>The requester <b>SHOULD</b> support search using a Medicare Provider Number identifier as defined in the profile. The responder <b>SHOULD</b> support search using a Medicare Provider Number identifier as defined in the profile.</td>
   </tr>
    <tr>
         <td>practitioner</td>
@@ -30,7 +30,7 @@
         <td>practitioner.identifier</td>
         <td><b>SHOULD</b></td>
         <td><code>token</code></td>
-        <td>The requester <b>SHALL</b> provide at least a code value and <b>SHOULD</b> provide both the system and code values. The responder <b>SHALL</b> support both. <br/><br/> The requester <b>SHOULD</b> support search using a HPI-I identifier as defined in the profile. The responder <b>SHOULD</b> support search using the using a HPI-I identifier as defined in the profile.</td>
+        <td>The requester <b>SHALL</b> provide at least a code value and <b>SHOULD</b> provide both the system and code values. The responder <b>SHALL</b> support both. <br/><br/> The requester <b>SHOULD</b> support search using a HPI-I identifier as defined in the AU Core Practitioner profile. The responder <b>SHOULD</b> support search using the using a HPI-I identifier as defined in the AU Core Practitioner profile.</td>
   </tr>
   <tr>
         <td>specialty</td>
@@ -51,7 +51,7 @@
 
 The following search parameters **SHALL** be supported:
 
-1. **SHALL** support searching a practitioner role by an identifier using the **[`identifier`](https://hl7.org/fhir/R4/practitionerrole.html#search)** search parameter:
+1. **SHALL** support searching using the **[`identifier`](https://hl7.org/fhir/R4/practitionerrole.html#search)** search parameter:
     - **SHOULD** support these **[`_include`](http://hl7.org/fhir/R4/search.html#include)** parameters: `PractitionerRole:practitioner`
 
     `GET [base]/PractitionerRole?identifier={system|}[code]`
@@ -60,6 +60,7 @@ The following search parameters **SHALL** be supported:
     
       1. GET [base]/PractitionerRole?identifier=http://ns.electronichealth.net.au/id/medicare-prescriber-number\|553255&amp;_include=PractitionerRole:practitioner
       1. GET [base]/PractitionerRole?identifier=http://ns.electronichealth.net.au/id/medicare-prescriber-number\|553255
+      1. GET [base]/PractitionerRole?identifier=553255
 
     *Implementation Notes:* Fetches a bundle containing any PractitionerRole resources matching the identifier ([how to search by token](http://hl7.org/fhir/R4/search.html#token))
 
@@ -67,7 +68,8 @@ The following search parameters **SHALL** be supported:
     - **SHOULD** support chained searching of practitioner canonical identifier `practitioner.identifier` (e.g. `practitioner.identifier=[system|][code]`)
     - **SHOULD** support these **[`_include`](http://hl7.org/fhir/R4/search.html#include)** parameters: `PractitionerRole:practitioner`
 
-    `GET [base]/PractitionerRole?practitioner={Type/}[id]`
+    `GET [base]/PractitionerRole?practitioner={Type/}[id]` 
+    or optionally `GET [base]/PractitionerRole?practitioner.identifier=[system|][code]`
 
     Example:
     
@@ -75,23 +77,23 @@ The following search parameters **SHALL** be supported:
       1. GET [base]/PractitionerRole?practitioner=Practitioner/sandyson-sandy&amp;_include=PractitionerRole:practitioner
       1. GET [base]/PractitionerRole?practitioner.identifier=http://ns.electronichealth.net.au/id/hi/hpii/1.0\|8003619900015717
 
-    *Implementation Notes:* Fetches a bundle of all PractitionerRole resources matching the specified practitioner ([how to search by reference](http://hl7.org/fhir/R4/search.html#reference))
+    *Implementation Notes:* Fetches a bundle of all PractitionerRole resources matching the specified practitioner ([how to search by reference](http://hl7.org/fhir/R4/search.html#reference) and [how to search by token](http://hl7.org/fhir/R4/search.html#token))
 
 #### Optional Search Parameters
 
 The following search parameters and search parameter combinations **SHOULD** be supported:
 
-1. **SHOULD** support fetching a PractitionerRole using the **[`_id`](https://hl7.org/fhir/R4/practitionerrole.html#search)** search parameter:
+1. **SHOULD** support searching using the **[`_id`](https://hl7.org/fhir/R4/practitionerrole.html#search)** search parameter:
     - **SHOULD** support these **[`_include`](http://hl7.org/fhir/R4/search.html#include)** parameters: `PractitionerRole:practitioner`
 
-    `GET [base]/PractitionerRole/[id]` or `GET [base]/PractitionerRole?_id=[id]`
+    `GET [base]/PractitionerRole?_id=[id]`
 
     Example:
     
-      1. GET [base]/PractitionerRole/5678
+      1. GET [base]/PractitionerRole/_id=5678
       1. GET [base]/PractitionerRole?_id=5678&amp;_include=PractitionerRole:practitioner
 
-    *Implementation Notes:* Returns a single PractitionerRole resource. ([how to search by id of the resource](https://hl7.org/fhir/r4/search.html#id))
+    *Implementation Notes:* Fetches a bundle with the requested PractitionerRole, instead of just the resource itself, and allows for the inclusion of additional search parameters such as _include, _revinclude, or _lastUpdated ([how to search by id of the resource](https://hl7.org/fhir/r4/search.html#id))
 
 1. **SHOULD** support searching using the **[`specialty`](https://hl7.org/fhir/R4/practitionerrole.html#search)** search parameter:
     - **SHOULD** support these **[`_include`](http://hl7.org/fhir/R4/search.html#include)** parameters: `PractitionerRole:practitioner`
diff --git a/input/intro-notes/StructureDefinition-au-core-procedure-intro.md b/input/intro-notes/StructureDefinition-au-core-procedure-intro.md
index f542421d..dfbbad73 100644
--- a/input/intro-notes/StructureDefinition-au-core-procedure-intro.md
+++ b/input/intro-notes/StructureDefinition-au-core-procedure-intro.md
@@ -22,7 +22,7 @@ Conformance in reverse is not guaranteed, i.e. a resource conforming to [Interna
 - The use of coding can vary significantly across systems, requesters need to understand that they may encounter codes they do not recognise and be prepared to handle those resources appropriately. Responders **SHOULD** populate `Procedure.code.text` and/or `Procedure.code.coding.display` so that requesters can at least display the procedure even if the requester does not recognise the code supplied.
 - `Procedure.code` contains the identification of the procedure which may include body site information. Where a system has information not supported by the coding in `Procedure.code.coding` (e.g. body site, laterality and other qualification of procedure coding terms) that information **SHOULD** be supplied in `Procedure.code.text`
 - In an exchange with the My Health Record system `Procedure.status` is "completed"
-- The Procedure resource can represent a reason as a code with `Procedure.reasonCode`, or a reference with `Procedure.reasonReference` to a Condition or other resource.
+- The Procedure resource can represent a clinical indication with `Procedure.reasonCode`, or a reference with `Procedure.reasonReference` to a Condition or other resource.
   - Although both are marked as *Must Support*, responders are not required to support both a code and a reference, but they **SHALL** support *at least one* of these elements
   - A requester **SHALL** support both elements
 - A procedure including an implantable device should use `Procedure.focalDevice` with a reference to a Device resource
\ No newline at end of file
diff --git a/input/intro-notes/StructureDefinition-au-core-procedure-notes.md b/input/intro-notes/StructureDefinition-au-core-procedure-notes.md
index b5f8e6f7..42620b04 100644
--- a/input/intro-notes/StructureDefinition-au-core-procedure-notes.md
+++ b/input/intro-notes/StructureDefinition-au-core-procedure-notes.md
@@ -29,7 +29,7 @@
         <td>patient.identifier</td>
         <td><b>SHOULD</b></td>
         <td><code>reference</code>.<code>token</code></td>
-        <td>The requester <b>SHALL</b> provide both the system and code values. The responder <b>SHALL</b> support both. <br/><br/> The requester <b>SHOULD</b> support search using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile. The responder <b>SHOULD</b> support search using the using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile.</td>
+        <td>The requester <b>SHALL</b> provide both the system and code values. The responder <b>SHALL</b> support both.<br/><br/>The requester <b>SHOULD</b> support search using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile. The responder <b>SHOULD</b> support search using the using IHI, Medicare Number, and DVA Number identifiers as defined in the AU Core Patient profile.</td>
   </tr>
   <tr>
         <td>patient+status</td>
@@ -41,19 +41,19 @@
         <td>code</td>
         <td><b>MAY</b></td>
         <td><code>token</code></td>
-        <td>The requester <b>SHALL</b> provide at least a code value and <b>MAY</b> provide both the system and code values. The responder <b>SHALL</b> support both.</td>
+        <td>The requester <b>SHALL</b> provide at least a code value and <b>MAY</b> provide both the system and code values. The responder <b>SHALL</b> support both.<br/><br/>The requester <strong>SHOULD</strong> support <code>multipleOr</code>. The responder <strong>SHOULD</strong> support <code>multipleOr</code>.</td>
   </tr>
   <tr>
         <td>date</td>
         <td><b>MAY</b></td>
         <td><code>date</code></td>
-        <td>A requester <b>SHALL</b> provide a value precise to the second + time offset. A responder <b>SHALL</b> support a value precise to the second + time offset.</td>
+        <td>A requester <b>SHALL</b> provide a value precise to the second + time offset. A responder <b>SHALL</b> support a value precise to the second + time offset.<br/><br/>The requester <strong>SHALL</strong> support these search comparators <code>gt</code>, <code>lt</code>, <code>ge</code>, <code>le</code>. The responder <strong>SHALL</strong> support these search comparators <code>gt</code>, <code>lt</code>, <code>ge</code>, <code>le</code>.<br/><br/>The requester <strong>SHOULD</strong> support <code>multipleAnd</code>. The responder <strong>SHOULD</strong> support <code>multipleAnd</code>.</td>
   </tr>
   <tr>
         <td>status</td>
         <td><b>MAY</b></td>
         <td><code>token</code></td>
-        <td>The requester <b>SHALL</b> provide at least a code value and <b>MAY</b> provide both the system and code values. The responder <b>SHALL</b> support both.</td>
+        <td>The requester <b>SHALL</b> provide at least a code value and <b>MAY</b> provide both the system and code values. The responder <b>SHALL</b> support both.<br/><br/>The requester <strong>SHALL</strong> support <code>multipleOr</code>. The responder <strong>SHALL</strong> support <code>multipleOr</code>.</td>
   </tr>
  </tbody>
 </table>
diff --git a/input/resources/au-core-requester.xml b/input/resources/au-core-requester.xml
index 66035154..0ea6b6b6 100644
--- a/input/resources/au-core-requester.xml
+++ b/input/resources/au-core-requester.xml
@@ -705,8 +705,8 @@
   <div>
     <p>The requester <strong>SHALL</strong> provide at least a code value and <strong>MAY</strong> provide both the system and code values.</p>
     <p>The responder <strong>SHALL</strong> support both.</p>
-    <p>The requester <strong>SHALL</strong> support <code>multipleOr</code>.</p>
-    <p>The responder <strong>SHALL</strong> support <code>multipleOr</code>.</p>
+    <p>The requester <strong>SHOULD</strong> support <code>multipleOr</code>.</p>
+    <p>The responder <strong>SHOULD</strong> support <code>multipleOr</code>.</p>
   </div>
 </td>
 </tr>
@@ -854,6 +854,7 @@
 <blockquote>
 <div>
 <p>If the requester supports the Encounter resource, the requester <strong>SHALL</strong> support the AU Core profile and the conformance expectations for the Encounter resource.</p>
+<p>The Encounter resource can communicate the clinical indication using either a code in <code>Encounter.reasonCode</code> or a reference using <code>Encounter.reasonReference</code>. Although both <code>Encounter.reasonCode</code> and <code>Encounter.reasonReference</code> are marked as Must Support, a responder is not required to support both but <strong>SHALL</strong> support at least one of these elements. The requester <strong>SHALL</strong> support both elements.</p>
 </div>
 </blockquote>
 </div>
@@ -1504,6 +1505,7 @@
 <div>
 <p>If the requester supports the MedicationRequest resource, the requester <strong>SHALL</strong> support the AU Core profile and the conformance expectations for the MedicationRequest resource.</p>
 <p>The MedicationRequest resources can represent a medication using either a code or refer to the Medication resource. When referencing Medication, the resource may be <a href="http://hl7.org/fhir/R4/references.html#contained">contained</a> or an external resource. The responder <strong>MAY</strong> choose any one way or more than one method, but if an external reference to Medication is used, the responder <strong>SHALL</strong> support the <code>_include</code> parameter for searching this element. The requester application <strong>SHALL</strong> support all methods.</p>
+<p>The MedicationRequest resource can communicate the clinical indication using either a code in <code>MedicationRequest.reasonCode</code> or a reference using <code>MedicationRequest.reasonReference</code>. Although both <code>MedicationRequest.reasonCode</code> and <code>MedicationRequest.reasonReference</code> are marked as Must Support, a responder is not required to support both but <strong>SHALL</strong> support at least one of these elements. The requester <strong>SHALL</strong> support both elements.</p>
 </div>
 </blockquote>
 </div>
@@ -1811,6 +1813,8 @@
   <div>
     <p>The requester <strong>SHALL</strong> provide at least a code value and <strong>MAY</strong> provide both the system and code values.</p>
     <p>The responder <strong>SHALL</strong> support both.</p>
+    <p>The requester <strong>SHALL</strong> support search using the category code defined in each profile supported.</p>
+    <p>The responder <strong>SHALL</strong> support search using the category code defined in each profile supported.</p>
   </div>
 </td>
 </tr>
@@ -1828,6 +1832,8 @@
   <div>
     <p>The requester <strong>SHALL</strong> provide at least a code value and <strong>MAY</strong> provide both the system and code values.</p>
     <p>The responder <strong>SHALL</strong> support both.</p>
+    <p>The requester <strong>SHALL</strong> support search using the LOINC codes defined in each profile supported.</p>
+    <p>The responder <strong>SHALL</strong> support search using the LOINC codes defined in each profile supported.</p>
     <p>The requester <strong>SHALL</strong> support <code>multipleOr</code>.</p>
     <p>The responder <strong>SHALL</strong> support <code>multipleOr</code>.</p>
   </div>
@@ -2535,8 +2541,8 @@
   <div>
     <p>The requester <strong>SHALL</strong> provide both the system and code values.</p>
     <p>The responder <strong>SHALL</strong> support both.</p>
-    <p>The requester <strong>SHOULD</strong> support search using a HPI-I identifier as defined in the profile.</p>
-    <p>The responder <strong>SHOULD</strong> support search using a HPI-I identifier as defined in the profile.</p>
+    <p>The requester <strong>SHOULD</strong> support search using a Medicare Provider Number identifier as defined in the profile.</p>
+    <p>The responder <strong>SHOULD</strong> support search using a Medicare Provider Number identifier as defined in the profile.</p>
   </div>
 </td>
 </tr>
@@ -2675,6 +2681,7 @@
 <blockquote>
 <div>
 <p>If the requester supports the Procedure resource, the requester <strong>SHALL</strong> support the AU Core profile and the conformance expectations for the Procedure resource.</p>
+<p>The Procedure resource can communicate the clinical indication using either a code in <code>Procedure.reasonCode</code> or a reference using <code>Procedure.reasonReference</code>. Although both <code>Procedure.reasonCode</code> and <code>Procedure.reasonReference</code> are marked as Must Support, a responder is not required to support both but <strong>SHALL</strong> support at least one of these elements. The requester <strong>SHALL</strong> support both elements.</p>
 </div>
 </blockquote>
 </div>
@@ -2742,8 +2749,8 @@
   <div>
     <p>The requester <strong>SHALL</strong> provide at least a code value and <strong>MAY</strong> provide both the system and code values.</p>
     <p>The responder <strong>SHALL</strong> support both.</p>
-    <p>The requester <strong>SHALL</strong> support <code>multipleOr</code>.</p>
-    <p>The responder <strong>SHALL</strong> support <code>multipleOr</code>.</p>
+    <p>The requester <strong>SHOULD</strong> support <code>multipleOr</code>.</p>
+    <p>The responder <strong>SHOULD</strong> support <code>multipleOr</code>.</p>
   </div>
 </td>
 </tr>
@@ -3122,7 +3129,7 @@
 <name value="code"/>
 <definition value="http://hl7.org/fhir/SearchParameter/clinical-code"/>
 <type value="token"/>
-<documentation value="The requester **SHALL** provide at least a code value and **MAY** provide both the system and code values.&#xA;&#xA;The responder **SHALL** support both.&#xa;&#xa;The requester **SHALL** support `multipleOr`.&#xa;&#xa;The responder **SHALL** support `multipleOr`."/>
+<documentation value="The requester **SHALL** provide at least a code value and **MAY** provide both the system and code values.&#xA;&#xA;The responder **SHALL** support both.&#xa;&#xa;The requester **SHOULD** support `multipleOr`.&#xa;&#xa;The responder **SHOULD** support `multipleOr`."/>
 </searchParam>
 <searchParam>
 <extension url="http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation">
@@ -3194,7 +3201,7 @@
 </extension>
 <type value="Encounter"/>
 <profile value="http://hl7.org.au/fhir/core/StructureDefinition/au-core-encounter"/>
-<documentation value="If the requester supports the Encounter resource, the responder **SHALL** support the AU Core profile and the conformance expectations for the Encounter resource."/>
+<documentation value="If the requester supports the Encounter resource, the responder **SHALL** support the AU Core profile and the conformance expectations for the Encounter resource.&#xA;&#xA;The Encounter resource can communicate the clinical indication using either a code in `Encounter.reasonCode` or a reference using `Encounter.reasonReference`. Although both `Encounter.reasonCode` and `Encounter.reasonReference` are marked as Must Support, a responder is not required to support both but **SHALL** support at least one of these elements. The requester**SHALL** support both elements."/>
 <interaction>
 <extension url="http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation">
 <valueCode value="SHALL"/>
@@ -3644,7 +3651,7 @@
 </extension>
 <type value="MedicationRequest"/>
 <profile value="http://hl7.org.au/fhir/core/StructureDefinition/au-core-medicationrequest"/>
-<documentation value="MedicationRequest resources can represent a medication using either a code or refer to the Medication resource. When referencing Medication, the resource may be [contained](http://hl7.org/fhir/R4/references.html#contained) or an external resource. The responder **MAY** choose any one way or more than one method, but if an external reference to Medication is used, the responder **SHALL** support the `_include` parameter for searching this element. The requester application **SHALL** support all methods.&#xA;&#xA;If the requester supports the MedicationRequest resource, the responder **SHALL** support the AU Core profile and the conformance expectations for the MedicationRequest resource."/>
+<documentation value="MedicationRequest resources can represent a medication using either a code or refer to the Medication resource. When referencing Medication, the resource may be [contained](http://hl7.org/fhir/R4/references.html#contained) or an external resource. The responder **MAY** choose any one way or more than one method, but if an external reference to Medication is used, the responder **SHALL** support the `_include` parameter for searching this element. The requester application **SHALL** support all methods.&#xA;&#xA;If the requester supports the MedicationRequest resource, the responder **SHALL** support the AU Core profile and the conformance expectations for the MedicationRequest resource.&#xA;&#xA;The MedicationRequest resources can represent a medication using either a code or refer to the Medication resource. When referencing Medication, the resource may be [contained](http://hl7.org/fhir/R4/references.html#contained)> or an external resource. The responder **MAY** choose any one way or more than one method, but if an external reference to Medication is used, the responder **SHALL** support the `_include` parameter for searching this element. The requester application **SHALL** support all methods.&#xA;&#xA;The MedicationRequest resource can communicate the clinical indication using either a code in `MedicationRequest.reasonCode` or a reference using `MedicationRequest.reasonReference`. Although both `MedicationRequest.reasonCode` and `MedicationRequest.reasonReference` are marked as Must Support, a responder is not required to support both but **SHALL** support at least one of these elements. The requester**SHALL** support both elements."/>
 <interaction>
 <extension url="http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation">
 <valueCode value="SHALL"/>
@@ -3925,7 +3932,7 @@
 <name value="category"/>
 <definition value="http://hl7.org/fhir/SearchParameter/Observation-category"/>
 <type value="token"/>
-<documentation value="The requester **SHALL** provide at least a code value and **MAY** provide both the system and code values.&#xA;&#xA;The responder **SHALL** support both."/>
+<documentation value="The requester **SHALL** provide at least a code value and **MAY** provide both the system and code values.&#xA;&#xA;The responder **SHALL** support both.&#xA;&#xA;The requester **SHALL** support search using the category code defined in each profile supported.&#xa;&#xa;The responder **SHALL** support search using the category code defined in each profile supported."/>
 </searchParam>
 <searchParam>
 <extension url="http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation">
@@ -3934,7 +3941,7 @@
 <name value="code"/>
 <definition value="http://hl7.org/fhir/SearchParameter/clinical-code"/>
 <type value="token"/>
-<documentation value="The requester **SHALL** provide at least a code value and **MAY** provide both the system and code values.&#xA;&#xA;The responder **SHALL** support both.&#xa;&#xa;The requester **SHALL** support `multipleOr`.&#xa;&#xa;The responder **SHALL** support `multipleOr`."/>
+<documentation value="The requester **SHALL** provide at least a code value and **MAY** provide both the system and code values.&#xA;&#xA;The responder **SHALL** support both.&#xa;&#xa;The requester **SHALL** support `multipleOr`.&#xa;&#xa;The responder **SHALL** support `multipleOr`.&#xa;&#xa;The requester **SHALL** support search using the LOINC codes defined in each profile supported.&#xa;&#xa;The responder **SHALL** support search using the LOINC codes defined in each profile supported."/>
 </searchParam>
 <searchParam>
 <extension url="http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation">
@@ -4471,7 +4478,7 @@
 </extension>
 <type value="Procedure"/>
 <profile value="http://hl7.org.au/fhir/core/StructureDefinition/au-core-procedure"/>
-<documentation value="If the requester supports the Procedure resource, the requester **SHALL** support the AU Core profile and the conformance expectations for the Procedure resource."/>
+<documentation value="If the requester supports the Procedure resource, the requester **SHALL** support the AU Core profile and the conformance expectations for the Procedure resource.&#xA;&#xA;The Procedure resource can communicate the clinical indication using either a code in `Procedure.reasonCode` or a reference using `Procedure.reasonReference`. Although both `Procedure.reasonCode` and `Procedure.reasonReference` are marked as Must Support, a responder is not required to support both but **SHALL** support at least one of these elements. The requester**SHALL** support both elements."/>
 <interaction>
 <extension url="http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation">
 <valueCode value="SHALL"/>
@@ -4532,7 +4539,7 @@
 <name value="code"/>
 <definition value="http://hl7.org/fhir/SearchParameter/clinical-code"/>
 <type value="token"/>
-<documentation value="The requester **SHALL** provide at least a code value and **MAY** provide both the system and code values.&#xA;&#xA;The responder **SHALL** support both.&#xa;&#xa;The requester **SHALL** support `multipleOr`.&#xa;&#xa;The responder **SHALL** support `multipleOr`."/>
+<documentation value="The requester **SHALL** provide at least a code value and **MAY** provide both the system and code values.&#xA;&#xA;The responder **SHALL** support both.&#xa;&#xa;The requester **SHOULD** support `multipleOr`.&#xa;&#xa;The responder **SHOULD** support `multipleOr`."/>
 </searchParam>
 <searchParam>
 <extension url="http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation">
diff --git a/input/resources/au-core-responder.xml b/input/resources/au-core-responder.xml
index d8cff592..f6d16607 100644
--- a/input/resources/au-core-responder.xml
+++ b/input/resources/au-core-responder.xml
@@ -717,8 +717,8 @@
   <div>
     <p>The requester <strong>SHALL</strong> provide at least a code value and <strong>MAY</strong> provide both the system and code values.</p>
     <p>The responder <strong>SHALL</strong> support both.</p>
-    <p>The requester <strong>SHALL</strong> support <code>multipleOr</code>.</p>
-    <p>The responder <strong>SHALL</strong> support <code>multipleOr</code>.</p>
+    <p>The requester <strong>SHOULD</strong> support <code>multipleOr</code>.</p>
+    <p>The responder <strong>SHOULD</strong> support <code>multipleOr</code>.</p>
   </div>
 </td>
 </tr>
@@ -866,6 +866,7 @@
 <blockquote>
 <div>
 <p>If the responder supports the Encounter resource, the responder <strong>SHALL</strong> support the AU Core profile and the conformance expectations for the Encounter resource.</p>
+<p>The Encounter resource can communicate the clinical indication using either a code in <code>Encounter.reasonCode</code> or a reference using <code>Encounter.reasonReference</code>. Although both <code>Encounter.reasonCode</code> and <code>Encounter.reasonReference</code> are marked as Must Support, a responder is not required to support both but <strong>SHALL</strong> support at least one of these elements. The requester <strong>SHALL</strong> support both elements.</p>
 </div>
 </blockquote>
 </div>
@@ -1517,6 +1518,8 @@
 <blockquote>
 <div>
 <p>If the responder supports the MedicationRequest resource, the responder <strong>SHALL</strong> support the AU Core profile and the conformance expectations for the MedicationRequest resource.</p>
+<p>The MedicationRequest resources can represent a medication using either a code or refer to the Medication resource. When referencing Medication, the resource may be <a href="http://hl7.org/fhir/R4/references.html#contained">contained</a> or an external resource. The responder <strong>MAY</strong> choose any one way or more than one method, but if an external reference to Medication is used, the responder <strong>SHALL</strong> support the <code>_include</code> parameter for searching this element. The requester application <strong>SHALL</strong> support all methods.</p>
+<p>The MedicationRequest resource can communicate the clinical indication using either a code in <code>MedicationRequest.reasonCode</code> or a reference using <code>MedicationRequest.reasonReference</code>. Although both <code>MedicationRequest.reasonCode</code> and <code>MedicationRequest.reasonReference</code> are marked as Must Support, a responder is not required to support both but <strong>SHALL</strong> support at least one of these elements. The requester <strong>SHALL</strong> support both elements.</p>
 </div>
 </blockquote>
 </div>
@@ -1826,6 +1829,8 @@
   <div>
     <p>The requester <strong>SHALL</strong> provide at least a code value and <strong>MAY</strong> provide both the system and code values.</p>
     <p>The responder <strong>SHALL</strong> support both.</p>
+    <p>The requester <strong>SHALL</strong> support search using the category code defined in each profile supported.</p>
+    <p>The responder <strong>SHALL</strong> support search using the category code defined in each profile supported.</p>
   </div>
 </td>
 </tr>
@@ -1843,6 +1848,8 @@
   <div>
     <p>The requester <strong>SHALL</strong> provide at least a code value and <strong>MAY</strong> provide both the system and code values.</p>
     <p>The responder <strong>SHALL</strong> support both.</p>
+    <p>The requester <strong>SHALL</strong> support search using the LOINC codes defined in each profile supported.</p>
+    <p>The responder <strong>SHALL</strong> support search using the LOINC codes defined in each profile supported.</p>
     <p>The requester <strong>SHALL</strong> support <code>multipleOr</code>.</p>
     <p>The responder <strong>SHALL</strong> support <code>multipleOr</code>.</p>
   </div>
@@ -2585,8 +2592,8 @@
   <div>
     <p>The requester <strong>SHALL</strong> provide at least a code value and <strong>SHOULD</strong> provide both the system and code values.</p>
     <p>The responder <strong>SHALL</strong> support both.</p>
-    <p>The requester <strong>SHOULD</strong> support search using a HPI-I identifier as defined in the AU Core Practitioner profile.</p>
-    <p>The responder <strong>SHOULD</strong> support search using a HPI-I identifier as defined in the AU Core Practitioner profile.</p>
+    <p>The requester <strong>SHOULD</strong> support search using a Medicare Provider Number identifier as defined in the profile.</p>
+    <p>The responder <strong>SHOULD</strong> support search using a Medicare Provider Number identifier as defined in the profile.</p>
   </div>
 </td>
 </tr>
@@ -2689,6 +2696,7 @@
 <blockquote>
 <div>
 <p>If the responder supports the Procedure resource, the responder <strong>SHALL</strong> support the AU Core profile and the conformance expectations for the Procedure resource.</p>
+<p>The Procedure resource can communicate the clinical indication using either a code in <code>Procedure.reasonCode</code> or a reference using <code>Procedure.reasonReference</code>. Although both <code>Procedure.reasonCode</code> and <code>Procedure.reasonReference</code> are marked as Must Support, a responder is not required to support both but <strong>SHALL</strong> support at least one of these elements. The requester <strong>SHALL</strong> support both elements.</p>
 </div>
 </blockquote>
 </div>
@@ -2756,8 +2764,8 @@
   <div>
     <p>The requester <strong>SHALL</strong> provide at least a code value and <strong>MAY</strong> provide both the system and code values.</p>
     <p>The responder <strong>SHALL</strong> support both.</p>
-    <p>The requester <strong>SHALL</strong> support <code>multipleOr</code>.</p>
-    <p>The responder <strong>SHALL</strong> support <code>multipleOr</code>.</p>
+    <p>The requester <strong>SHOULD</strong> support <code>multipleOr</code>.</p>
+    <p>The responder <strong>SHOULD</strong> support <code>multipleOr</code>.</p>
   </div>
 </td>
 </tr>
@@ -3134,7 +3142,7 @@
 <name value="code"/>
 <definition value="http://hl7.org/fhir/SearchParameter/clinical-code"/>
 <type value="token"/>
-<documentation value="The requester **SHALL** provide at least a code value and **MAY** provide both the system and code values.&#xA;&#xA;The responder **SHALL** support both.&#xa;&#xa;The requester **SHALL** support `multipleOr`.&#xa;&#xa;The responder **SHALL** support `multipleOr`."/>
+<documentation value="The requester **SHALL** provide at least a code value and **MAY** provide both the system and code values.&#xA;&#xA;The responder **SHALL** support both.&#xa;&#xa;The requester **SHOULD** support `multipleOr`.&#xa;&#xa;The responder **SHOULD** support `multipleOr`."/>
 </searchParam>
 <searchParam>
 <extension url="http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation">
@@ -3205,7 +3213,7 @@
 </extension>
 <type value="Encounter"/>
 <profile value="http://hl7.org.au/fhir/core/StructureDefinition/au-core-encounter"/>
-<documentation value="If the responder supports the Encounter resource, the responder **SHALL** support the AU Core profile and the conformance expectations for the Encounter resource."/>
+<documentation value="If the responder supports the Encounter resource, the responder **SHALL** support the AU Core profile and the conformance expectations for the Encounter resource.&#xA;&#xA;The Encounter resource can communicate the clinical indication using either a code in `Encounter.reasonCode` or a reference using `Encounter.reasonReference`. Although both `Encounter.reasonCode` and `Encounter.reasonReference` are marked as Must Support, a responder is not required to support both but **SHALL** support at least one of these elements. The requester**SHALL** support both elements."/>
 <interaction>
 <extension url="http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation">
 <valueCode value="SHALL"/>
@@ -3651,7 +3659,7 @@
 </extension>
 <type value="MedicationRequest"/>
 <profile value="http://hl7.org.au/fhir/core/StructureDefinition/au-core-medicationrequest"/>
-<documentation value="MedicationRequest resources can represent a medication using either a code or refer to the Medication resource. When referencing Medication, the resource may be [contained](http://hl7.org/fhir/R4/references.html#contained) or an external resource. The responder **MAY** choose any one way or more than one method, but if an external reference to Medication is used, the responder **SHALL** support the `_include` parameter for searching this element. The requester application **SHALL** support all methods.&#xA;&#xA;If the responder supports the MedicationRequest resource, the responder **SHALL** support the AU Core profile and the conformance expectations for the MedicationRequest resource."/>
+<documentation value="MedicationRequest resources can represent a medication using either a code or refer to the Medication resource. When referencing Medication, the resource may be [contained](http://hl7.org/fhir/R4/references.html#contained) or an external resource. The responder **MAY** choose any one way or more than one method, but if an external reference to Medication is used, the responder **SHALL** support the `_include` parameter for searching this element. The requester application **SHALL** support all methods.&#xA;&#xA;If the requester supports the MedicationRequest resource, the responder **SHALL** support the AU Core profile and the conformance expectations for the MedicationRequest resource.&#xA;&#xA;The MedicationRequest resources can represent a medication using either a code or refer to the Medication resource. When referencing Medication, the resource may be [contained](http://hl7.org/fhir/R4/references.html#contained)> or an external resource. The responder **MAY** choose any one way or more than one method, but if an external reference to Medication is used, the responder **SHALL** support the `_include` parameter for searching this element. The requester application **SHALL** support all methods.&#xA;&#xA;The MedicationRequest resource can communicate the clinical indication using either a code in `MedicationRequest.reasonCode` or a reference using `MedicationRequest.reasonReference`. Although both `MedicationRequest.reasonCode` and `MedicationRequest.reasonReference` are marked as Must Support, a responder is not required to support both but **SHALL** support at least one of these elements. The requester**SHALL** support both elements."/>
 <interaction>
 <extension url="http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation">
 <valueCode value="SHALL"/>
@@ -3932,7 +3940,7 @@
 <name value="category"/>
 <definition value="http://hl7.org/fhir/SearchParameter/Observation-category"/>
 <type value="token"/>
-<documentation value="The requester **SHALL** provide at least a code value and **MAY** provide both the system and code values.&#xA;&#xA;The responder **SHALL** support both."/>
+<documentation value="The requester **SHALL** provide at least a code value and **MAY** provide both the system and code values.&#xA;&#xA;The responder **SHALL** support both.&#xA;&#xA;The requester **SHALL** support search using the category code defined in each profile supported.&#xa;&#xa;The responder **SHALL** support search using the category code defined in each profile supported."/>
 </searchParam>
 <searchParam>
 <extension url="http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation">
@@ -3941,7 +3949,7 @@
 <name value="code"/>
 <definition value="http://hl7.org/fhir/SearchParameter/clinical-code"/>
 <type value="token"/>
-<documentation value="The requester **SHALL** provide at least a code value and **MAY** provide both the system and code values.&#xA;&#xA;The responder **SHALL** support both.&#xa;&#xa;The requester **SHALL** support `multipleOr`.&#xa;&#xa;The responder **SHALL** support `multipleOr`."/>
+<documentation value="The requester **SHALL** provide at least a code value and **MAY** provide both the system and code values.&#xA;&#xA;The responder **SHALL** support both.&#xa;&#xa;The requester **SHALL** support `multipleOr`.&#xa;&#xa;The responder **SHALL** support `multipleOr`.&#xa;&#xa;The requester **SHALL** support search using the LOINC codes defined in each profile supported.&#xa;&#xa;The responder **SHALL** support search using the LOINC codes defined in each profile supported."/>
 </searchParam>
 <searchParam>
 <extension url="http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation">
@@ -4474,7 +4482,7 @@
 </extension>
 <type value="Procedure"/>
 <profile value="http://hl7.org.au/fhir/core/StructureDefinition/au-core-procedure"/>
-<documentation value="If the responder supports the Procedure resource, the responder **SHALL** support the AU Core profile and the conformance expectations for the Procedure resource."/>
+<documentation value="If the responder supports the Procedure resource, the responder **SHALL** support the AU Core profile and the conformance expectations for the Procedure resource.&#xA;&#xA;The Procedure resource can communicate the clinical indication using either a code in `Procedure.reasonCode` or a reference using `Procedure.reasonReference`. Although both `Procedure.reasonCode` and `Procedure.reasonReference` are marked as Must Support, a responder is not required to support both but **SHALL** support at least one of these elements. The requester**SHALL** support both elements."/>
 <interaction>
 <extension url="http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation">
 <valueCode value="SHALL"/>
@@ -4535,7 +4543,7 @@
 <name value="code"/>
 <definition value="http://hl7.org/fhir/SearchParameter/clinical-code"/>
 <type value="token"/>
-<documentation value="The requester **SHALL** provide at least a code value and **MAY** provide both the system and code values.&#xA;&#xA;The responder **SHALL** support both.&#xa;&#xa;The requester **SHALL** support `multipleOr`.&#xa;&#xa;The responder **SHALL** support `multipleOr`."/>
+<documentation value="The requester **SHALL** provide at least a code value and **MAY** provide both the system and code values.&#xA;&#xA;The responder **SHALL** support both.&#xa;&#xa;The requester **SHOULD** support `multipleOr`.&#xa;&#xa;The responder **SHOULD** support `multipleOr`."/>
 </searchParam>
 <searchParam>
 <extension url="http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation">