Add Swiss Validation profiles for Practitioner/PractitionerRole + samples

411e4710 · Vincent Hofman · 3ad57d76 · 411e4710 · 411e4710 · 411e4710
Commit 411e4710 authored 11 months ago by Vincent Hofman
--- a/EHS/CH_mCSD/CH-ITI-90-Practitioner-GetRequest-ValidationProfile.json
+++ b/EHS/CH_mCSD/CH-ITI-90-Practitioner-GetRequest-ValidationProfile.json
 {
-    "profileType": "HTTPREQUEST",
+  "profileType": "HTTPREQUEST",
-    "id": "CH_ITI-90_Practitioner_GET_mCSD_Query",
+  "id": "CH_ITI-90_Practitioner_GET_mCSD_Query",
-    "name": "CH_ITI-90_Practitioner_HTTP_GET_Request",
+  "name": "CH_ITI-90_Practitioner_HTTP_GET_Request",
-    "description": "Validation Profile for validating a Get mCSD Query.",
+  "description": "Validation Profile for validating a Get mCSD Query.",
-    "context": "EPR",
+  "context": "EPR",
-    "assertions": [
+  "assertions": [
-      {
+    {
-          "selector": "request.method",
+      "selector": "request.method",
-          "id": "GETMethodChecking",
+      "id": "GETMethodChecking",
-          "description": "HTTP method shall be GET",
+      "description": "HTTP method shall be GET or POST",
-          "requirementPriority": "MANDATORY",
+      "requirementPriority": "MANDATORY",
-          "checksComposition": "oneOf",
+      "checksComposition": "oneOf",
-          "checks": [
+      "checks": [
-              {
+        {
-                  "type": "FIXEDVALUE",
+          "type": "CLOSEDLIST",
-                  "fixedValue": "GET"
+          "values": [
-              }
+            "GET",
-          ]
+            "POST"
-      },
-      {
-          "selector": "request.version",
-          "id": "HTTP1VersionChecking",
-          "description": "The HTTP version shall be HTTP/1.1",
-          "requirementPriority": "MANDATORY",
-          "checksComposition": "oneOf",
-          "checks": [
-            {
-              "type": "FIXEDVALUE",
-              "fixedValue": "HTTP/1.1"
-            }
          ]
-        },
+        }
+      ]
+    },
+    {
+      "selector": "request.version",
+      "id": "HTTP1VersionChecking",
+      "description": "The HTTP version shall be HTTP/1.1",
+      "requirementPriority": "MANDATORY",
+      "checksComposition": "oneOf",
+      "checks": [
        {
-            "selector": "request.uri.path",
+          "type": "FIXEDVALUE",
-            "id": "URIRegexChecking",
+          "fixedValue": "HTTP/1.1"
-            "description": "URI path of the request shall be followed by the mCSD resource",
+        }
-            "requirementPriority": "MANDATORY",
+      ]
-            "checksComposition": "oneOf",
+    },
-            "checks": [
+    {
-                {
+      "selector": "request.uri.path",
-                    "type": "REGEX",
+      "id": "URIRegexChecking",
-                    "regex": "^(\\S)+(Organization|Practitioner|PractitionerRole|Location|HealthcareService|OrganizationAffiliation|Endpoint)$"
+      "description": "URI path of the request shall be followed by the mCSD resource",
-                }
+      "requirementPriority": "MANDATORY",
-            ]
+      "checksComposition": "oneOf",
-        },
+      "checks": [
        {
-          "selector": "request.headers('Host').values",
+          "type": "REGEX",
-          "id": "HostChecking",
+          "regex": "^(\\S)+Practitioner$"
-          "description": "Host Shall be a server name; Regex: ^(http[s]?:\\/\\/)?[a-zA-Z0-9.\\-\\/]+(:(\\d)+)?$",
+        }
-          "requirementPriority": "MANDATORY",
+      ]
-          "checksComposition": "oneOf",
+    },
-          "checks": [
+    {
-            {
+      "selector": "request.headers('Host').values",
-              "type": "REGEX",
+      "id": "HostChecking",
-              "regex": "^(http[s]?:\\/\\/)?[a-zA-Z0-9.\\-\\/]+(:(\\d)+)?$"
+      "description": "Host Shall be a server name; Regex: ^(http[s]?:\\/\\/)?[a-zA-Z0-9.\\-\\/]+(:(\\d)+)?$",
-            }
+      "requirementPriority": "MANDATORY",
-          ]
+      "checksComposition": "oneOf",
-        },
+      "checks": [
        {
-          "selector": "request.headers('Authorization').values",
+          "type": "REGEX",
-          "id": "Authorization_parameter_presence",
+          "regex": "^(http[s]?:\\/\\/)?[a-zA-Z0-9.\\-\\/]+(:(\\d)+)?$"
-          "description": "The Authorization parameter is mandatory.",
+        }
-          "requirementPriority": "MANDATORY",
+      ]
-          "checksComposition": "oneOf",
+    },
-          "checks": [
+    {
-            {
+      "selector": "request.headers('Authorization').values",
-              "type": "OCCURRENCE",
+      "id": "Authorization_parameter_presence",
-              "minOccurrence": 1,
+      "description": "The Authorization parameter is mandatory.",
-              "maxOccurrence": 1
+      "requirementPriority": "MANDATORY",
-            }
+      "checksComposition": "oneOf",
-          ]
+      "checks": [
-        },
        {
-          "selector": "request.headers('Authorization').values",
+          "type": "OCCURRENCE",
-          "id": "Authorization_parameter_value",
+          "minOccurrence": 1,
-          "description": "Authorization parameter's value SHALL be Bearer, followed by the token.",
+          "maxOccurrence": 1
-          "requirementPriority": "MANDATORY",
+        }
-          "checksComposition": "oneOf",
+      ]
-          "checks": [
+    },
-            {
+    {
-              "type": "REGEX",
+      "selector": "request.headers('Authorization').values",
-              "regex": "^Bearer\\ [-a-zA-Z0-9._~+\\/]+=*$"
+      "id": "Authorization_parameter_value",
-            }
+      "description": "Authorization parameter's value SHALL be Bearer, followed by the token.",
-          ]
+      "requirementPriority": "MANDATORY",
-        },{
+      "checksComposition": "oneOf",
-          "selector": "request.headers('traceparent').values",
+      "checks": [
-          "id": "traceparent_parameter_presence",
-          "description": "The traceparent parameter is mandatory in the HTTP header.",
-          "requirementPriority": "MANDATORY",
-          "checksComposition": "oneOf",
-          "checks": [
-            {
-              "type": "OCCURRENCE",
-              "minOccurrence": 1,
-              "maxOccurrence": 1
-            }
-          ]
-        },
        {
-          "selector": "request.headers('traceparent').values",
+          "type": "REGEX",
-          "id": "traceparent_parameter_value",
+          "regex": "^Bearer\\ [-a-zA-Z0-9._~+\\/]+=*$"
-          "description": "traceparent parameter's value SHALL be as defined in fhir.ch, section tracecontext.",
+        }
-          "requirementPriority": "MANDATORY",
+      ]
-          "checksComposition": "oneOf",
+    },
-          "checks": [
+    {
-            {
+      "selector": "request.headers('traceparent').values",
-              "type": "REGEX",
+      "id": "traceparent_parameter_presence",
-              "regex": "^(?!f{2})([\\da-f]{2})-(?!f{32})([\\daf]{32})-(?!f{16})([\\da-f]{16})-(?!f{2})([\\da-f]{2})$"
+      "description": "The traceparent parameter is mandatory in the HTTP header.",
-            }
+      "requirementPriority": "MANDATORY",
-          ]
+      "checksComposition": "oneOf",
-        },
+      "checks": [
        {
-          "selector": "request.uri.queryParams('_id').values",
+          "type": "OCCURRENCE",
-          "id": "_id_parameter_presence",
+          "minOccurrence": 1,
-          "description": "_id parameter can be used only once.",
+          "maxOccurrence": 1
-          "requirementPriority": "MANDATORY",
+        }
-          "checksComposition": "oneOf",
+      ]
-          "checks": [
+    },
-            {
+    {
-              "type": "REGEX",
+      "selector": "request.headers('traceparent').values",
-              "regex": "(?!.*_id=.*_id=).*$"
+      "id": "traceparent_parameter_value",
-            }
+      "description": "traceparent parameter's value SHALL be as defined in fhir.ch, section tracecontext.",
-          ]
+      "requirementPriority": "MANDATORY",
-        },
+      "checksComposition": "oneOf",
+      "checks": [
        {
-          "selector": "request.uri.queryParams('_id').values",
+          "type": "REGEX",
-          "id": "_id_parameter_value",
+          "regex": "^(?!f{2})([\\da-f]{2})-(?!f{32})([\\da-f]{32})-(?!f{16})([\\da-f]{16})-(?!f{2})([\\da-f]{2})$"
-          "description": "_id parameter is a token.",
+        }
-          "requirementPriority": "MANDATORY",
+      ]
-          "checksComposition": "oneOf",
+    },
-          "applyIf": "request.uri.queryParams('_id').values.size() > 0",
+    {
-          "checks": [
+      "selector": "request.uri.queryParams('_id').values",
-            {
+      "id": "_id_parameter_presence",
-              "type": "REGEX",
+      "description": "_id parameter can be used only once.",
-              "regex": "^\\S+$"
+      "requirementPriority": "MANDATORY",
-            }
+      "checksComposition": "oneOf",
-          ]
+      "checks": [
-        },
        {
-          "selector": "request.uri.queryParams('_lastUpdated')",
+          "type": "OCCURRENCE",
-          "id": "_lastUpdated_parameter_presence",
+          "minOccurrence": 0,
-          "description": "_lastUpdated parameter can be used only once.",
+          "maxOccurrence": 1
-          "requirementPriority": "MANDATORY",
+        }
-          "checksComposition": "oneOf",
+      ]
-          "checks": [
+    },
-            {
+    {
-              "type": "REGEX",
+      "selector": "request.uri.queryParams('_id').values",
-              "regex": "^(?!.*_lastUpdated=.*_lastUpdated=).*$"
+      "id": "_id_parameter_value",
-            }
+      "description": "_id parameter is a token.",
-          ]
+      "requirementPriority": "MANDATORY",
-        },
+      "checksComposition": "oneOf",
+      "applyIf": "request.uri.queryParams('_id').values.size() > 0",
+      "checks": [
        {
-          "selector": "request.uri.queryParams('_lastUpdated').values",
+          "type": "REGEX",
-          "id": "_lastUpdated_parameter_value",
+          "regex": "^\\S+$"
-          "description": "_lastUpdated parameter is made of a date eventually preceded by a modifier ge or le.",
+        }
-          "requirementPriority": "MANDATORY",
+      ]
-          "checksComposition": "oneOf",
+    },
-          "applyIf": "request.uri.queryParams('_lastUpdated').values.size() > 0",
+    {
-          "checks": [
+      "selector": "request.uri.queryParams('_lastUpdated').values",
-            {
+      "id": "_lastUpdated_parameter_presence",
-              "type": "REGEX",
+      "description": "_lastUpdated parameter can be used only once.",
-              "regex": "^(ge|le)?[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|1d|2[0-8]|3[01])$"
+      "requirementPriority": "MANDATORY",
-            }
+      "checksComposition": "oneOf",
-          ]
+      "checks": [
-        },
        {
-          "selector": "request.uri.queryParams('_format').values",
+          "type": "OCCURRENCE",
-          "id": "_format_parameter_presence",
+          "minOccurrence": 0,
-          "description": "_format parameter can be used only once.",
+          "maxOccurrence": 1
-          "requirementPriority": "MANDATORY",
+        }
-          "checksComposition": "oneOf",
+      ]
-          "checks": [
+    },
-            {
+    {
-              "type": "REGEX",
+      "selector": "request.uri.queryParams('_lastUpdated').values",
-              "regex": "(?!.*_format=.*_format=).*$"
+      "id": "_lastUpdated_parameter_value",
-            }
+      "description": "_lastUpdated parameter is made of a date eventually preceded by a modifier ge or le.",
-          ]
+      "requirementPriority": "MANDATORY",
-        },
+      "checksComposition": "oneOf",
+      "applyIf": "request.uri.queryParams('_lastUpdated').values.size() > 0",
+      "checks": [
        {
-          "selector": "request.uri.queryParams('_format').values",
+          "type": "REGEX",
-          "id": "_format_parameter_value",
+          "regex": "^(ge|le)?[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|1d|2[0-8]|3[01])$"
-          "description": "_format parameter's value shall be either json or xml.",
+        }
-          "requirementPriority": "MANDATORY",
+      ]
-          "checksComposition": "oneOf",
+    },
-          "applyIf": "request.uri.queryParams('_format').values.size() > 0",
+    {
-          "checks": [
+      "selector": "request.uri.queryParams('_format').values",
-            {
+      "id": "_format_parameter_presence",
-              "type": "CLOSEDLIST",
+      "description": "_format parameter can be used only once.",
-              "values": [
+      "requirementPriority": "MANDATORY",
-                  "json",
+      "checksComposition": "oneOf",
-                  "xml"
+      "checks": [
-              ]
-            }
-          ]
-        },
        {
-          "selector": "request.uri.queryParams('_sort').values",
+          "type": "OCCURRENCE",
-          "id": "_sort_parameter_presence",
+          "minOccurrence": 0,
-          "description": "_sort parameter can be used only once.",
+          "maxOccurrence": 1
-          "requirementPriority": "MANDATORY",
+        }
-          "checksComposition": "oneOf",
+      ]
-          "checks": [
+    },
-            {
+    {
-              "type": "REGEX",
+      "selector": "request.uri.queryParams('_format').values",
-              "regex": "^(?!.*_sort=.*_sort=).*$"
+      "id": "_format_parameter_value",
-            }
+      "description": "_format parameter's value shall be either json or xml.",
-          ]
+      "requirementPriority": "MANDATORY",
-        },
+      "checksComposition": "oneOf",
+      "applyIf": "request.uri.queryParams('_format').values.size() > 0",
+      "checks": [
        {
-          "selector": "request.uri.queryParams('_sort').values",
+          "type": "CLOSEDLIST",
-          "id": "_sort_parameter_value",
+          "values": [
-          "description": "_sort parameter's value is made of items composed of word caracters, separated by a comma and eventually prefixed by a dash.",
+            "json",
-          "requirementPriority": "MANDATORY",
+            "xml"
-          "checksComposition": "oneOf",
-          "applyIf": "request.uri.queryParams('_sort').values.size() > 0",
-          "checks": [
-            {
-              "type": "REGEX",
-              "regex": "([\\w,]|(-\\w))+$"
-            }
          ]
-        },
+        }
+      ]
+    },
+    {
+      "selector": "request.uri.queryParams('_sort').values",
+      "id": "_sort_parameter_presence",
+      "description": "_sort parameter can be used only once.",
+      "requirementPriority": "MANDATORY",
+      "checksComposition": "oneOf",
+      "checks": [
        {
-          "selector": "request.uri.queryParams('_count').values",
+          "type": "OCCURRENCE",
-          "id": "_count parameter can be used only once.",
+          "minOccurrence": 0,
-          "description": "_count parameter is a decimal.",
+          "maxOccurrence": 1
-          "requirementPriority": "MANDATORY",
+        }
-          "checksComposition": "oneOf",
+      ]
-          "checks": [
+    },
-            {
+    {
-              "type": "REGEX",
+      "selector": "request.uri.queryParams('_sort').values",
-              "regex": "^(?!.*_count=.*_count=).*$"
+      "id": "_sort_parameter_value",
-            }
+      "description": "_sort parameter's value is made of items composed of word caracters, separated by a comma and eventually prefixed by a dash.",
-          ]
+      "requirementPriority": "MANDATORY",
-        },
+      "checksComposition": "oneOf",
+      "applyIf": "request.uri.queryParams('_sort').values.size() > 0",
+      "checks": [
        {
-          "selector": "request.uri.queryParams('_count').values",
+          "type": "REGEX",
-          "id": "_count_parameter_value",
+          "regex": "^([\\w,]|(-\\w))+$"
-          "description": "_count parameter is a decimal.",
+        }
-          "requirementPriority": "MANDATORY",
+      ]
-          "checksComposition": "oneOf",
+    },
-          "applyIf": "request.uri.queryParams('_count').values.size() > 0",
+    {
-          "checks": [
+      "selector": "request.uri.queryParams('_count').values",
-            {
+      "id": "_count_parameter_presence",
-              "type": "REGEX",
+      "description": "_count parameter can be used only once..",
-              "regex": "\\d+$"
+      "requirementPriority": "MANDATORY",
-            }
+      "checksComposition": "oneOf",
-          ]
+      "checks": [
-        },
        {
-          "selector": "request.uri.queryParams('active').values",
+          "type": "OCCURRENCE",
-          "id": "active_parameter_presence",
+          "minOccurrence": 0,
-          "description": "active parameter can be used only once.",
+          "maxOccurrence": 1
-          "requirementPriority": "MANDATORY",
+        }
-          "checksComposition": "oneOf",
+      ]
-          "checks": [
+    },
-            {
+    {
-              "type": "REGEX",
+      "selector": "request.uri.queryParams('_count').values",
-              "regex": "^(?!.*active=.*active=).*$"
+      "id": "_count_parameter_value",
-            }
+      "description": "_count parameter is a decimal.",
-          ]
+      "requirementPriority": "MANDATORY",
-        },
+      "checksComposition": "oneOf",
+      "applyIf": "request.uri.queryParams('_count').values.size() > 0",
+      "checks": [
        {
-          "selector": "request.uri.queryParams('active').values",
+          "type": "REGEX",
-          "id": "active_parameter_value",
+          "regex": "\\d+$"
-          "description": "active parameter is a boolean and accept true or false values.",
+        }
-          "requirementPriority": "MANDATORY",
+      ]
-          "checksComposition": "oneOf",
+    },
-          "applyIf": "request.uri.queryParams('active').values.size() > 0",
+    {
-          "checks": [
+      "selector": "request.uri.queryParams('active').values",
-            {
+      "id": "active_parameter_presence",
-              "type": "CLOSEDLIST",
+      "description": "active parameter can be used only once.",
-              "values": [
+      "requirementPriority": "MANDATORY",
-                  "true",
+      "checksComposition": "oneOf",
-                  "false"
+      "checks": [
-              ]
-            }
-          ]
-        },
        {
-          "selector": "request.uri.queryParams('identifier').values",
+          "type": "OCCURRENCE",
-          "id": "identifier_parameter_presence",
+          "minOccurrence": 0,
-          "description": "identifier parameter can be used only once.",
+          "maxOccurrence": 1
-          "requirementPriority": "MANDATORY",
+        }
-          "checksComposition": "oneOf",
+      ]
-          "checks": [
+    },
-            {
+    {
-              "type": "REGEX",
+      "selector": "request.uri.queryParams('active').values",
-              "regex": "^(?!.*identifier=.*identifier=).*$"
+      "id": "active_parameter_value",
-            }
+      "description": "active parameter is a boolean and accept true or false values.",
-          ]
+      "requirementPriority": "MANDATORY",
-        },
+      "checksComposition": "oneOf",
+      "applyIf": "request.uri.queryParams('active').values.size() > 0",
+      "checks": [
        {
-          "selector": "request.uri.queryParams('identifier').values",
+          "type": "CLOSEDLIST",
-          "id": "identifier_parameter_value",
+          "values": [
-          "description": "identifier parameter is a token.",
+            "true",
-          "requirementPriority": "MANDATORY",
+            "false"
-          "checksComposition": "oneOf",
-          "applyIf": "request.uri.queryParams('identifier').values.size() > 0",
-          "checks": [
-            {
-              "type": "REGEX",
-              "regex": "^\\S+$"
-            }
          ]
-        },
+        }
+      ]
+    },
+    {
+      "selector": "request.uri.queryParams('identifier').values",
+      "id": "identifier_parameter_presence",
+      "description": "identifier parameter can be used only once.",
+      "requirementPriority": "MANDATORY",
+      "checksComposition": "oneOf",
+      "checks": [
        {
-          "selector": "request.uri.queryParams('name').values",
+          "type": "OCCURRENCE",
-          "id": "name_parameter_presence",
+          "minOccurrence": 0,
-          "description": "name parameter can be used only once, eventually suffixed by a modifier :contains or :exact.",
+          "maxOccurrence": 1
-          "requirementPriority": "MANDATORY",
+        }
-          "checksComposition": "oneOf",
+      ]
-          "checks": [
+    },
-            {
+    {
-              "type": "REGEX",
+      "selector": "request.uri.queryParams('identifier').values",
-              "regex": "^(?!.*name(:contains|:exact)?=.*name(:contains|:exact)?=).*$"
+      "id": "identifier_parameter_value",
-            }
+      "description": "identifier parameter is a token.",
-          ]
+      "requirementPriority": "MANDATORY",
-        },
+      "checksComposition": "oneOf",
+      "applyIf": "request.uri.queryParams('identifier').values.size() > 0",
+      "checks": [
        {
-          "selector": "request.uri.queryParams('name').values",
+          "type": "REGEX",
-          "id": "name_parameter_value",
+          "regex": "^\\S+$"
-          "description": "name parameter is a string.",
+        }
-          "requirementPriority": "MANDATORY",
+      ]
-          "checksComposition": "oneOf",
+    },
-          "applyIf": "request.uri.queryParams('name').values.size() > 0",
+    {
-          "checks": [
+      "selector": "request.uri.queryParams('name').values",
-            {
+      "id": "name_parameter_presence",
-              "type": "REGEX",
+      "description": "name parameter can be used only once.",
-              "regex": "^.+$"
+      "requirementPriority": "MANDATORY",
-            }
+      "checksComposition": "oneOf",
-          ]
+      "checks": [
-        },
        {
-          "selector": "request.uri.queryParams('given').values",
+          "type": "OCCURRENCE",
-          "id": "given_parameter_presence",
+          "minOccurrence": 0,
-          "description": "given parameter can be used only once, eventually suffixed by a modifier :contains or :exact.",
+          "maxOccurrence": 1
-          "requirementPriority": "MANDATORY",
+        }
-          "checksComposition": "oneOf",
+      ]
-          "checks": [
+    },
-            {
+    {
-              "type": "REGEX",
+      "selector": "request.uri.queryParams('name').values",
-              "regex": "^(?!.*given(:contains|:exact)?=.*given(:contains|:exact)?=).*$"
+      "id": "name_parameter_value",
-            }
+      "description": "name parameter is a string.",
-          ]
+      "requirementPriority": "MANDATORY",
-        },
+      "checksComposition": "oneOf",
+      "applyIf": "request.uri.queryParams('name').values.size() > 0",
+      "checks": [
        {
-          "selector": "request.uri.queryParams('given').values",
+          "type": "REGEX",
-          "id": "given_parameter_value",
+          "regex": "^.+$"
-          "description": "given parameter is a string.",
+        }
-          "requirementPriority": "MANDATORY",
+      ]
-          "checksComposition": "oneOf",
+    },
-          "applyIf": "request.uri.queryParams('given').values.size() > 0",
+    {
-          "checks": [
+      "selector": "request.uri.queryParams('given').values",
-            {
+      "id": "given_parameter_presence",
-              "type": "REGEX",
+      "description": "given parameter can be used only once.",
-              "regex": "^.+$"
+      "requirementPriority": "MANDATORY",
-            }
+      "checksComposition": "oneOf",
-          ]
+      "checks": [
-        },
        {
-          "selector": "request.uri.queryParams('family').values",
+          "type": "OCCURRENCE",
-          "id": "family_parameter_presence",
+          "minOccurrence": 0,
-          "description": "family parameter can be used only once, eventually suffixed by a modifier :contains or :exact.",
+          "maxOccurrence": 1
-          "requirementPriority": "MANDATORY",
+        }
-          "checksComposition": "oneOf",
+      ]
-          "checks": [
+    },
-            {
+    {
-              "type": "REGEX",
+      "selector": "request.uri.queryParams('given').values",
-              "regex": "^(?!.*family(:contains|:exact)?=.*family(:contains|:exact)?=).*$"
+      "id": "given_parameter_value",
-            }
+      "description": "given parameter's value is made of items composed of string.",
-          ]
+      "requirementPriority": "MANDATORY",
-        },
+      "checksComposition": "oneOf",
+      "applyIf": "request.uri.queryParams('given').values.size() > 0",
+      "checks": [
        {
-          "selector": "request.uri.queryParams('family').values",
+          "type": "REGEX",
-          "id": "family_parameter_value",
+          "regex": "^[\\s\\S]+$"
-          "description": "family parameter is a string.",
+        }
-          "requirementPriority": "MANDATORY",
+      ]
-          "checksComposition": "oneOf",
+    },
-          "applyIf": "request.uri.queryParams('family').values.size() > 0",
+    {
-          "checks": [
+      "selector": "request.uri.queryParams('family').values",
-            {
+      "id": "family_parameter_presence",
-              "type": "REGEX",
+      "description": "family parameter can be used only once.",
-              "regex": "^.+$"
+      "requirementPriority": "MANDATORY",
-            }
+      "checksComposition": "oneOf",
-          ]
+      "checks": [
+        {
+          "type": "OCCURRENCE",
+          "minOccurrence": 0,
+          "maxOccurrence": 1
+        }
+      ]
+    },
+    {
+      "selector": "request.uri.queryParams('family').values",
+      "id": "family_parameter_value",
+      "description": "family parameter's value is made of items composed of string.",
+      "requirementPriority": "MANDATORY",
+      "checksComposition": "oneOf",
+      "applyIf": "request.uri.queryParams('family').values.size() > 0",
+      "checks": [
+        {
+          "type": "REGEX",
+          "regex": "^([\\w,]|(-\\w))+$"
        }
+      ]
+    }
  ]
 }
