Updates based on feedback review.

Author: msjasteppe

articles/healthcare-apis/iot/how-to-use-calculatedcontent-templates.md

@@ -5,7 +5,7 @@ author: msjasteppe
 ms.service: healthcare-apis
 ms.subservice: fhir
 ms.topic: how-to
-ms.date: 07/10/2023
+ms.date: 07/20/2023
 ms.author: jasteppe
 ---
 
@@ -206,7 +206,7 @@ The resulting normalized message will look like this after the normalization sta
 
 In this article, you learned how to use CalculatedContent templates with the MedTech service device mapping.
 
-To learn how to use the MedTech service custom functions, see:
+To learn how to use the MedTech service custom functions, see
 
 > [!div class="nextstepaction"]
 > [How to use custom functions with the MedTech service device mapping](how-to-use-custom-functions.md)

articles/healthcare-apis/iot/how-to-use-iotjsonpathcontent-templates.md

@@ -5,7 +5,7 @@ author: msjasteppe
 ms.service: healthcare-apis
 ms.subservice: fhir
 ms.topic: how-to
-ms.date: 07/10/2023
+ms.date: 07/20/2023
 ms.author: jasteppe
 ---
 
@@ -42,9 +42,6 @@ In the following example, `typeMatchExpression` is defined as:
 }
 ``` 
 
-> [!IMPORTANT]
-> The MedTech service will use the device ID defined in IoT hub as the FHIR resource device identifier. If the MedTech service is set up to use an identity resolution type of **Lookup**, a Device resource with a matching device identifier **must** exist in the FHIR service or an error will occur when the device message is processed. If the MedTech service's identity resolution type is set to **Create**, a `patientIdExpression` must be included in the device mapping so that a new Patient resource and Device resource can be created if they do not already exist.
-
 If your MedTech service is set up to ingest device messages from an IoT hub, you aren't required to use IotJsonPathContent templates. CalculatedContent templates can be used assuming that you correctly define the DeviceIdExpression and TimestampExpression.
 
 The IotJsonPathContent templates allow matching on and extracting values from a device message read from an Azure Event Hubs event hub through the following expressions:
@@ -57,6 +54,9 @@ The IotJsonPathContent templates allow matching on and extracting values from a
 |correlationIdExpression|*Optional*: The expression to extract the correlation identifier. You can use this output to group values into a single observation in the FHIR destination mapping.|`$.Body.correlationId`|
 |values[].valueExpression|The expression to extract the wanted value.|`$.Body.heartRate`|
 
+> [!IMPORTANT]
+> The MedTech service will use the device ID defined in IoT hub as the FHIR resource device identifier. If the MedTech service is set up to use an identity resolution type of **Lookup**, a Device resource with a matching device identifier **must** exist in the FHIR service or an error will occur when the device message is processed. If the MedTech service's identity resolution type is set to **Create**, a `patientIdExpression` must be included in the device mapping so that a new Patient resource and Device resource can be created if they do not already exist.
+
 > [!NOTE]
 > The **Resolution type** specifies how the MedTech service associates device data with Device resources and Patient resources. The MedTech service reads Device and Patient resources from the FHIR service using [device identifiers](https://www.hl7.org/fhir/r4/device-definitions.html#Device.identifier) and [patient identifiers](https://www.hl7.org/fhir/r4/patient-definitions.html#Patient.identifier). If an [encounter identifier](https://hl7.org/fhir/r4/encounter-definitions.html#Encounter.identifier) is specified and extracted from the device data payload, it's linked to the observation if an encounter exists on the FHIR service with that identifier.  If the [encounter identifier](../../healthcare-apis/release-notes.md#medtech-service) is successfully normalized, but no FHIR Encounter exists with that encounter identifier, a **FhirResourceNotFound** exception is thrown. For more information on configuring the MedTech service **Resolution type**, see [Configure the Destination tab](deploy-manual-portal.md#configure-the-destination-tab).
 
@@ -138,9 +138,6 @@ We're using this device mapping for the normalization stage:
 }
 ```
 
-> [!NOTE]
-> The MedTech service evaluates `typeMatchExpression` against the incoming device data payload. If the service finds a matching token value, it considers the template a match.
-
 The resulting normalized message will look like this after the normalization stage:
 
 ```json