\ No newline at end of file
--- a/EHS/CH_mCSD/CH-ITI-90-PractitionerRole-GetRequest-ValidationProfile.json
+++ b/EHS/CH_mCSD/CH-ITI-90-PractitionerRole-GetRequest-ValidationProfile.json
 {
-    "profileType": "HTTPREQUEST",
+  "profileType": "HTTPREQUEST",
-    "id": "CH_ITI-90_PractitionerRole_GET_mCSD_Query",
+  "id": "CH_ITI-90_PractitionerRole_GET_mCSD_Query",
-    "name": "CH_ITI-90_PractitionerRole_HTTP_GET_Request",
+  "name": "CH_ITI-90_PractitionerRole_HTTP_GET_Request",
-    "description": "Validation Profile for validating a Get mCSD Query.",
+  "description": "Validation Profile for validating a Get mCSD Query.",
-    "context": "EPR",
+  "context": "EPR",
-    "assertions": [
+  "assertions": [
-      {
+    {
-          "selector": "request.method",
+      "selector": "request.method",
-          "id": "GETMethodChecking",
+      "id": "GETMethodChecking",
-          "description": "HTTP method shall be GET",
+      "description": "HTTP method shall be GET or POST",
-          "requirementPriority": "MANDATORY",
+      "requirementPriority": "MANDATORY",
-          "checksComposition": "oneOf",
+      "checksComposition": "oneOf",
-          "checks": [
+      "checks": [
-              {
+        {
-                  "type": "FIXEDVALUE",
+          "type": "CLOSEDLIST",
-                  "fixedValue": "GET"
+          "values": [
-              }
+            "GET",
-          ]
+            "POST"
-      },
-      {
-          "selector": "request.version",
-          "id": "HTTP1VersionChecking",
-          "description": "The HTTP version shall be HTTP/1.1",
-          "requirementPriority": "MANDATORY",
-          "checksComposition": "oneOf",
-          "checks": [
-            {
-              "type": "FIXEDVALUE",
-              "fixedValue": "HTTP/1.1"
-            }
          ]
-        },
+        }
+      ]
+    },
+    {
+      "selector": "request.version",
+      "id": "HTTP1VersionChecking",
+      "description": "The HTTP version shall be HTTP/1.1",
+      "requirementPriority": "MANDATORY",
+      "checksComposition": "oneOf",
+      "checks": [
        {
-            "selector": "request.uri.path",
+          "type": "FIXEDVALUE",
-            "id": "URIRegexChecking",
+          "fixedValue": "HTTP/1.1"
-            "description": "URI path of the request shall be followed by the mCSD resource",
+        }
-            "requirementPriority": "MANDATORY",
+      ]
-            "checksComposition": "oneOf",
+    },
-            "checks": [
+    {
-                {
+      "selector": "request.uri.path",
-                    "type": "REGEX",
+      "id": "URIRegexChecking",
-                    "regex": "^(\\S)+(Organization|Practitioner|PractitionerRole|Location|HealthcareService|OrganizationAffiliation|Endpoint)$"
+      "description": "URI path of the request shall be followed by the mCSD resource",
-                }
+      "requirementPriority": "MANDATORY",
-            ]
+      "checksComposition": "oneOf",
-        },
+      "checks": [
        {
-          "selector": "request.headers('Host').values",
+          "type": "REGEX",
-          "id": "HostChecking",
+          "regex": "^(\\S)+PractitionerRole$"
-          "description": "Host Shall be a server name; Regex: ^(http[s]?:\\/\\/)?[a-zA-Z0-9.\\-\\/]+(:(\\d)+)?$",
+        }
-          "requirementPriority": "MANDATORY",
+      ]
-          "checksComposition": "oneOf",
+    },
-          "checks": [
+    {
-            {
+      "selector": "request.headers('Host').values",
-              "type": "REGEX",
+      "id": "HostChecking",
-              "regex": "^(http[s]?:\\/\\/)?[a-zA-Z0-9.\\-\\/]+(:(\\d)+)?$"
+      "description": "Host Shall be a server name; Regex: ^(http[s]?:\\/\\/)?[a-zA-Z0-9.\\-\\/]+(:(\\d)+)?$",
-            }
+      "requirementPriority": "MANDATORY",
-          ]
+      "checksComposition": "oneOf",
-        },
+      "checks": [
        {
-          "selector": "request.headers('Authorization').values",
+          "type": "REGEX",
-          "id": "Authorization_parameter_presence",
+          "regex": "^(http[s]?:\\/\\/)?[a-zA-Z0-9.\\-\\/]+(:(\\d)+)?$"
-          "description": "The Authorization parameter is mandatory.",
+        }
-          "requirementPriority": "MANDATORY",
+      ]
-          "checksComposition": "oneOf",
+    },
-          "checks": [
+    {
-            {
+      "selector": "request.headers('Authorization').values",
-              "type": "OCCURRENCE",
+      "id": "Authorization_parameter_presence",
-              "minOccurrence": 1,
+      "description": "The Authorization parameter is mandatory.",
-              "maxOccurrence": 1
+      "requirementPriority": "MANDATORY",
-            }
+      "checksComposition": "oneOf",
-          ]
+      "checks": [
-        },
        {
-          "selector": "request.headers('Authorization').values",
+          "type": "OCCURRENCE",
-          "id": "Authorization_parameter_value",
+          "minOccurrence": 1,
-          "description": "Authorization parameter's value SHALL be Bearer, followed by the token.",
+          "maxOccurrence": 1
-          "requirementPriority": "MANDATORY",
+        }
-          "checksComposition": "oneOf",
+      ]
-          "checks": [
+    },
-            {
+    {
-              "type": "REGEX",
+      "selector": "request.headers('Authorization').values",
-              "regex": "^Bearer\\ [-a-zA-Z0-9._~+\\/]+=*$"
+      "id": "Authorization_parameter_value",
-            }
+      "description": "Authorization parameter's value SHALL be Bearer, followed by the token.",
-          ]
+      "requirementPriority": "MANDATORY",
-        },{
+      "checksComposition": "oneOf",
-          "selector": "request.headers('traceparent').values",
+      "checks": [
-          "id": "traceparent_parameter_presence",
-          "description": "The traceparent parameter is mandatory in the HTTP header.",
-          "requirementPriority": "MANDATORY",
-          "checksComposition": "oneOf",
-          "checks": [
-            {
-              "type": "OCCURRENCE",
-              "minOccurrence": 1,
-              "maxOccurrence": 1
-            }
-          ]
-        },
        {
-          "selector": "request.headers('traceparent').values",
+          "type": "REGEX",
-          "id": "traceparent_parameter_value",
+          "regex": "^Bearer\\ [-a-zA-Z0-9._~+\\/]+=*$"
-          "description": "traceparent parameter's value SHALL be as defined in fhir.ch, section tracecontext.",
+        }
-          "requirementPriority": "MANDATORY",
+      ]
-          "checksComposition": "oneOf",
+    },
-          "checks": [
+    {
-            {
+      "selector": "request.headers('traceparent').values",
-              "type": "REGEX",
+      "id": "traceparent_parameter_presence",
-              "regex": "^(?!f{2})([\\da-f]{2})-(?!f{32})([\\daf]{32})-(?!f{16})([\\da-f]{16})-(?!f{2})([\\da-f]{2})$"
+      "description": "The traceparent parameter is mandatory in the HTTP header.",
-            }
+      "requirementPriority": "MANDATORY",
-          ]
+      "checksComposition": "oneOf",
-        },
+      "checks": [
        {
-          "selector": "request.uri.queryParams('_id').values",
+          "type": "OCCURRENCE",
-          "id": "_id_parameter_presence",
+          "minOccurrence": 1,
-          "description": "_id parameter can be used only once.",
+          "maxOccurrence": 1
-          "requirementPriority": "MANDATORY",
+        }
-          "checksComposition": "oneOf",
+      ]
-          "checks": [
+    },
-            {
+    {
-              "type": "REGEX",
+      "selector": "request.headers('traceparent').values",
-              "regex": "(?!.*_id=.*_id=).*$"
+      "id": "traceparent_parameter_value",
-            }
+      "description": "traceparent parameter's value SHALL be as defined in fhir.ch, section tracecontext.",
-          ]
+      "requirementPriority": "MANDATORY",
-        },
+      "checksComposition": "oneOf",
+      "checks": [
        {
-          "selector": "request.uri.queryParams('_id').values",
+          "type": "REGEX",
-          "id": "_id_parameter_value",
+          "regex": "^(?!f{2})([\\da-f]{2})-(?!f{32})([\\da-f]{32})-(?!f{16})([\\da-f]{16})-(?!f{2})([\\da-f]{2})$"
-          "description": "_id parameter is a token.",
+        }
-          "requirementPriority": "MANDATORY",
+      ]
-          "checksComposition": "oneOf",
+    },
-          "applyIf": "request.uri.queryParams('_id').values.size() > 0",
+    {
-          "checks": [
+      "selector": "request.uri.queryParams('_id').values",
-            {
+      "id": "_id_parameter_presence",
-              "type": "REGEX",
+      "description": "_id parameter can be used only once.",
-              "regex": "^\\S+$"
+      "requirementPriority": "MANDATORY",
-            }
+      "checksComposition": "oneOf",
-          ]
+      "checks": [
-        },
        {
-          "selector": "request.uri.queryParams('_lastUpdated')",
+          "type": "OCCURRENCE",
-          "id": "_lastUpdated_parameter_presence",
+          "minOccurrence": 0,
-          "description": "_lastUpdated parameter can be used only once.",
+          "maxOccurrence": 1
-          "requirementPriority": "MANDATORY",
+        }
-          "checksComposition": "oneOf",
+      ]
-          "checks": [
+    },
-            {
+    {
-              "type": "REGEX",
+      "selector": "request.uri.queryParams('_id').values",
-              "regex": "^(?!.*_lastUpdated=.*_lastUpdated=).*$"
+      "id": "_id_parameter_value",
-            }
+      "description": "_id parameter is a token.",
-          ]
+      "requirementPriority": "MANDATORY",
-        },
+      "checksComposition": "oneOf",
+      "applyIf": "request.uri.queryParams('_id').values.size() > 0",
+      "checks": [
        {
-          "selector": "request.uri.queryParams('_lastUpdated').values",
+          "type": "REGEX",
-          "id": "_lastUpdated_parameter_value",
+          "regex": "^\\S+$"
-          "description": "_lastUpdated parameter is made of a date eventually preceded by a modifier ge or le.",
+        }
-          "requirementPriority": "MANDATORY",
+      ]
-          "checksComposition": "oneOf",
+    },
-          "applyIf": "request.uri.queryParams('_lastUpdated').values.size() > 0",
+    {
-          "checks": [
+      "selector": "request.uri.queryParams('_lastUpdated').values",
-            {
+      "id": "_lastUpdated_parameter_presence",
-              "type": "REGEX",
+      "description": "_lastUpdated parameter can be used only once.",
-              "regex": "^(ge|le)?[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|1d|2[0-8]|3[01])$"
+      "requirementPriority": "MANDATORY",
-            }
+      "checksComposition": "oneOf",
-          ]
+      "checks": [
-        },
        {
-          "selector": "request.uri.queryParams('_format').values",
+          "type": "OCCURRENCE",
-          "id": "_format_parameter_presence",
+          "minOccurrence": 0,
-          "description": "_format parameter can be used only once.",
+          "maxOccurrence": 1
-          "requirementPriority": "MANDATORY",
+        }
-          "checksComposition": "oneOf",
+      ]
-          "checks": [
+    },
-            {
+    {
-              "type": "REGEX",
+      "selector": "request.uri.queryParams('_lastUpdated').values",
-              "regex": "(?!.*_format=.*_format=).*$"
+      "id": "_lastUpdated_parameter_value",
-            }
+      "description": "_lastUpdated parameter is made of a date eventually preceded by a modifier ge or le.",
-          ]
+      "requirementPriority": "MANDATORY",
-        },
+      "checksComposition": "oneOf",
+      "applyIf": "request.uri.queryParams('_lastUpdated').values.size() > 0",
+      "checks": [
        {
-          "selector": "request.uri.queryParams('_format').values",
+          "type": "REGEX",
-          "id": "_format_parameter_value",
+          "regex": "^(ge|le)?[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|1d|2[0-8]|3[01])$"
-          "description": "_format parameter's value shall be either json or xml.",
+        }
-          "requirementPriority": "MANDATORY",
+      ]
-          "checksComposition": "oneOf",
+    },
-          "applyIf": "request.uri.queryParams('_format').values.size() > 0",
+    {
-          "checks": [
+      "selector": "request.uri.queryParams('_format').values",
-            {
+      "id": "_format_parameter_presence",
-              "type": "CLOSEDLIST",
+      "description": "_format parameter can be used only once.",
-              "values": [
+      "requirementPriority": "MANDATORY",
-                  "json",
+      "checksComposition": "oneOf",
-                  "xml"
+      "checks": [
-              ]
-            }
-          ]
-        },
        {
-          "selector": "request.uri.queryParams('_sort').values",
+          "type": "OCCURRENCE",
-          "id": "_sort_parameter_presence",
+          "minOccurrence": 0,
-          "description": "_sort parameter can be used only once.",
+          "maxOccurrence": 1
-          "requirementPriority": "MANDATORY",
+        }
-          "checksComposition": "oneOf",
+      ]
-          "checks": [
+    },
-            {
+    {
-              "type": "REGEX",
+      "selector": "request.uri.queryParams('_format').values",
-              "regex": "^(?!.*_sort=.*_sort=).*$"
+      "id": "_format_parameter_value",
-            }
+      "description": "_format parameter's value shall be either json or xml.",
-          ]
+      "requirementPriority": "MANDATORY",
-        },
+      "checksComposition": "oneOf",
+      "applyIf": "request.uri.queryParams('_format').values.size() > 0",
+      "checks": [
        {
-          "selector": "request.uri.queryParams('_sort').values",
+          "type": "CLOSEDLIST",
-          "id": "_sort_parameter_value",
+          "values": [
-          "description": "_sort parameter's value is made of items composed of word caracters, separated by a comma and eventually prefixed by a dash.",
+            "json",
-          "requirementPriority": "MANDATORY",
+            "xml"
-          "checksComposition": "oneOf",
-          "applyIf": "request.uri.queryParams('_sort').values.size() > 0",
-          "checks": [
-            {
-              "type": "REGEX",
-              "regex": "([\\w,]|(-\\w))+$"
-            }
          ]
-        },
+        }
+      ]
+    },
+    {
+      "selector": "request.uri.queryParams('_sort').values",
+      "id": "_sort_parameter_presence",
+      "description": "_sort parameter can be used only once.",
+      "requirementPriority": "MANDATORY",
+      "checksComposition": "oneOf",
+      "checks": [
        {
-          "selector": "request.uri.queryParams('_count').values",
+          "type": "OCCURRENCE",
-          "id": "_count parameter can be used only once.",
+          "minOccurrence": 0,
-          "description": "_count parameter is a decimal.",
+          "maxOccurrence": 1
-          "requirementPriority": "MANDATORY",
+        }
-          "checksComposition": "oneOf",
+      ]
-          "checks": [
+    },
-            {
+    {
-              "type": "REGEX",
+      "selector": "request.uri.queryParams('_sort').values",
-              "regex": "^(?!.*_count=.*_count=).*$"
+      "id": "_sort_parameter_value",
-            }
+      "description": "_sort parameter's value is made of items composed of word caracters, separated by a comma and eventually prefixed by a dash.",
-          ]
+      "requirementPriority": "MANDATORY",
-        },
+      "checksComposition": "oneOf",
+      "applyIf": "request.uri.queryParams('_sort').values.size() > 0",
+      "checks": [
        {
-          "selector": "request.uri.queryParams('_count').values",
+          "type": "REGEX",
-          "id": "_count_parameter_value",
+          "regex": "^([\\w,]|(-\\w))+$"
-          "description": "_count parameter is a decimal.",
+        }
-          "requirementPriority": "MANDATORY",
+      ]
-          "checksComposition": "oneOf",
+    },
-          "applyIf": "request.uri.queryParams('_count').values.size() > 0",
+    {
-          "checks": [
+      "selector": "request.uri.queryParams('_count').values",
-            {
+      "id": "_count_parameter_presence",
-              "type": "REGEX",
+      "description": "_count parameter can be used only once..",
-              "regex": "\\d+$"
+      "requirementPriority": "MANDATORY",
-            }
+      "checksComposition": "oneOf",
-          ]
+      "checks": [
-        },
        {
-          "selector": "request.uri.queryParams('organization').values",
+          "type": "OCCURRENCE",
-          "id": "organization_parameter_presence",
+          "minOccurrence": 0,
-          "description": "organization parameter can be used only once.",
+          "maxOccurrence": 1
-          "requirementPriority": "MANDATORY",
+        }
-          "checksComposition": "oneOf",
+      ]
-          "checks": [
+    },
-            {
+    {
-              "type": "REGEX",
+      "selector": "request.uri.queryParams('_count').values",
-              "regex": "^(?!.*organization=.*organization=).*$"
+      "id": "_count_parameter_value",
-            }
+      "description": "_count parameter is a decimal.",
-          ]
+      "requirementPriority": "MANDATORY",
-        },
+      "checksComposition": "oneOf",
+      "applyIf": "request.uri.queryParams('_count').values.size() > 0",
+      "checks": [
        {
-          "selector": "request.uri.queryParams('organization').values",
+          "type": "REGEX",
-          "id": "organization_parameter_value",
+          "regex": "\\d+$"
-          "description": "organization parameter is a boolean and accept true or false values.",
+        }
-          "requirementPriority": "MANDATORY",
+      ]
-          "checksComposition": "oneOf",
+    },
-          "applyIf": "request.uri.queryParams('organization').values.size() > 0",
+    {
-          "checks": [
+      "selector": "request.uri.queryParams('organization').values",
-            {
+      "id": "organization_parameter_presence",
-              "type": "REGEX",
+      "description": "organization parameter can be used only once.",
-              "regex": "^\\S+$"
+      "requirementPriority": "MANDATORY",
-            }
+      "checksComposition": "oneOf",
-          ]
+      "checks": [
-        },
        {
-          "selector": "request.uri.queryParams('practitioner').values",
+          "type": "OCCURRENCE",
-          "id": "practitioner_parameter_presence",
+          "minOccurrence": 0,
-          "description": "practitioner parameter can be used only once.",
+          "maxOccurrence": 1
-          "requirementPriority": "MANDATORY",
+        }
-          "checksComposition": "oneOf",
+      ]
-          "checks": [
+    },
-            {
+    {
-              "type": "REGEX",
+      "selector": "request.uri.queryParams('organization').values",
-              "regex": "^(?!.*practitioner=.*practitioner=).*$"
+      "id": "organization_parameter_value",
-            }
+      "description": "organization parameter is a token.",
-          ]
+      "requirementPriority": "MANDATORY",
-        },
+      "checksComposition": "oneOf",
+      "applyIf": "request.uri.queryParams('organization').values.size() > 0",
+      "checks": [
        {
-          "selector": "request.uri.queryParams('practitioner').values",
+          "type": "REGEX",
-          "id": "practitioner_parameter_value",
+          "regex": "^\\S+$"
-          "description": "practitioner parameter is a token.",
+        }
-          "requirementPriority": "MANDATORY",
+      ]
-          "checksComposition": "oneOf",
+    },
-          "applyIf": "request.uri.queryParams('practitioner').values.size() > 0",
+    {
-          "checks": [
+      "selector": "request.uri.queryParams('practitioner').values",
-            {
+      "id": "practitioner_parameter_presence",
-              "type": "REGEX",
+      "description": "practitioner parameter can be used only once.",
-              "regex": "^\\S+$"
+      "requirementPriority": "MANDATORY",
-            }
+      "checksComposition": "oneOf",
-          ]
+      "checks": [
-        },
        {
-          "selector": "request.uri.queryParams('role').values",
+          "type": "OCCURRENCE",
-          "id": "role_parameter_presence",
+          "minOccurrence": 0,
-          "description": "role parameter can be used only once.",
+          "maxOccurrence": 1
-          "requirementPriority": "MANDATORY",
+        }
-          "checksComposition": "oneOf",
+      ]
-          "checks": [
+    },
-            {
+    {
-              "type": "REGEX",
+      "selector": "request.uri.queryParams('practitioner').values",
-              "regex": "(?!.*role=.*role=).*$"
+      "id": "practitioner_parameter_value",
-            }
+      "description": "practitioner parameter is a token.",
-          ]
+      "requirementPriority": "MANDATORY",
-        },
+      "checksComposition": "oneOf",
+      "applyIf": "request.uri.queryParams('practitioner').values.size() > 0",
+      "checks": [
        {
-          "selector": "request.uri.queryParams('role').values",
+          "type": "REGEX",
-          "id": "role_parameter_value",
+          "regex": "^\\S+$"
-          "description": "role parameter is a token.",
+        }
-          "requirementPriority": "MANDATORY",
+      ]
-          "checksComposition": "oneOf",
+    },
-          "applyIf": "request.uri.queryParams('role').values.size() > 0",
+    {
-          "checks": [
+      "selector": "request.uri.queryParams('role').values",
-            {
+      "id": "role_parameter_presence",
-              "type": "REGEX",
+      "description": "role parameter can be used only once.",
-              "regex": "^\\S+$"
+      "requirementPriority": "MANDATORY",
-            }
+      "checksComposition": "oneOf",
-          ]
+      "checks": [
-        },
        {
-          "selector": "request.uri.queryParams('service').values",
+          "type": "OCCURRENCE",
-          "id": "service_parameter_presence",
+          "minOccurrence": 0,
-          "description": "service parameter can be used only once.",
+          "maxOccurrence": 1
-          "requirementPriority": "MANDATORY",
+        }
-          "checksComposition": "oneOf",
+      ]
-          "checks": [
+    },
-            {
+    {
-              "type": "REGEX",
+      "selector": "request.uri.queryParams('role').values",
-              "regex": "^(?!.*service=.*service=).*$"
+      "id": "role_parameter_value",
-            }
+      "description": "role parameter is a token.",
-          ]
+      "requirementPriority": "MANDATORY",
-        },
+      "checksComposition": "oneOf",
+      "applyIf": "request.uri.queryParams('role').values.size() > 0",
+      "checks": [
        {
-          "selector": "request.uri.queryParams('service').values",
+          "type": "REGEX",
-          "id": "service_parameter_value",
+          "regex": "^\\S+$"
-          "description": "service parameter is a token.",
+        }
-          "requirementPriority": "MANDATORY",
+      ]
-          "checksComposition": "oneOf",
+    },
-          "applyIf": "request.uri.queryParams('service').values.size() > 0",
+    {
-          "checks": [
+      "selector": "request.uri.queryParams('service').values",
-            {
+      "id": "service_parameter_presence",
-              "type": "REGEX",
+      "description": "service parameter can be used only once.",
-              "regex": "^\\S+$"
+      "requirementPriority": "MANDATORY",
-            }
+      "checksComposition": "oneOf",
-          ]
+      "checks": [
-        },
        {
-          "selector": "request.uri.queryParams('speciality').values",
+          "type": "OCCURRENCE",
-          "id": "speciality_parameter_presence",
+          "minOccurrence": 0,
-          "description": "speciality parameter can be used only once, eventually suffixed by a modifier :contains or :exact.",
+          "maxOccurrence": 1
-          "requirementPriority": "MANDATORY",
+        }
-          "checksComposition": "oneOf",
+      ]
-          "checks": [
+    },
-            {
+    {
-              "type": "REGEX",
+      "selector": "request.uri.queryParams('service').values",
-              "regex": "^(?!.*speciality=.*speciality=).*$"
+      "id": "service_parameter_value",
-            }
+      "description": "service parameter is a token.",
-          ]
+      "requirementPriority": "MANDATORY",
-        },
+      "checksComposition": "oneOf",
+      "applyIf": "request.uri.queryParams('service').values.size() > 0",
+      "checks": [
        {
-          "selector": "request.uri.queryParams('speciality').values",
+          "type": "REGEX",
-          "id": "speciality_parameter_value",
+          "regex": "^\\S+$"
-          "description": "speciality parameter is a token.",
+        }
-          "requirementPriority": "MANDATORY",
+      ]
-          "checksComposition": "oneOf",
+    },
-          "applyIf": "request.uri.queryParams('speciality').values.size() > 0",
+    {
-          "checks": [
+      "selector": "request.uri.queryParams('speciality').values",
-            {
+      "id": "speciality_parameter_presence",
-              "type": "REGEX",
+      "description": "speciality parameter can be used only once.",
-              "regex": "^\\S+$"
+      "requirementPriority": "MANDATORY",
-            }
+      "checksComposition": "oneOf",
-          ]
+      "checks": [
+        {
+          "type": "OCCURRENCE",
+          "minOccurrence": 0,
+          "maxOccurrence": 1
+        }
+      ]
+    },
+    {
+      "selector": "request.uri.queryParams('speciality').values",
+      "id": "speciality_parameter_value",
+      "description": "speciality parameter is a token.",
+      "requirementPriority": "MANDATORY",
+      "checksComposition": "oneOf",
+      "applyIf": "request.uri.queryParams('speciality').values.size() > 0",
+      "checks": [
+        {
+          "type": "REGEX",
+          "regex": "^\\S+$"
+        }
+      ]
+    },
+    {
+      "selector": "request.uri.queryParams('_include').values",
+      "id": "_include_parameter_presence",
+      "description": "_include parameter can be used only once.",
+      "requirementPriority": "MANDATORY",
+      "checksComposition": "oneOf",
+      "checks": [
+        {
+          "type": "OCCURRENCE",
+          "minOccurrence": 0,
+          "maxOccurrence": 1
+        }
+      ]
+    },
+    {
+      "selector": "request.uri.queryParams('_include').values",
+      "id": "_include_parameter_value",
+      "description": "_include parameter is a token.",
+      "requirementPriority": "MANDATORY",
+      "checksComposition": "oneOf",
+      "applyIf": "request.uri.queryParams('_include').values.size() > 0",
+      "checks": [
+        {
+          "type": "REGEX",
+          "regex": "^.+$"
        }
+      ]
+    }
  ]
 }
\ No newline at end of file
--- a/EHS/CH_mCSD/CH-ITI-90-RetrieveRequest-ValidationProfile.json
+++ b/EHS/CH_mCSD/CH-ITI-90-RetrieveRequest-ValidationProfile.json
+{
+    "profileType": "HTTPREQUEST",
+    "id": "CH_ITI-90_Retrieve-ValidationProfile",
+    "name": "CH_ITI-90_Retrieve",
+    "description": "Validation Profile for retrieving a mCSD resource.",
+    "context": "EPR",
+    "assertions": [
+      {
+          "selector": "request.method",
+          "id": "GETMethodChecking",
+          "description": "HTTP method shall be GET or POST",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "checks": [
+            {
+              "type": "CLOSEDLIST",
+              "values": [
+                "GET",
+                "POST"
+              ]
+            }    
+          ]
+      },
+      {
+          "selector": "request.version",
+          "id": "HTTP1VersionChecking",
+          "description": "The HTTP version shall be HTTP/1.1",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "checks": [
+            {
+              "type": "FIXEDVALUE",
+              "fixedValue": "HTTP/1.1"
+            }
+          ]
+        },
+        {
+          "selector": "request.uri.path",
+          "id": "URIRegexChecking",
+          "description": "URI path of the request shall be followed by the Patient resource",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "checks": [
+            {
+              "type": "REGEX",
+              "regex": "^(\\S)*\\/(Organization|Practitioner|PractitionerRole)\\/(\\S)+$"
+            }
+          ]
+        },
+        {
+          "selector": "request.headers('Host').values",
+          "id": "HostChecking",
+          "description": "Host Shall be a server name; Regex: ^(http[s]?:\\/\\/)?[a-zA-Z0-9.\\-\\/]+(:(\\d)+)?$",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "checks": [
+            {
+              "type": "REGEX",
+              "regex": "^(http[s]?:\\/\\/)?[a-zA-Z0-9.\\-\\/]+(:(\\d)+)?$"
+            }
+          ]
+        },
+        {
+          "selector": "request.headers('Authorization').values",
+          "id": "Authorization_parameter_presence",
+          "description": "The Authorization parameter is mandatory.",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "checks": [
+            {
+              "type": "OCCURRENCE",
+              "minOccurrence": 1,
+              "maxOccurrence": 1
+            }
+          ]
+        },
+        {
+          "selector": "request.headers('Authorization').values",
+          "id": "Authorization_parameter_value",
+          "description": "Authorization parameter's value SHALL be Bearer, followed by the token.",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "checks": [
+            {
+              "type": "REGEX",
+              "regex": "^Bearer\\ [-a-zA-Z0-9._~+\\/]+=*$"
+            }
+          ]
+        },{
+          "selector": "request.headers('traceparent').values",
+          "id": "traceparent_parameter_presence",
+          "description": "The traceparent parameter is mandatory in the HTTP header.",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "checks": [
+            {
+              "type": "OCCURRENCE",
+              "minOccurrence": 1,
+              "maxOccurrence": 1
+            }
+          ]
+        },
+        {
+          "selector": "request.headers('traceparent').values",
+          "id": "traceparent_parameter_value",
+          "description": "traceparent parameter's value SHALL be as defined in fhir.ch, section tracecontext.",
+          "requirementPriority": "MANDATORY",
+          "checksComposition": "oneOf",
+          "checks": [
+            {
+              "type": "REGEX",
+              "regex": "^(?!f{2})([\\da-f]{2})-(?!f{32})([\\da-f]{32})-(?!f{16})([\\da-f]{16})-(?!f{2})([\\da-f]{2})$"
+            }
+          ]
+        }
+  ]
+}
\ No newline at end of file
--- a/EHS/CH_mCSD/README.md
+++ b/EHS/CH_mCSD/README.md
@@ -29,13 +29,13 @@ date: 2023-03-14
 |   _sort_parameter_value   |   REGEX   |   `^([\w,]\|(-\w))+$` |   _sort parameter's value is made of items composed of word caracters, separated by a comma and eventually prefixed by a dash. | 
 |   _count_parameter_presence   |   OCCURENCE   | 0..1 |   _count parameter can be used only once. |
 |   _count_parameter_value   |   REGEX   |   `^\d+$` |   _count parameter is a decimal.  |
+|   active_parameter_presence   |   OCCURENCE   | 0..1 |   active parameter can be used only once. |
+|   active_parameter_value   |   CLOSEDLIST   |   [true,false] |   active parameter is a boolean and accept true or false values.  |
 ## Organization resource's assertions
 |   id  |   Check's type |   Value |   Description    |
 |---    |---    |---    |---    |
-|   active_parameter_presence   |   OCCURENCE   | 0..1 |   active parameter can be used only once. |
-|   active_parameter_value   |   CLOSEDLIST   |   [true,false] |   active parameter is a boolean and accept true or false values.  |
 |   identifier_parameter_presence   |   OCCURENCE   | 0..1 |   identifier parameter can be used only once. |
 |   identifier_parameter_value   |   REGEX   |   `^\S+$` |   identifier parameter is a token.  |
 |   name_parameter_presence   |   OCCURENCE   | 0..1 |   name parameter can be used only once. |
@@ -49,8 +49,6 @@ date: 2023-03-14
 |   id  |   Check's type |   Value |   Description    |
 |---    |---    |---    |---    | 
-|   active_parameter_presence   |   OCCURENCE   | 0..1 |   active parameter can be used only once. |
-|   active_parameter_value   |   CLOSEDLIST   |   [true,false] |   active parameter is a boolean and accept true or false values.  |
 |   identifier_parameter_presence   |   OCCURENCE   | 0..1 |   identifier parameter can be used only once. |
 |   identifier_parameter_value   |   REGEX   |   `^\S+$` |   identifier parameter is a token.  |
 |   name_parameter_presence   |   OCCURENCE   | 0..1 |   name parameter can be used only once, eventually suffixed by a modifier :contains or :exact.
@@ -73,4 +71,6 @@ date: 2023-03-14
 |   service_parameter_presence   | OCCURENCE   | 0..1 |   service parameter can be used only once. |
 |   service_parameter_value   |   REGEX |  `^\S+$` |  service parameter is a token.
 |   speciality_parameter_presence   | OCCURENCE   | 0..1 |   speciality parameter can be used only once. |
-|   speciality_parameter_value   |   REGEX |  `^\S+$` |  speciality parameter is a token.
+|   speciality_parameter_value   |   REGEX |  `^\S+$` |  speciality parameter is a token.|
\ No newline at end of file
+|   _include__parameter_presence   | OCCURENCE   | 0..1 |   _include parameter can be used only once. |
+|   _include_parameter_value   |   REGEX |  `^.+$` |  _include parameter is a string.|
\ No newline at end of file
--- a/EHS/samples/CH-mCSD/ITI-90/A - Organization/CH-mCSD - 014- valid - retrieve.txt
+++ b/EHS/samples/CH-mCSD/ITI-90/A - Organization/CH-mCSD - 014- valid - retrieve.txt
-GET CareServicesSelectiveSupplier/Organization?_id=abc123&_lastupdated=ge2024-03-22&_format=json HTTP/1.1
+GET CareServicesSelectiveSupplier/Organization/abc123 HTTP/1.1
 Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJnVmd6VWtRZEtwZHVMbmF4bThKQy1JYTh0VUdNV0J1TTJZT2R3akthcEdzIn0.eyJleHAiOjE3MDgzNDg0ODUsImlhdCI6MTcwODM0ODE4NSwiYXV0aF90aW1lIjoxNzA4MzQ4MTQzLCJqdGkiOiI5OGZjZDFiNy0wZGE5LTRkZGQtODUwNy1hM2I1YmU3NmY0ZmIiLCJpc3MiOiJodHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvaXVhLXNzby9yZWFsbXMvY2gtaXVhIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImFjNGZkNjI2LWNiZGYtNGIzMC1hOTNhLTc0YTM2YWQyM2QwYiIsInR5cCI6IkJlYXJlciIsImF6cCI6ImNoLWl1YS1jbGllbnQiLCJzZXNzaW9uX3N0YXRlIjoiYzUyMTE2NjItY2VhNy00ZmFmLWFkZjktNDNiNTE2MGNjYjUwIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIvKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1jaC1pdWEiLCJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJwdXJwb3NlX29mX3VzZT11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC41fE5PUk0gcHJvZmlsZSBsYXVuY2ggZW1haWwiLCJzaWQiOiJjNTIxMTY2Mi1jZWE3LTRmYWYtYWRmOS00M2I1MTYwY2NiNTAiLCJleHRlbnNpb25zIjp7ImNoX2VwciI6eyJ1c2VyX2lkX3F1YWxpZmllciI6InVybjpnczE6Z2xuIiwidXNlcl9pZCI6Ijc2MDEwMDI0NjczNzMifSwiY2hfaXVhIjp7ImxhdW5jaCI6ImxhdW5jaCJ9LCJpaGVfaXVhIjp7InB1cnBvc2Vfb2ZfdXNlIjp7ImNvZGUiOiJOT1JNIiwic3lzdGVtIjoidXJuOm9pZDoyLjE2Ljc1Ni41LjMwLjEuMTI3LjMuMTAuNSJ9fX0sImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwibmFtZSI6InJyZXlub2xkcyBSZXlub2xkcyIsInByZWZlcnJlZF91c2VybmFtZSI6InJyZXlub2xkcyIsImdpdmVuX25hbWUiOiJycmV5bm9sZHMiLCJmYW1pbHlfbmFtZSI6IlJleW5vbGRzIn0.mT9ZTGNqTfsMBxoyGLaQlUr9PVcFItvlKmZxjY4_OAHqi4nE82S5n0mE4iy_5YL_sbYtNODI1L_LH6keBTCSbSOY5REkp_NLm4QLzdX4ynJ7Y_nMoD5H6TFqJTrllKVJ5IKtXhWv9bLQK35PLLPeNMZH4yl3ChlOlx0IH-zqHEPcOV69kN1vC7_Jjj0vx3d0RFvR_0sbfG3XnSiO3fpwwj2xYgRfZkfJqTuZ5404j9nu8TiPHtCRqQ_EPtEirUTG1ClX1DahJRKB-jwLHThxkKooUxsRAQZVhqayhLMV8sxwNkeHnNemhqreOkeDELxn2ZC-VOQLe9WRsX37QagO1g
 traceparent: 00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-00
 Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
--- a/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 001 - valid - emptyQuery.txt
+++ b/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 001 - valid - emptyQuery.txt
-GET CareServicesSelectiveSupplier/Practitioner? HTTP/1.1
+GET CareServicesSelectiveSupplier/Practitioner HTTP/1.1
 Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJnVmd6VWtRZEtwZHVMbmF4bThKQy1JYTh0VUdNV0J1TTJZT2R3akthcEdzIn0.eyJleHAiOjE3MDgzNDg0ODUsImlhdCI6MTcwODM0ODE4NSwiYXV0aF90aW1lIjoxNzA4MzQ4MTQzLCJqdGkiOiI5OGZjZDFiNy0wZGE5LTRkZGQtODUwNy1hM2I1YmU3NmY0ZmIiLCJpc3MiOiJodHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvaXVhLXNzby9yZWFsbXMvY2gtaXVhIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImFjNGZkNjI2LWNiZGYtNGIzMC1hOTNhLTc0YTM2YWQyM2QwYiIsInR5cCI6IkJlYXJlciIsImF6cCI6ImNoLWl1YS1jbGllbnQiLCJzZXNzaW9uX3N0YXRlIjoiYzUyMTE2NjItY2VhNy00ZmFmLWFkZjktNDNiNTE2MGNjYjUwIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIvKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1jaC1pdWEiLCJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJwdXJwb3NlX29mX3VzZT11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC41fE5PUk0gcHJvZmlsZSBsYXVuY2ggZW1haWwiLCJzaWQiOiJjNTIxMTY2Mi1jZWE3LTRmYWYtYWRmOS00M2I1MTYwY2NiNTAiLCJleHRlbnNpb25zIjp7ImNoX2VwciI6eyJ1c2VyX2lkX3F1YWxpZmllciI6InVybjpnczE6Z2xuIiwidXNlcl9pZCI6Ijc2MDEwMDI0NjczNzMifSwiY2hfaXVhIjp7ImxhdW5jaCI6ImxhdW5jaCJ9LCJpaGVfaXVhIjp7InB1cnBvc2Vfb2ZfdXNlIjp7ImNvZGUiOiJOT1JNIiwic3lzdGVtIjoidXJuOm9pZDoyLjE2Ljc1Ni41LjMwLjEuMTI3LjMuMTAuNSJ9fX0sImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwibmFtZSI6InJyZXlub2xkcyBSZXlub2xkcyIsInByZWZlcnJlZF91c2VybmFtZSI6InJyZXlub2xkcyIsImdpdmVuX25hbWUiOiJycmV5bm9sZHMiLCJmYW1pbHlfbmFtZSI6IlJleW5vbGRzIn0.mT9ZTGNqTfsMBxoyGLaQlUr9PVcFItvlKmZxjY4_OAHqi4nE82S5n0mE4iy_5YL_sbYtNODI1L_LH6keBTCSbSOY5REkp_NLm4QLzdX4ynJ7Y_nMoD5H6TFqJTrllKVJ5IKtXhWv9bLQK35PLLPeNMZH4yl3ChlOlx0IH-zqHEPcOV69kN1vC7_Jjj0vx3d0RFvR_0sbfG3XnSiO3fpwwj2xYgRfZkfJqTuZ5404j9nu8TiPHtCRqQ_EPtEirUTG1ClX1DahJRKB-jwLHThxkKooUxsRAQZVhqayhLMV8sxwNkeHnNemhqreOkeDELxn2ZC-VOQLe9WRsX37QagO1g
+traceparent: 00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-00
 Host: ehealthsuisse.ihe-europe.net
--- a/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 002 - valid - emptyQuery.txt
+++ b/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 002 - valid - emptyQuery.txt
-GET CareServicesSelectiveSupplier/Practitioner HTTP/1.1
+GET CareServicesSelectiveSupplier/Practitioner? HTTP/1.1
 Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJnVmd6VWtRZEtwZHVMbmF4bThKQy1JYTh0VUdNV0J1TTJZT2R3akthcEdzIn0.eyJleHAiOjE3MDgzNDg0ODUsImlhdCI6MTcwODM0ODE4NSwiYXV0aF90aW1lIjoxNzA4MzQ4MTQzLCJqdGkiOiI5OGZjZDFiNy0wZGE5LTRkZGQtODUwNy1hM2I1YmU3NmY0ZmIiLCJpc3MiOiJodHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvaXVhLXNzby9yZWFsbXMvY2gtaXVhIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImFjNGZkNjI2LWNiZGYtNGIzMC1hOTNhLTc0YTM2YWQyM2QwYiIsInR5cCI6IkJlYXJlciIsImF6cCI6ImNoLWl1YS1jbGllbnQiLCJzZXNzaW9uX3N0YXRlIjoiYzUyMTE2NjItY2VhNy00ZmFmLWFkZjktNDNiNTE2MGNjYjUwIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIvKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1jaC1pdWEiLCJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJwdXJwb3NlX29mX3VzZT11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC41fE5PUk0gcHJvZmlsZSBsYXVuY2ggZW1haWwiLCJzaWQiOiJjNTIxMTY2Mi1jZWE3LTRmYWYtYWRmOS00M2I1MTYwY2NiNTAiLCJleHRlbnNpb25zIjp7ImNoX2VwciI6eyJ1c2VyX2lkX3F1YWxpZmllciI6InVybjpnczE6Z2xuIiwidXNlcl9pZCI6Ijc2MDEwMDI0NjczNzMifSwiY2hfaXVhIjp7ImxhdW5jaCI6ImxhdW5jaCJ9LCJpaGVfaXVhIjp7InB1cnBvc2Vfb2ZfdXNlIjp7ImNvZGUiOiJOT1JNIiwic3lzdGVtIjoidXJuOm9pZDoyLjE2Ljc1Ni41LjMwLjEuMTI3LjMuMTAuNSJ9fX0sImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwibmFtZSI6InJyZXlub2xkcyBSZXlub2xkcyIsInByZWZlcnJlZF91c2VybmFtZSI6InJyZXlub2xkcyIsImdpdmVuX25hbWUiOiJycmV5bm9sZHMiLCJmYW1pbHlfbmFtZSI6IlJleW5vbGRzIn0.mT9ZTGNqTfsMBxoyGLaQlUr9PVcFItvlKmZxjY4_OAHqi4nE82S5n0mE4iy_5YL_sbYtNODI1L_LH6keBTCSbSOY5REkp_NLm4QLzdX4ynJ7Y_nMoD5H6TFqJTrllKVJ5IKtXhWv9bLQK35PLLPeNMZH4yl3ChlOlx0IH-zqHEPcOV69kN1vC7_Jjj0vx3d0RFvR_0sbfG3XnSiO3fpwwj2xYgRfZkfJqTuZ5404j9nu8TiPHtCRqQ_EPtEirUTG1ClX1DahJRKB-jwLHThxkKooUxsRAQZVhqayhLMV8sxwNkeHnNemhqreOkeDELxn2ZC-VOQLe9WRsX37QagO1g
+traceparent: 00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-00
 Host: ehealthsuisse.ihe-europe.net
--- a/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 003 - valid - with _id.txt
+++ b/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 003 - valid - with _id.txt
-GET CareServicesSelectiveSupplier/Practitioner?_id=DrPeterPan HTTP/1.1
+GET CareServicesSelectiveSupplier/Practitioner?_id=abc123 HTTP/1.1
 Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJnVmd6VWtRZEtwZHVMbmF4bThKQy1JYTh0VUdNV0J1TTJZT2R3akthcEdzIn0.eyJleHAiOjE3MDgzNDg0ODUsImlhdCI6MTcwODM0ODE4NSwiYXV0aF90aW1lIjoxNzA4MzQ4MTQzLCJqdGkiOiI5OGZjZDFiNy0wZGE5LTRkZGQtODUwNy1hM2I1YmU3NmY0ZmIiLCJpc3MiOiJodHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvaXVhLXNzby9yZWFsbXMvY2gtaXVhIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImFjNGZkNjI2LWNiZGYtNGIzMC1hOTNhLTc0YTM2YWQyM2QwYiIsInR5cCI6IkJlYXJlciIsImF6cCI6ImNoLWl1YS1jbGllbnQiLCJzZXNzaW9uX3N0YXRlIjoiYzUyMTE2NjItY2VhNy00ZmFmLWFkZjktNDNiNTE2MGNjYjUwIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIvKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1jaC1pdWEiLCJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJwdXJwb3NlX29mX3VzZT11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC41fE5PUk0gcHJvZmlsZSBsYXVuY2ggZW1haWwiLCJzaWQiOiJjNTIxMTY2Mi1jZWE3LTRmYWYtYWRmOS00M2I1MTYwY2NiNTAiLCJleHRlbnNpb25zIjp7ImNoX2VwciI6eyJ1c2VyX2lkX3F1YWxpZmllciI6InVybjpnczE6Z2xuIiwidXNlcl9pZCI6Ijc2MDEwMDI0NjczNzMifSwiY2hfaXVhIjp7ImxhdW5jaCI6ImxhdW5jaCJ9LCJpaGVfaXVhIjp7InB1cnBvc2Vfb2ZfdXNlIjp7ImNvZGUiOiJOT1JNIiwic3lzdGVtIjoidXJuOm9pZDoyLjE2Ljc1Ni41LjMwLjEuMTI3LjMuMTAuNSJ9fX0sImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwibmFtZSI6InJyZXlub2xkcyBSZXlub2xkcyIsInByZWZlcnJlZF91c2VybmFtZSI6InJyZXlub2xkcyIsImdpdmVuX25hbWUiOiJycmV5bm9sZHMiLCJmYW1pbHlfbmFtZSI6IlJleW5vbGRzIn0.mT9ZTGNqTfsMBxoyGLaQlUr9PVcFItvlKmZxjY4_OAHqi4nE82S5n0mE4iy_5YL_sbYtNODI1L_LH6keBTCSbSOY5REkp_NLm4QLzdX4ynJ7Y_nMoD5H6TFqJTrllKVJ5IKtXhWv9bLQK35PLLPeNMZH4yl3ChlOlx0IH-zqHEPcOV69kN1vC7_Jjj0vx3d0RFvR_0sbfG3XnSiO3fpwwj2xYgRfZkfJqTuZ5404j9nu8TiPHtCRqQ_EPtEirUTG1ClX1DahJRKB-jwLHThxkKooUxsRAQZVhqayhLMV8sxwNkeHnNemhqreOkeDELxn2ZC-VOQLe9WRsX37QagO1g
+traceparent: 00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-00
 Host: ehealthsuisse.ihe-europe.net
--- a/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 004 - valid - with _lastUpdated ge.txt
+++ b/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 004 - valid - with _lastUpdated ge.txt
-GET CareServicesSelectiveSupplier/Practitioner?_lastupdated=ge2024-03-22 HTTP/1.1
+GET CareServicesSelectiveSupplier/Practitioner?_lastUpdated=ge2024-03-22 HTTP/1.1
 Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJnVmd6VWtRZEtwZHVMbmF4bThKQy1JYTh0VUdNV0J1TTJZT2R3akthcEdzIn0.eyJleHAiOjE3MDgzNDg0ODUsImlhdCI6MTcwODM0ODE4NSwiYXV0aF90aW1lIjoxNzA4MzQ4MTQzLCJqdGkiOiI5OGZjZDFiNy0wZGE5LTRkZGQtODUwNy1hM2I1YmU3NmY0ZmIiLCJpc3MiOiJodHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvaXVhLXNzby9yZWFsbXMvY2gtaXVhIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImFjNGZkNjI2LWNiZGYtNGIzMC1hOTNhLTc0YTM2YWQyM2QwYiIsInR5cCI6IkJlYXJlciIsImF6cCI6ImNoLWl1YS1jbGllbnQiLCJzZXNzaW9uX3N0YXRlIjoiYzUyMTE2NjItY2VhNy00ZmFmLWFkZjktNDNiNTE2MGNjYjUwIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIvKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1jaC1pdWEiLCJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJwdXJwb3NlX29mX3VzZT11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC41fE5PUk0gcHJvZmlsZSBsYXVuY2ggZW1haWwiLCJzaWQiOiJjNTIxMTY2Mi1jZWE3LTRmYWYtYWRmOS00M2I1MTYwY2NiNTAiLCJleHRlbnNpb25zIjp7ImNoX2VwciI6eyJ1c2VyX2lkX3F1YWxpZmllciI6InVybjpnczE6Z2xuIiwidXNlcl9pZCI6Ijc2MDEwMDI0NjczNzMifSwiY2hfaXVhIjp7ImxhdW5jaCI6ImxhdW5jaCJ9LCJpaGVfaXVhIjp7InB1cnBvc2Vfb2ZfdXNlIjp7ImNvZGUiOiJOT1JNIiwic3lzdGVtIjoidXJuOm9pZDoyLjE2Ljc1Ni41LjMwLjEuMTI3LjMuMTAuNSJ9fX0sImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwibmFtZSI6InJyZXlub2xkcyBSZXlub2xkcyIsInByZWZlcnJlZF91c2VybmFtZSI6InJyZXlub2xkcyIsImdpdmVuX25hbWUiOiJycmV5bm9sZHMiLCJmYW1pbHlfbmFtZSI6IlJleW5vbGRzIn0.mT9ZTGNqTfsMBxoyGLaQlUr9PVcFItvlKmZxjY4_OAHqi4nE82S5n0mE4iy_5YL_sbYtNODI1L_LH6keBTCSbSOY5REkp_NLm4QLzdX4ynJ7Y_nMoD5H6TFqJTrllKVJ5IKtXhWv9bLQK35PLLPeNMZH4yl3ChlOlx0IH-zqHEPcOV69kN1vC7_Jjj0vx3d0RFvR_0sbfG3XnSiO3fpwwj2xYgRfZkfJqTuZ5404j9nu8TiPHtCRqQ_EPtEirUTG1ClX1DahJRKB-jwLHThxkKooUxsRAQZVhqayhLMV8sxwNkeHnNemhqreOkeDELxn2ZC-VOQLe9WRsX37QagO1g
+traceparent: 00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-00
 Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
--- a/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 004 - valid - with _lastUpdated le.txt
+++ b/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 004 - valid - with _lastUpdated le.txt
-GET CareServicesSelectiveSupplier/Practitioner?_lastupdated=le2024-03-22 HTTP/1.1
+GET CareServicesSelectiveSupplier/Practitioner?_lastUpdated=le2024-03-22 HTTP/1.1
 Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJnVmd6VWtRZEtwZHVMbmF4bThKQy1JYTh0VUdNV0J1TTJZT2R3akthcEdzIn0.eyJleHAiOjE3MDgzNDg0ODUsImlhdCI6MTcwODM0ODE4NSwiYXV0aF90aW1lIjoxNzA4MzQ4MTQzLCJqdGkiOiI5OGZjZDFiNy0wZGE5LTRkZGQtODUwNy1hM2I1YmU3NmY0ZmIiLCJpc3MiOiJodHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvaXVhLXNzby9yZWFsbXMvY2gtaXVhIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImFjNGZkNjI2LWNiZGYtNGIzMC1hOTNhLTc0YTM2YWQyM2QwYiIsInR5cCI6IkJlYXJlciIsImF6cCI6ImNoLWl1YS1jbGllbnQiLCJzZXNzaW9uX3N0YXRlIjoiYzUyMTE2NjItY2VhNy00ZmFmLWFkZjktNDNiNTE2MGNjYjUwIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIvKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1jaC1pdWEiLCJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJwdXJwb3NlX29mX3VzZT11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC41fE5PUk0gcHJvZmlsZSBsYXVuY2ggZW1haWwiLCJzaWQiOiJjNTIxMTY2Mi1jZWE3LTRmYWYtYWRmOS00M2I1MTYwY2NiNTAiLCJleHRlbnNpb25zIjp7ImNoX2VwciI6eyJ1c2VyX2lkX3F1YWxpZmllciI6InVybjpnczE6Z2xuIiwidXNlcl9pZCI6Ijc2MDEwMDI0NjczNzMifSwiY2hfaXVhIjp7ImxhdW5jaCI6ImxhdW5jaCJ9LCJpaGVfaXVhIjp7InB1cnBvc2Vfb2ZfdXNlIjp7ImNvZGUiOiJOT1JNIiwic3lzdGVtIjoidXJuOm9pZDoyLjE2Ljc1Ni41LjMwLjEuMTI3LjMuMTAuNSJ9fX0sImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwibmFtZSI6InJyZXlub2xkcyBSZXlub2xkcyIsInByZWZlcnJlZF91c2VybmFtZSI6InJyZXlub2xkcyIsImdpdmVuX25hbWUiOiJycmV5bm9sZHMiLCJmYW1pbHlfbmFtZSI6IlJleW5vbGRzIn0.mT9ZTGNqTfsMBxoyGLaQlUr9PVcFItvlKmZxjY4_OAHqi4nE82S5n0mE4iy_5YL_sbYtNODI1L_LH6keBTCSbSOY5REkp_NLm4QLzdX4ynJ7Y_nMoD5H6TFqJTrllKVJ5IKtXhWv9bLQK35PLLPeNMZH4yl3ChlOlx0IH-zqHEPcOV69kN1vC7_Jjj0vx3d0RFvR_0sbfG3XnSiO3fpwwj2xYgRfZkfJqTuZ5404j9nu8TiPHtCRqQ_EPtEirUTG1ClX1DahJRKB-jwLHThxkKooUxsRAQZVhqayhLMV8sxwNkeHnNemhqreOkeDELxn2ZC-VOQLe9WRsX37QagO1g
+traceparent: 00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-00
 Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
--- a/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 005 - valid - with _format json.txt
+++ b/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 005 - valid - with _format json.txt
 GET CareServicesSelectiveSupplier/Practitioner?_format=json HTTP/1.1
 Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJnVmd6VWtRZEtwZHVMbmF4bThKQy1JYTh0VUdNV0J1TTJZT2R3akthcEdzIn0.eyJleHAiOjE3MDgzNDg0ODUsImlhdCI6MTcwODM0ODE4NSwiYXV0aF90aW1lIjoxNzA4MzQ4MTQzLCJqdGkiOiI5OGZjZDFiNy0wZGE5LTRkZGQtODUwNy1hM2I1YmU3NmY0ZmIiLCJpc3MiOiJodHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvaXVhLXNzby9yZWFsbXMvY2gtaXVhIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImFjNGZkNjI2LWNiZGYtNGIzMC1hOTNhLTc0YTM2YWQyM2QwYiIsInR5cCI6IkJlYXJlciIsImF6cCI6ImNoLWl1YS1jbGllbnQiLCJzZXNzaW9uX3N0YXRlIjoiYzUyMTE2NjItY2VhNy00ZmFmLWFkZjktNDNiNTE2MGNjYjUwIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIvKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1jaC1pdWEiLCJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJwdXJwb3NlX29mX3VzZT11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC41fE5PUk0gcHJvZmlsZSBsYXVuY2ggZW1haWwiLCJzaWQiOiJjNTIxMTY2Mi1jZWE3LTRmYWYtYWRmOS00M2I1MTYwY2NiNTAiLCJleHRlbnNpb25zIjp7ImNoX2VwciI6eyJ1c2VyX2lkX3F1YWxpZmllciI6InVybjpnczE6Z2xuIiwidXNlcl9pZCI6Ijc2MDEwMDI0NjczNzMifSwiY2hfaXVhIjp7ImxhdW5jaCI6ImxhdW5jaCJ9LCJpaGVfaXVhIjp7InB1cnBvc2Vfb2ZfdXNlIjp7ImNvZGUiOiJOT1JNIiwic3lzdGVtIjoidXJuOm9pZDoyLjE2Ljc1Ni41LjMwLjEuMTI3LjMuMTAuNSJ9fX0sImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwibmFtZSI6InJyZXlub2xkcyBSZXlub2xkcyIsInByZWZlcnJlZF91c2VybmFtZSI6InJyZXlub2xkcyIsImdpdmVuX25hbWUiOiJycmV5bm9sZHMiLCJmYW1pbHlfbmFtZSI6IlJleW5vbGRzIn0.mT9ZTGNqTfsMBxoyGLaQlUr9PVcFItvlKmZxjY4_OAHqi4nE82S5n0mE4iy_5YL_sbYtNODI1L_LH6keBTCSbSOY5REkp_NLm4QLzdX4ynJ7Y_nMoD5H6TFqJTrllKVJ5IKtXhWv9bLQK35PLLPeNMZH4yl3ChlOlx0IH-zqHEPcOV69kN1vC7_Jjj0vx3d0RFvR_0sbfG3XnSiO3fpwwj2xYgRfZkfJqTuZ5404j9nu8TiPHtCRqQ_EPtEirUTG1ClX1DahJRKB-jwLHThxkKooUxsRAQZVhqayhLMV8sxwNkeHnNemhqreOkeDELxn2ZC-VOQLe9WRsX37QagO1g
+traceparent: 00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-00
 Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
--- a/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 005 - valid - with _format xml.txt
+++ b/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 005 - valid - with _format xml.txt
 GET CareServicesSelectiveSupplier/Practitioner?_format=xml HTTP/1.1
 Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJnVmd6VWtRZEtwZHVMbmF4bThKQy1JYTh0VUdNV0J1TTJZT2R3akthcEdzIn0.eyJleHAiOjE3MDgzNDg0ODUsImlhdCI6MTcwODM0ODE4NSwiYXV0aF90aW1lIjoxNzA4MzQ4MTQzLCJqdGkiOiI5OGZjZDFiNy0wZGE5LTRkZGQtODUwNy1hM2I1YmU3NmY0ZmIiLCJpc3MiOiJodHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvaXVhLXNzby9yZWFsbXMvY2gtaXVhIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImFjNGZkNjI2LWNiZGYtNGIzMC1hOTNhLTc0YTM2YWQyM2QwYiIsInR5cCI6IkJlYXJlciIsImF6cCI6ImNoLWl1YS1jbGllbnQiLCJzZXNzaW9uX3N0YXRlIjoiYzUyMTE2NjItY2VhNy00ZmFmLWFkZjktNDNiNTE2MGNjYjUwIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIvKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1jaC1pdWEiLCJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJwdXJwb3NlX29mX3VzZT11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC41fE5PUk0gcHJvZmlsZSBsYXVuY2ggZW1haWwiLCJzaWQiOiJjNTIxMTY2Mi1jZWE3LTRmYWYtYWRmOS00M2I1MTYwY2NiNTAiLCJleHRlbnNpb25zIjp7ImNoX2VwciI6eyJ1c2VyX2lkX3F1YWxpZmllciI6InVybjpnczE6Z2xuIiwidXNlcl9pZCI6Ijc2MDEwMDI0NjczNzMifSwiY2hfaXVhIjp7ImxhdW5jaCI6ImxhdW5jaCJ9LCJpaGVfaXVhIjp7InB1cnBvc2Vfb2ZfdXNlIjp7ImNvZGUiOiJOT1JNIiwic3lzdGVtIjoidXJuOm9pZDoyLjE2Ljc1Ni41LjMwLjEuMTI3LjMuMTAuNSJ9fX0sImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwibmFtZSI6InJyZXlub2xkcyBSZXlub2xkcyIsInByZWZlcnJlZF91c2VybmFtZSI6InJyZXlub2xkcyIsImdpdmVuX25hbWUiOiJycmV5bm9sZHMiLCJmYW1pbHlfbmFtZSI6IlJleW5vbGRzIn0.mT9ZTGNqTfsMBxoyGLaQlUr9PVcFItvlKmZxjY4_OAHqi4nE82S5n0mE4iy_5YL_sbYtNODI1L_LH6keBTCSbSOY5REkp_NLm4QLzdX4ynJ7Y_nMoD5H6TFqJTrllKVJ5IKtXhWv9bLQK35PLLPeNMZH4yl3ChlOlx0IH-zqHEPcOV69kN1vC7_Jjj0vx3d0RFvR_0sbfG3XnSiO3fpwwj2xYgRfZkfJqTuZ5404j9nu8TiPHtCRqQ_EPtEirUTG1ClX1DahJRKB-jwLHThxkKooUxsRAQZVhqayhLMV8sxwNkeHnNemhqreOkeDELxn2ZC-VOQLe9WRsX37QagO1g
+traceparent: 00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-00
 Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
--- a/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 006 - valid - with _sort.txt
+++ b/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 006 - valid - with _sort.txt
 GET CareServicesSelectiveSupplier/Practitioner?_sort=type,name,-_lastUpdated HTTP/1.1
 Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJnVmd6VWtRZEtwZHVMbmF4bThKQy1JYTh0VUdNV0J1TTJZT2R3akthcEdzIn0.eyJleHAiOjE3MDgzNDg0ODUsImlhdCI6MTcwODM0ODE4NSwiYXV0aF90aW1lIjoxNzA4MzQ4MTQzLCJqdGkiOiI5OGZjZDFiNy0wZGE5LTRkZGQtODUwNy1hM2I1YmU3NmY0ZmIiLCJpc3MiOiJodHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvaXVhLXNzby9yZWFsbXMvY2gtaXVhIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImFjNGZkNjI2LWNiZGYtNGIzMC1hOTNhLTc0YTM2YWQyM2QwYiIsInR5cCI6IkJlYXJlciIsImF6cCI6ImNoLWl1YS1jbGllbnQiLCJzZXNzaW9uX3N0YXRlIjoiYzUyMTE2NjItY2VhNy00ZmFmLWFkZjktNDNiNTE2MGNjYjUwIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIvKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1jaC1pdWEiLCJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJwdXJwb3NlX29mX3VzZT11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC41fE5PUk0gcHJvZmlsZSBsYXVuY2ggZW1haWwiLCJzaWQiOiJjNTIxMTY2Mi1jZWE3LTRmYWYtYWRmOS00M2I1MTYwY2NiNTAiLCJleHRlbnNpb25zIjp7ImNoX2VwciI6eyJ1c2VyX2lkX3F1YWxpZmllciI6InVybjpnczE6Z2xuIiwidXNlcl9pZCI6Ijc2MDEwMDI0NjczNzMifSwiY2hfaXVhIjp7ImxhdW5jaCI6ImxhdW5jaCJ9LCJpaGVfaXVhIjp7InB1cnBvc2Vfb2ZfdXNlIjp7ImNvZGUiOiJOT1JNIiwic3lzdGVtIjoidXJuOm9pZDoyLjE2Ljc1Ni41LjMwLjEuMTI3LjMuMTAuNSJ9fX0sImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwibmFtZSI6InJyZXlub2xkcyBSZXlub2xkcyIsInByZWZlcnJlZF91c2VybmFtZSI6InJyZXlub2xkcyIsImdpdmVuX25hbWUiOiJycmV5bm9sZHMiLCJmYW1pbHlfbmFtZSI6IlJleW5vbGRzIn0.mT9ZTGNqTfsMBxoyGLaQlUr9PVcFItvlKmZxjY4_OAHqi4nE82S5n0mE4iy_5YL_sbYtNODI1L_LH6keBTCSbSOY5REkp_NLm4QLzdX4ynJ7Y_nMoD5H6TFqJTrllKVJ5IKtXhWv9bLQK35PLLPeNMZH4yl3ChlOlx0IH-zqHEPcOV69kN1vC7_Jjj0vx3d0RFvR_0sbfG3XnSiO3fpwwj2xYgRfZkfJqTuZ5404j9nu8TiPHtCRqQ_EPtEirUTG1ClX1DahJRKB-jwLHThxkKooUxsRAQZVhqayhLMV8sxwNkeHnNemhqreOkeDELxn2ZC-VOQLe9WRsX37QagO1g
+traceparent: 00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-00
 Host: ehealthsuisse.ihe-europe.net
 The client can indicate which order to return the results by using the parameter _sort, which can contain a comma-separated list of sort rules in priority order.

--- a/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 007 - valid - with _count.txt
+++ b/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 007 - valid - with _count.txt
 GET CareServicesSelectiveSupplier/Practitioner?_count=4 HTTP/1.1
 Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJnVmd6VWtRZEtwZHVMbmF4bThKQy1JYTh0VUdNV0J1TTJZT2R3akthcEdzIn0.eyJleHAiOjE3MDgzNDg0ODUsImlhdCI6MTcwODM0ODE4NSwiYXV0aF90aW1lIjoxNzA4MzQ4MTQzLCJqdGkiOiI5OGZjZDFiNy0wZGE5LTRkZGQtODUwNy1hM2I1YmU3NmY0ZmIiLCJpc3MiOiJodHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvaXVhLXNzby9yZWFsbXMvY2gtaXVhIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImFjNGZkNjI2LWNiZGYtNGIzMC1hOTNhLTc0YTM2YWQyM2QwYiIsInR5cCI6IkJlYXJlciIsImF6cCI6ImNoLWl1YS1jbGllbnQiLCJzZXNzaW9uX3N0YXRlIjoiYzUyMTE2NjItY2VhNy00ZmFmLWFkZjktNDNiNTE2MGNjYjUwIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIvKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1jaC1pdWEiLCJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJwdXJwb3NlX29mX3VzZT11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC41fE5PUk0gcHJvZmlsZSBsYXVuY2ggZW1haWwiLCJzaWQiOiJjNTIxMTY2Mi1jZWE3LTRmYWYtYWRmOS00M2I1MTYwY2NiNTAiLCJleHRlbnNpb25zIjp7ImNoX2VwciI6eyJ1c2VyX2lkX3F1YWxpZmllciI6InVybjpnczE6Z2xuIiwidXNlcl9pZCI6Ijc2MDEwMDI0NjczNzMifSwiY2hfaXVhIjp7ImxhdW5jaCI6ImxhdW5jaCJ9LCJpaGVfaXVhIjp7InB1cnBvc2Vfb2ZfdXNlIjp7ImNvZGUiOiJOT1JNIiwic3lzdGVtIjoidXJuOm9pZDoyLjE2Ljc1Ni41LjMwLjEuMTI3LjMuMTAuNSJ9fX0sImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwibmFtZSI6InJyZXlub2xkcyBSZXlub2xkcyIsInByZWZlcnJlZF91c2VybmFtZSI6InJyZXlub2xkcyIsImdpdmVuX25hbWUiOiJycmV5bm9sZHMiLCJmYW1pbHlfbmFtZSI6IlJleW5vbGRzIn0.mT9ZTGNqTfsMBxoyGLaQlUr9PVcFItvlKmZxjY4_OAHqi4nE82S5n0mE4iy_5YL_sbYtNODI1L_LH6keBTCSbSOY5REkp_NLm4QLzdX4ynJ7Y_nMoD5H6TFqJTrllKVJ5IKtXhWv9bLQK35PLLPeNMZH4yl3ChlOlx0IH-zqHEPcOV69kN1vC7_Jjj0vx3d0RFvR_0sbfG3XnSiO3fpwwj2xYgRfZkfJqTuZ5404j9nu8TiPHtCRqQ_EPtEirUTG1ClX1DahJRKB-jwLHThxkKooUxsRAQZVhqayhLMV8sxwNkeHnNemhqreOkeDELxn2ZC-VOQLe9WRsX37QagO1g
+traceparent: 00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-00
 Host: ehealthsuisse.ihe-europe.net
--- a/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 008 - valid - with active false.txt
+++ b/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 008 - valid - with active false.txt
 GET CareServicesSelectiveSupplier/Practitioner?active=false HTTP/1.1
 Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJnVmd6VWtRZEtwZHVMbmF4bThKQy1JYTh0VUdNV0J1TTJZT2R3akthcEdzIn0.eyJleHAiOjE3MDgzNDg0ODUsImlhdCI6MTcwODM0ODE4NSwiYXV0aF90aW1lIjoxNzA4MzQ4MTQzLCJqdGkiOiI5OGZjZDFiNy0wZGE5LTRkZGQtODUwNy1hM2I1YmU3NmY0ZmIiLCJpc3MiOiJodHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvaXVhLXNzby9yZWFsbXMvY2gtaXVhIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImFjNGZkNjI2LWNiZGYtNGIzMC1hOTNhLTc0YTM2YWQyM2QwYiIsInR5cCI6IkJlYXJlciIsImF6cCI6ImNoLWl1YS1jbGllbnQiLCJzZXNzaW9uX3N0YXRlIjoiYzUyMTE2NjItY2VhNy00ZmFmLWFkZjktNDNiNTE2MGNjYjUwIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIvKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1jaC1pdWEiLCJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJwdXJwb3NlX29mX3VzZT11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC41fE5PUk0gcHJvZmlsZSBsYXVuY2ggZW1haWwiLCJzaWQiOiJjNTIxMTY2Mi1jZWE3LTRmYWYtYWRmOS00M2I1MTYwY2NiNTAiLCJleHRlbnNpb25zIjp7ImNoX2VwciI6eyJ1c2VyX2lkX3F1YWxpZmllciI6InVybjpnczE6Z2xuIiwidXNlcl9pZCI6Ijc2MDEwMDI0NjczNzMifSwiY2hfaXVhIjp7ImxhdW5jaCI6ImxhdW5jaCJ9LCJpaGVfaXVhIjp7InB1cnBvc2Vfb2ZfdXNlIjp7ImNvZGUiOiJOT1JNIiwic3lzdGVtIjoidXJuOm9pZDoyLjE2Ljc1Ni41LjMwLjEuMTI3LjMuMTAuNSJ9fX0sImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwibmFtZSI6InJyZXlub2xkcyBSZXlub2xkcyIsInByZWZlcnJlZF91c2VybmFtZSI6InJyZXlub2xkcyIsImdpdmVuX25hbWUiOiJycmV5bm9sZHMiLCJmYW1pbHlfbmFtZSI6IlJleW5vbGRzIn0.mT9ZTGNqTfsMBxoyGLaQlUr9PVcFItvlKmZxjY4_OAHqi4nE82S5n0mE4iy_5YL_sbYtNODI1L_LH6keBTCSbSOY5REkp_NLm4QLzdX4ynJ7Y_nMoD5H6TFqJTrllKVJ5IKtXhWv9bLQK35PLLPeNMZH4yl3ChlOlx0IH-zqHEPcOV69kN1vC7_Jjj0vx3d0RFvR_0sbfG3XnSiO3fpwwj2xYgRfZkfJqTuZ5404j9nu8TiPHtCRqQ_EPtEirUTG1ClX1DahJRKB-jwLHThxkKooUxsRAQZVhqayhLMV8sxwNkeHnNemhqreOkeDELxn2ZC-VOQLe9WRsX37QagO1g
+traceparent: 00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-00
 Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
--- a/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 008 - valid - with active true.txt
+++ b/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 008 - valid - with active true.txt
 GET CareServicesSelectiveSupplier/Practitioner?active=true HTTP/1.1
 Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJnVmd6VWtRZEtwZHVMbmF4bThKQy1JYTh0VUdNV0J1TTJZT2R3akthcEdzIn0.eyJleHAiOjE3MDgzNDg0ODUsImlhdCI6MTcwODM0ODE4NSwiYXV0aF90aW1lIjoxNzA4MzQ4MTQzLCJqdGkiOiI5OGZjZDFiNy0wZGE5LTRkZGQtODUwNy1hM2I1YmU3NmY0ZmIiLCJpc3MiOiJodHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvaXVhLXNzby9yZWFsbXMvY2gtaXVhIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImFjNGZkNjI2LWNiZGYtNGIzMC1hOTNhLTc0YTM2YWQyM2QwYiIsInR5cCI6IkJlYXJlciIsImF6cCI6ImNoLWl1YS1jbGllbnQiLCJzZXNzaW9uX3N0YXRlIjoiYzUyMTE2NjItY2VhNy00ZmFmLWFkZjktNDNiNTE2MGNjYjUwIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIvKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1jaC1pdWEiLCJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJwdXJwb3NlX29mX3VzZT11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC41fE5PUk0gcHJvZmlsZSBsYXVuY2ggZW1haWwiLCJzaWQiOiJjNTIxMTY2Mi1jZWE3LTRmYWYtYWRmOS00M2I1MTYwY2NiNTAiLCJleHRlbnNpb25zIjp7ImNoX2VwciI6eyJ1c2VyX2lkX3F1YWxpZmllciI6InVybjpnczE6Z2xuIiwidXNlcl9pZCI6Ijc2MDEwMDI0NjczNzMifSwiY2hfaXVhIjp7ImxhdW5jaCI6ImxhdW5jaCJ9LCJpaGVfaXVhIjp7InB1cnBvc2Vfb2ZfdXNlIjp7ImNvZGUiOiJOT1JNIiwic3lzdGVtIjoidXJuOm9pZDoyLjE2Ljc1Ni41LjMwLjEuMTI3LjMuMTAuNSJ9fX0sImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwibmFtZSI6InJyZXlub2xkcyBSZXlub2xkcyIsInByZWZlcnJlZF91c2VybmFtZSI6InJyZXlub2xkcyIsImdpdmVuX25hbWUiOiJycmV5bm9sZHMiLCJmYW1pbHlfbmFtZSI6IlJleW5vbGRzIn0.mT9ZTGNqTfsMBxoyGLaQlUr9PVcFItvlKmZxjY4_OAHqi4nE82S5n0mE4iy_5YL_sbYtNODI1L_LH6keBTCSbSOY5REkp_NLm4QLzdX4ynJ7Y_nMoD5H6TFqJTrllKVJ5IKtXhWv9bLQK35PLLPeNMZH4yl3ChlOlx0IH-zqHEPcOV69kN1vC7_Jjj0vx3d0RFvR_0sbfG3XnSiO3fpwwj2xYgRfZkfJqTuZ5404j9nu8TiPHtCRqQ_EPtEirUTG1ClX1DahJRKB-jwLHThxkKooUxsRAQZVhqayhLMV8sxwNkeHnNemhqreOkeDELxn2ZC-VOQLe9WRsX37QagO1g
+traceparent: 00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-00
 Host: ehealthsuisse.ihe-europe.net
\ No newline at end of file
--- a/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 009 - valid - with identifier orga.txt
+++ b/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 009 - valid - with identifier orga.txt
 GET CareServicesSelectiveSupplier/Practitioner?identifier=uid%3DCommunityA%3A00000003002%2COU%3DHCProfessional%2CDC%3DHPD%2CO%3DBAG%2CC%3Dch HTTP/1.1
 Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJnVmd6VWtRZEtwZHVMbmF4bThKQy1JYTh0VUdNV0J1TTJZT2R3akthcEdzIn0.eyJleHAiOjE3MDgzNDg0ODUsImlhdCI6MTcwODM0ODE4NSwiYXV0aF90aW1lIjoxNzA4MzQ4MTQzLCJqdGkiOiI5OGZjZDFiNy0wZGE5LTRkZGQtODUwNy1hM2I1YmU3NmY0ZmIiLCJpc3MiOiJodHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvaXVhLXNzby9yZWFsbXMvY2gtaXVhIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImFjNGZkNjI2LWNiZGYtNGIzMC1hOTNhLTc0YTM2YWQyM2QwYiIsInR5cCI6IkJlYXJlciIsImF6cCI6ImNoLWl1YS1jbGllbnQiLCJzZXNzaW9uX3N0YXRlIjoiYzUyMTE2NjItY2VhNy00ZmFmLWFkZjktNDNiNTE2MGNjYjUwIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIvKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1jaC1pdWEiLCJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJwdXJwb3NlX29mX3VzZT11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC41fE5PUk0gcHJvZmlsZSBsYXVuY2ggZW1haWwiLCJzaWQiOiJjNTIxMTY2Mi1jZWE3LTRmYWYtYWRmOS00M2I1MTYwY2NiNTAiLCJleHRlbnNpb25zIjp7ImNoX2VwciI6eyJ1c2VyX2lkX3F1YWxpZmllciI6InVybjpnczE6Z2xuIiwidXNlcl9pZCI6Ijc2MDEwMDI0NjczNzMifSwiY2hfaXVhIjp7ImxhdW5jaCI6ImxhdW5jaCJ9LCJpaGVfaXVhIjp7InB1cnBvc2Vfb2ZfdXNlIjp7ImNvZGUiOiJOT1JNIiwic3lzdGVtIjoidXJuOm9pZDoyLjE2Ljc1Ni41LjMwLjEuMTI3LjMuMTAuNSJ9fX0sImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwibmFtZSI6InJyZXlub2xkcyBSZXlub2xkcyIsInByZWZlcnJlZF91c2VybmFtZSI6InJyZXlub2xkcyIsImdpdmVuX25hbWUiOiJycmV5bm9sZHMiLCJmYW1pbHlfbmFtZSI6IlJleW5vbGRzIn0.mT9ZTGNqTfsMBxoyGLaQlUr9PVcFItvlKmZxjY4_OAHqi4nE82S5n0mE4iy_5YL_sbYtNODI1L_LH6keBTCSbSOY5REkp_NLm4QLzdX4ynJ7Y_nMoD5H6TFqJTrllKVJ5IKtXhWv9bLQK35PLLPeNMZH4yl3ChlOlx0IH-zqHEPcOV69kN1vC7_Jjj0vx3d0RFvR_0sbfG3XnSiO3fpwwj2xYgRfZkfJqTuZ5404j9nu8TiPHtCRqQ_EPtEirUTG1ClX1DahJRKB-jwLHThxkKooUxsRAQZVhqayhLMV8sxwNkeHnNemhqreOkeDELxn2ZC-VOQLe9WRsX37QagO1g
+traceparent: 00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-00
 Host: ehealthsuisse.ihe-europe.net
--- a/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 009 - valid - with identifier patientId.txt
+++ b/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 009 - valid - with identifier patientId.txt
 GET CareServicesSelectiveSupplier/Practitioner?identifier=urn:oid:2.51.1.3%7C7601000102737 HTTP/1.1
 Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJnVmd6VWtRZEtwZHVMbmF4bThKQy1JYTh0VUdNV0J1TTJZT2R3akthcEdzIn0.eyJleHAiOjE3MDgzNDg0ODUsImlhdCI6MTcwODM0ODE4NSwiYXV0aF90aW1lIjoxNzA4MzQ4MTQzLCJqdGkiOiI5OGZjZDFiNy0wZGE5LTRkZGQtODUwNy1hM2I1YmU3NmY0ZmIiLCJpc3MiOiJodHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvaXVhLXNzby9yZWFsbXMvY2gtaXVhIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImFjNGZkNjI2LWNiZGYtNGIzMC1hOTNhLTc0YTM2YWQyM2QwYiIsInR5cCI6IkJlYXJlciIsImF6cCI6ImNoLWl1YS1jbGllbnQiLCJzZXNzaW9uX3N0YXRlIjoiYzUyMTE2NjItY2VhNy00ZmFmLWFkZjktNDNiNTE2MGNjYjUwIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIvKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1jaC1pdWEiLCJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJwdXJwb3NlX29mX3VzZT11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC41fE5PUk0gcHJvZmlsZSBsYXVuY2ggZW1haWwiLCJzaWQiOiJjNTIxMTY2Mi1jZWE3LTRmYWYtYWRmOS00M2I1MTYwY2NiNTAiLCJleHRlbnNpb25zIjp7ImNoX2VwciI6eyJ1c2VyX2lkX3F1YWxpZmllciI6InVybjpnczE6Z2xuIiwidXNlcl9pZCI6Ijc2MDEwMDI0NjczNzMifSwiY2hfaXVhIjp7ImxhdW5jaCI6ImxhdW5jaCJ9LCJpaGVfaXVhIjp7InB1cnBvc2Vfb2ZfdXNlIjp7ImNvZGUiOiJOT1JNIiwic3lzdGVtIjoidXJuOm9pZDoyLjE2Ljc1Ni41LjMwLjEuMTI3LjMuMTAuNSJ9fX0sImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwibmFtZSI6InJyZXlub2xkcyBSZXlub2xkcyIsInByZWZlcnJlZF91c2VybmFtZSI6InJyZXlub2xkcyIsImdpdmVuX25hbWUiOiJycmV5bm9sZHMiLCJmYW1pbHlfbmFtZSI6IlJleW5vbGRzIn0.mT9ZTGNqTfsMBxoyGLaQlUr9PVcFItvlKmZxjY4_OAHqi4nE82S5n0mE4iy_5YL_sbYtNODI1L_LH6keBTCSbSOY5REkp_NLm4QLzdX4ynJ7Y_nMoD5H6TFqJTrllKVJ5IKtXhWv9bLQK35PLLPeNMZH4yl3ChlOlx0IH-zqHEPcOV69kN1vC7_Jjj0vx3d0RFvR_0sbfG3XnSiO3fpwwj2xYgRfZkfJqTuZ5404j9nu8TiPHtCRqQ_EPtEirUTG1ClX1DahJRKB-jwLHThxkKooUxsRAQZVhqayhLMV8sxwNkeHnNemhqreOkeDELxn2ZC-VOQLe9WRsX37QagO1g
+traceparent: 00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-00
 Host: ehealthsuisse.ihe-europe.net
--- a/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 010 - valid - with name.txt
+++ b/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 010 - valid - with name.txt
 GET CareServicesSelectiveSupplier/Practitioner?name=Peter%20Pan HTTP/1.1
 Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJnVmd6VWtRZEtwZHVMbmF4bThKQy1JYTh0VUdNV0J1TTJZT2R3akthcEdzIn0.eyJleHAiOjE3MDgzNDg0ODUsImlhdCI6MTcwODM0ODE4NSwiYXV0aF90aW1lIjoxNzA4MzQ4MTQzLCJqdGkiOiI5OGZjZDFiNy0wZGE5LTRkZGQtODUwNy1hM2I1YmU3NmY0ZmIiLCJpc3MiOiJodHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvaXVhLXNzby9yZWFsbXMvY2gtaXVhIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImFjNGZkNjI2LWNiZGYtNGIzMC1hOTNhLTc0YTM2YWQyM2QwYiIsInR5cCI6IkJlYXJlciIsImF6cCI6ImNoLWl1YS1jbGllbnQiLCJzZXNzaW9uX3N0YXRlIjoiYzUyMTE2NjItY2VhNy00ZmFmLWFkZjktNDNiNTE2MGNjYjUwIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIvKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1jaC1pdWEiLCJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJwdXJwb3NlX29mX3VzZT11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC41fE5PUk0gcHJvZmlsZSBsYXVuY2ggZW1haWwiLCJzaWQiOiJjNTIxMTY2Mi1jZWE3LTRmYWYtYWRmOS00M2I1MTYwY2NiNTAiLCJleHRlbnNpb25zIjp7ImNoX2VwciI6eyJ1c2VyX2lkX3F1YWxpZmllciI6InVybjpnczE6Z2xuIiwidXNlcl9pZCI6Ijc2MDEwMDI0NjczNzMifSwiY2hfaXVhIjp7ImxhdW5jaCI6ImxhdW5jaCJ9LCJpaGVfaXVhIjp7InB1cnBvc2Vfb2ZfdXNlIjp7ImNvZGUiOiJOT1JNIiwic3lzdGVtIjoidXJuOm9pZDoyLjE2Ljc1Ni41LjMwLjEuMTI3LjMuMTAuNSJ9fX0sImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwibmFtZSI6InJyZXlub2xkcyBSZXlub2xkcyIsInByZWZlcnJlZF91c2VybmFtZSI6InJyZXlub2xkcyIsImdpdmVuX25hbWUiOiJycmV5bm9sZHMiLCJmYW1pbHlfbmFtZSI6IlJleW5vbGRzIn0.mT9ZTGNqTfsMBxoyGLaQlUr9PVcFItvlKmZxjY4_OAHqi4nE82S5n0mE4iy_5YL_sbYtNODI1L_LH6keBTCSbSOY5REkp_NLm4QLzdX4ynJ7Y_nMoD5H6TFqJTrllKVJ5IKtXhWv9bLQK35PLLPeNMZH4yl3ChlOlx0IH-zqHEPcOV69kN1vC7_Jjj0vx3d0RFvR_0sbfG3XnSiO3fpwwj2xYgRfZkfJqTuZ5404j9nu8TiPHtCRqQ_EPtEirUTG1ClX1DahJRKB-jwLHThxkKooUxsRAQZVhqayhLMV8sxwNkeHnNemhqreOkeDELxn2ZC-VOQLe9WRsX37QagO1g
+traceparent: 00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-00
 Host: ehealthsuisse.ihe-europe.net
 GET CareServicesSelectiveSupplier/Practitioner?name=contains:Peter%20Pan HTTP/1.1
 Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJnVmd6VWtRZEtwZHVMbmF4bThKQy1JYTh0VUdNV0J1TTJZT2R3akthcEdzIn0.eyJleHAiOjE3MDgzNDg0ODUsImlhdCI6MTcwODM0ODE4NSwiYXV0aF90aW1lIjoxNzA4MzQ4MTQzLCJqdGkiOiI5OGZjZDFiNy0wZGE5LTRkZGQtODUwNy1hM2I1YmU3NmY0ZmIiLCJpc3MiOiJodHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvaXVhLXNzby9yZWFsbXMvY2gtaXVhIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImFjNGZkNjI2LWNiZGYtNGIzMC1hOTNhLTc0YTM2YWQyM2QwYiIsInR5cCI6IkJlYXJlciIsImF6cCI6ImNoLWl1YS1jbGllbnQiLCJzZXNzaW9uX3N0YXRlIjoiYzUyMTE2NjItY2VhNy00ZmFmLWFkZjktNDNiNTE2MGNjYjUwIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIvKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1jaC1pdWEiLCJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJwdXJwb3NlX29mX3VzZT11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC41fE5PUk0gcHJvZmlsZSBsYXVuY2ggZW1haWwiLCJzaWQiOiJjNTIxMTY2Mi1jZWE3LTRmYWYtYWRmOS00M2I1MTYwY2NiNTAiLCJleHRlbnNpb25zIjp7ImNoX2VwciI6eyJ1c2VyX2lkX3F1YWxpZmllciI6InVybjpnczE6Z2xuIiwidXNlcl9pZCI6Ijc2MDEwMDI0NjczNzMifSwiY2hfaXVhIjp7ImxhdW5jaCI6ImxhdW5jaCJ9LCJpaGVfaXVhIjp7InB1cnBvc2Vfb2ZfdXNlIjp7ImNvZGUiOiJOT1JNIiwic3lzdGVtIjoidXJuOm9pZDoyLjE2Ljc1Ni41LjMwLjEuMTI3LjMuMTAuNSJ9fX0sImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwibmFtZSI6InJyZXlub2xkcyBSZXlub2xkcyIsInByZWZlcnJlZF91c2VybmFtZSI6InJyZXlub2xkcyIsImdpdmVuX25hbWUiOiJycmV5bm9sZHMiLCJmYW1pbHlfbmFtZSI6IlJleW5vbGRzIn0.mT9ZTGNqTfsMBxoyGLaQlUr9PVcFItvlKmZxjY4_OAHqi4nE82S5n0mE4iy_5YL_sbYtNODI1L_LH6keBTCSbSOY5REkp_NLm4QLzdX4ynJ7Y_nMoD5H6TFqJTrllKVJ5IKtXhWv9bLQK35PLLPeNMZH4yl3ChlOlx0IH-zqHEPcOV69kN1vC7_Jjj0vx3d0RFvR_0sbfG3XnSiO3fpwwj2xYgRfZkfJqTuZ5404j9nu8TiPHtCRqQ_EPtEirUTG1ClX1DahJRKB-jwLHThxkKooUxsRAQZVhqayhLMV8sxwNkeHnNemhqreOkeDELxn2ZC-VOQLe9WRsX37QagO1g
+traceparent: 00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-00
 Host: ehealthsuisse.ihe-europe.net
 GET CareServicesSelectiveSupplier/Practitioner?name=exact:Peter%20Pan HTTP/1.1
 Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJnVmd6VWtRZEtwZHVMbmF4bThKQy1JYTh0VUdNV0J1TTJZT2R3akthcEdzIn0.eyJleHAiOjE3MDgzNDg0ODUsImlhdCI6MTcwODM0ODE4NSwiYXV0aF90aW1lIjoxNzA4MzQ4MTQzLCJqdGkiOiI5OGZjZDFiNy0wZGE5LTRkZGQtODUwNy1hM2I1YmU3NmY0ZmIiLCJpc3MiOiJodHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvaXVhLXNzby9yZWFsbXMvY2gtaXVhIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImFjNGZkNjI2LWNiZGYtNGIzMC1hOTNhLTc0YTM2YWQyM2QwYiIsInR5cCI6IkJlYXJlciIsImF6cCI6ImNoLWl1YS1jbGllbnQiLCJzZXNzaW9uX3N0YXRlIjoiYzUyMTE2NjItY2VhNy00ZmFmLWFkZjktNDNiNTE2MGNjYjUwIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIvKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1jaC1pdWEiLCJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJwdXJwb3NlX29mX3VzZT11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC41fE5PUk0gcHJvZmlsZSBsYXVuY2ggZW1haWwiLCJzaWQiOiJjNTIxMTY2Mi1jZWE3LTRmYWYtYWRmOS00M2I1MTYwY2NiNTAiLCJleHRlbnNpb25zIjp7ImNoX2VwciI6eyJ1c2VyX2lkX3F1YWxpZmllciI6InVybjpnczE6Z2xuIiwidXNlcl9pZCI6Ijc2MDEwMDI0NjczNzMifSwiY2hfaXVhIjp7ImxhdW5jaCI6ImxhdW5jaCJ9LCJpaGVfaXVhIjp7InB1cnBvc2Vfb2ZfdXNlIjp7ImNvZGUiOiJOT1JNIiwic3lzdGVtIjoidXJuOm9pZDoyLjE2Ljc1Ni41LjMwLjEuMTI3LjMuMTAuNSJ9fX0sImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwibmFtZSI6InJyZXlub2xkcyBSZXlub2xkcyIsInByZWZlcnJlZF91c2VybmFtZSI6InJyZXlub2xkcyIsImdpdmVuX25hbWUiOiJycmV5bm9sZHMiLCJmYW1pbHlfbmFtZSI6IlJleW5vbGRzIn0.mT9ZTGNqTfsMBxoyGLaQlUr9PVcFItvlKmZxjY4_OAHqi4nE82S5n0mE4iy_5YL_sbYtNODI1L_LH6keBTCSbSOY5REkp_NLm4QLzdX4ynJ7Y_nMoD5H6TFqJTrllKVJ5IKtXhWv9bLQK35PLLPeNMZH4yl3ChlOlx0IH-zqHEPcOV69kN1vC7_Jjj0vx3d0RFvR_0sbfG3XnSiO3fpwwj2xYgRfZkfJqTuZ5404j9nu8TiPHtCRqQ_EPtEirUTG1ClX1DahJRKB-jwLHThxkKooUxsRAQZVhqayhLMV8sxwNkeHnNemhqreOkeDELxn2ZC-VOQLe9WRsX37QagO1g
-Host: ehealthsuisse.ihe-europe.net
+traceparent: 00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-00
\ No newline at end of file
+Host: ehealthsuisse.ihe-europe.net
--- a/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 011 - valid - with given.txt
+++ b/EHS/samples/CH-mCSD/ITI-90/B - Practitioner/CH-mCSD - 011 - valid - with given.txt
 GET CareServicesSelectiveSupplier/Practitioner?given=Peter HTTP/1.1
 Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJnVmd6VWtRZEtwZHVMbmF4bThKQy1JYTh0VUdNV0J1TTJZT2R3akthcEdzIn0.eyJleHAiOjE3MDgzNDg0ODUsImlhdCI6MTcwODM0ODE4NSwiYXV0aF90aW1lIjoxNzA4MzQ4MTQzLCJqdGkiOiI5OGZjZDFiNy0wZGE5LTRkZGQtODUwNy1hM2I1YmU3NmY0ZmIiLCJpc3MiOiJodHRwczovL2VoZWFsdGhzdWlzc2UuaWhlLWV1cm9wZS5uZXQvaXVhLXNzby9yZWFsbXMvY2gtaXVhIiwiYXVkIjoiYWNjb3VudCIsInN1YiI6ImFjNGZkNjI2LWNiZGYtNGIzMC1hOTNhLTc0YTM2YWQyM2QwYiIsInR5cCI6IkJlYXJlciIsImF6cCI6ImNoLWl1YS1jbGllbnQiLCJzZXNzaW9uX3N0YXRlIjoiYzUyMTE2NjItY2VhNy00ZmFmLWFkZjktNDNiNTE2MGNjYjUwIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIvKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1jaC1pdWEiLCJvZmZsaW5lX2FjY2VzcyIsInVtYV9hdXRob3JpemF0aW9uIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJwdXJwb3NlX29mX3VzZT11cm46b2lkOjIuMTYuNzU2LjUuMzAuMS4xMjcuMy4xMC41fE5PUk0gcHJvZmlsZSBsYXVuY2ggZW1haWwiLCJzaWQiOiJjNTIxMTY2Mi1jZWE3LTRmYWYtYWRmOS00M2I1MTYwY2NiNTAiLCJleHRlbnNpb25zIjp7ImNoX2VwciI6eyJ1c2VyX2lkX3F1YWxpZmllciI6InVybjpnczE6Z2xuIiwidXNlcl9pZCI6Ijc2MDEwMDI0NjczNzMifSwiY2hfaXVhIjp7ImxhdW5jaCI6ImxhdW5jaCJ9LCJpaGVfaXVhIjp7InB1cnBvc2Vfb2ZfdXNlIjp7ImNvZGUiOiJOT1JNIiwic3lzdGVtIjoidXJuOm9pZDoyLjE2Ljc1Ni41LjMwLjEuMTI3LjMuMTAuNSJ9fX0sImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwibmFtZSI6InJyZXlub2xkcyBSZXlub2xkcyIsInByZWZlcnJlZF91c2VybmFtZSI6InJyZXlub2xkcyIsImdpdmVuX25hbWUiOiJycmV5bm9sZHMiLCJmYW1pbHlfbmFtZSI6IlJleW5vbGRzIn0.mT9ZTGNqTfsMBxoyGLaQlUr9PVcFItvlKmZxjY4_OAHqi4nE82S5n0mE4iy_5YL_sbYtNODI1L_LH6keBTCSbSOY5REkp_NLm4QLzdX4ynJ7Y_nMoD5H6TFqJTrllKVJ5IKtXhWv9bLQK35PLLPeNMZH4yl3ChlOlx0IH-zqHEPcOV69kN1vC7_Jjj0vx3d0RFvR_0sbfG3XnSiO3fpwwj2xYgRfZkfJqTuZ5404j9nu8TiPHtCRqQ_EPtEirUTG1ClX1DahJRKB-jwLHThxkKooUxsRAQZVhqayhLMV8sxwNkeHnNemhqreOkeDELxn2ZC-VOQLe9WRsX37QagO1g
+traceparent: 00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-00
 Host: ehealthsuisse.ihe-europe.net