diff --git a/api/EHRServer-v1.5_insomnia_5.16.6.json b/api/EHRServer-v1.5_insomnia_5.16.6.json
index f6fa74bab..d8df445d5 100644
--- a/api/EHRServer-v1.5_insomnia_5.16.6.json
+++ b/api/EHRServer-v1.5_insomnia_5.16.6.json
@@ -1,7 +1,7 @@
 {
 	"_type": "export",
 	"__export_format": 3,
-	"__export_date": "2019-05-15T19:12:24.639Z",
+	"__export_date": "2019-07-13T06:18:05.893Z",
 	"__export_source": "insomnia.desktop.app:v5.16.6",
 	"resources": [
 		{
@@ -38,7 +38,7 @@
 					"domain": "192.168.1.105",
 					"hostOnly": true,
 					"httpOnly": true,
-					"id": "5484892506602561",
+					"id": "11148173974537157",
 					"key": "JSESSIONID",
 					"lastAccessed": "2017-10-20T07:48:25.714Z",
 					"path": "/ehr/",
@@ -49,7 +49,7 @@
 					"domain": "192.168.1.104",
 					"hostOnly": true,
 					"httpOnly": true,
-					"id": "5424145674960581",
+					"id": "969665156057782",
 					"key": "JSESSIONID",
 					"lastAccessed": "2017-11-02T00:33:30.408Z",
 					"path": "/",
@@ -60,7 +60,7 @@
 					"domain": "192.168.1.106",
 					"hostOnly": true,
 					"httpOnly": true,
-					"id": "557857221901753",
+					"id": "39102882309708686",
 					"key": "JSESSIONID",
 					"lastAccessed": "2017-12-22T03:18:12.225Z",
 					"path": "/ehr/",
@@ -71,7 +71,7 @@
 					"domain": "192.168.1.109",
 					"hostOnly": true,
 					"httpOnly": true,
-					"id": "2821355152447995",
+					"id": "130345972524871",
 					"key": "JSESSIONID",
 					"lastAccessed": "2018-02-18T17:52:39.111Z",
 					"path": "/ehr/",
@@ -82,26 +82,26 @@
 					"domain": "localhost",
 					"hostOnly": true,
 					"httpOnly": true,
-					"id": "2065369464578788",
+					"id": "49192199131310876",
 					"key": "JSESSIONID",
-					"lastAccessed": "2019-05-04T06:50:05.254Z",
+					"lastAccessed": "2019-07-13T06:10:43.929Z",
 					"path": "/ehr/",
-					"value": "4988C9C986B6E72AF5F1FAFF3876B011"
+					"value": "56E08552DB68ED223E2A20D30C5D526C"
 				},
 				{
 					"creation": "2018-03-09T00:39:23.885Z",
 					"domain": "server001.cloudehrserver.com",
 					"hostOnly": true,
 					"httpOnly": true,
-					"id": "805937749053832",
+					"id": "9385979704977481",
 					"key": "JSESSIONID",
-					"lastAccessed": "2019-05-05T22:37:24.134Z",
+					"lastAccessed": "2019-05-16T19:23:01.148Z",
 					"path": "/",
-					"value": "ECC7F30696F4D6C235A509E5EDE3BE75"
+					"value": "B6ADBA8C023133B76DAF0D791CF34B1A"
 				}
 			],
 			"created": 1523686987910,
-			"modified": 1557095844134,
+			"modified": 1562998243931,
 			"name": "Default Jar",
 			"parentId": "wrk_731dc22ad3f14626becf12a0e3f62269",
 			"_type": "cookie_jar"
@@ -325,13 +325,13 @@
 						"disabled": false,
 						"id": "pair_65123949bc164f42ba7aea19cf3dbfa3",
 						"name": "username",
-						"value": "accman"
+						"value": "admin"
 					},
 					{
 						"disabled": false,
 						"id": "pair_118708ea144c4156a947eb3ee2b20eb6",
 						"name": "password",
-						"value": "accman098!"
+						"value": "admin"
 					},
 					{
 						"disabled": false,
@@ -359,7 +359,7 @@
 			"isPrivate": false,
 			"metaSortKey": -1507162182972,
 			"method": "POST",
-			"modified": 1557088888478,
+			"modified": 1562223694908,
 			"name": "login JSON",
 			"parameters": [],
 			"parentId": "fld_39b1525c0a2b461eac128813f9432fd5",
@@ -516,6 +516,40 @@
 			"url": "{{base_url}}/api/v1/users",
 			"_type": "request"
 		},
+		{
+			"_id": "req_3b9083efa9c9409180c34ebfccc91eaf",
+			"authentication": {},
+			"body": {},
+			"created": 1562223483313,
+			"description": "",
+			"headers": [
+				{
+					"id": "pair_00d15d6f7e6b455faf8d98b60cfcc7cf",
+					"name": "Authorization",
+					"value": "Bearer {% response 'body', 'req_7cda708f9e7f40a3a9901f8dd5c17b9f', '$.token' %}"
+				}
+			],
+			"isPrivate": false,
+			"metaSortKey": -1507162457186.0625,
+			"method": "GET",
+			"modified": 1562223491625,
+			"name": "users",
+			"parameters": [
+				{
+					"id": "pair_987d54b328f6482da8dd1b607307aa78",
+					"name": "format",
+					"value": "json"
+				}
+			],
+			"parentId": "fld_18f2ad482fe84ecf96d6be752433ac7a",
+			"settingDisableRenderRequestBody": false,
+			"settingEncodeUrl": true,
+			"settingRebuildPath": true,
+			"settingSendCookies": true,
+			"settingStoreCookies": true,
+			"url": "{{base_url}}/api/v1/users",
+			"_type": "request"
+		},
 		{
 			"_id": "req_de15e4e991bc4269afa8662f79fc442a",
 			"authentication": {},
@@ -769,13 +803,23 @@
 			"isPrivate": false,
 			"metaSortKey": -1507162420624.1875,
 			"method": "GET",
-			"modified": 1539220741767,
+			"modified": 1562998643192,
 			"name": "templates",
 			"parameters": [
 				{
 					"id": "pair_987d54b328f6482da8dd1b607307aa78",
 					"name": "format",
 					"value": "json"
+				},
+				{
+					"id": "pair_9ba530ded65a42de8f1b0d3e063d1850",
+					"name": "max",
+					"value": "5"
+				},
+				{
+					"id": "pair_a47b5afd14594ca0b44967b02e6db45e",
+					"name": "offset",
+					"value": "0"
 				}
 			],
 			"parentId": "fld_0278f8cc557146fcb81e794ab0ccd32a",
@@ -803,13 +847,18 @@
 			"isPrivate": false,
 			"metaSortKey": -1507162411483.7188,
 			"method": "GET",
-			"modified": 1539653089527,
+			"modified": 1561351278014,
 			"name": "templates/$uid",
 			"parameters": [
 				{
 					"id": "pair_a9c6964df38c4211bd7c3c77bcfbab35",
 					"name": "format",
-					"value": "json"
+					"value": "xml"
+				},
+				{
+					"id": "pair_1d7adc431c5f4ed5b838b3b823f4270e",
+					"name": "",
+					"value": ""
 				}
 			],
 			"parentId": "fld_0278f8cc557146fcb81e794ab0ccd32a",
@@ -826,7 +875,7 @@
 			"authentication": {},
 			"body": {
 				"mimeType": "application/xml",
-				"text": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?>\n<versions xmlns=\"http://schemas.openehr.org/v1\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n<version xsi:type=\"ORIGINAL_VERSION\">\n  <contribution>\n    <id xsi:type=\"HIER_OBJECT_ID\">\n      <value>{% uuid 'v4' %}</value>\n    </id>\n    <namespace>EHR::COMMON</namespace>\n    <type>CONTRIBUTION</type>\n  </contribution>\n  <commit_audit>\n    <system_id>CABOLABS_EHR</system_id>\n    <committer xsi:type=\"PARTY_IDENTIFIED\">\n      <name>Dr. Pablo Pazos</name>\n    </committer>\n    <time_committed>\n      <value>{% now 'iso-8601', '' %}</value>\n    </time_committed>\n    <change_type>\n      <value>creation</value>\n      <defining_code>\n        <terminology_id>\n          <value>openehr</value>\n        </terminology_id>\n        <code_string>249</code_string>\n      </defining_code>\n    </change_type>\n  </commit_audit>\n  <data xsi:type=\"COMPOSITION\" archetype_node_id=\"openEHR-EHR-COMPOSITION.test_all_datatypes.v1\">\n    <name>\n      <value>Test all datatypes</value>\n    </name>\n    <archetype_details>\n      <archetype_id>\n        <value>openEHR-EHR-COMPOSITION.test_all_datatypes.v1</value>\n      </archetype_id>\n      <template_id>\n        <value>test_all_datatypes.es.v1</value>\n      </template_id>\n      <rm_version>1.0.2</rm_version>\n    </archetype_details>\n    <language>\n      <terminology_id>\n        <value>ISO_639-1</value>\n      </terminology_id>\n      <code_string>es</code_string>\n    </language>\n    <territory>\n      <terminology_id>\n        <value>ISO_3166-1</value>\n      </terminology_id>\n      <code_string>UY</code_string>\n    </territory>\n    <category>\n      <value>event</value>\n      <defining_code>\n        <terminology_id>\n          <value>openehr</value>\n        </terminology_id>\n        <code_string>433</code_string>\n      </defining_code>\n    </category>\n    <composer xsi:type=\"PARTY_IDENTIFIED\">\n      <name>Dr. Pablo Pazos</name>\n    </composer>\n    <context>\n      <start_time>\n        <value>{% now 'iso-8601', '' %}</value>\n      </start_time>\n      <setting>\n        <value>Hospital Montevideo</value>\n        <defining_code>\n          <terminology_id>\n            <value>openehr</value>\n          </terminology_id>\n          <code_string>229</code_string>\n        </defining_code>\n      </setting>\n    </context>\n    <content xsi:type=\"OBSERVATION\" archetype_node_id=\"openEHR-EHR-OBSERVATION.test_all_datatypes.v1\">\n      <name>\n        <value>Blood Pressure</value>\n      </name>\n      <language>\n         <terminology_id>\n           <value>ISO_639-1</value>\n         </terminology_id>\n         <code_string>es</code_string>\n      </language>\n      <encoding>\n         <terminology_id>\n           <value>UNICODE</value>\n         </terminology_id>\n         <code_string>UTF-8</code_string>\n      </encoding>\n      <subject xsi:type=\"PARTY_IDENTIFIED\">\n        <external_ref>\n          <id xsi:type=\"HIER_OBJECT_ID\">\n            <value>11111111-1111-1111-1111-111111111111</value>\n          </id>\n          <namespace>DEMOGRAPHIC</namespace>\n          <type>PERSON</type>\n        </external_ref>\n      </subject>\n      <data xsi:type=\"HISTORY\" archetype_node_id=\"at0001\">\n        <name>\n          <value>history</value>\n        </name>\n        <origin>\n          <value>{% now 'iso-8601', 'YYYYMMDD' %}</value>\n        </origin>\n        <events xsi:type=\"POINT_EVENT\" archetype_node_id=\"at0002\">\n          <name>\n            <value>any event</value>\n          </name>\n          <time><value>{% now 'iso-8601', 'YYYYMMDD' %}</value></time>\n          <data xsi:type=\"ITEM_TREE\" archetype_node_id=\"at0003\">\n            <name>\n              <value>Arbol</value>\n            </name>\n            <items xsi:type=\"ELEMENT\" archetype_node_id=\"at0011\">\n              <name>\n                <value>Count</value>\n              </name>\n              <value xsi:type=\"DV_COUNT\">\n                <magnitude>4</magnitude>\n              </value>\n            </items>\n          </data>\n        </events>\n\t\t\t\t <events xsi:type=\"POINT_EVENT\" archetype_node_id=\"at0002\">\n          <name>\n            <value>any event</value>\n          </name>\n          <time><value>{% now 'iso-8601', 'YYYYMMDD' %}</value></time>\n          <data xsi:type=\"ITEM_TREE\" archetype_node_id=\"at0003\">\n            <name>\n              <value>Arbol</value>\n            </name>\n            <items xsi:type=\"ELEMENT\" archetype_node_id=\"at0011\">\n              <name>\n                <value>Count</value>\n              </name>\n              <value xsi:type=\"DV_COUNT\">\n                <magnitude>5</magnitude>\n              </value>\n            </items>\n          </data>\n        </events>\n\t\t\t\t <events xsi:type=\"POINT_EVENT\" archetype_node_id=\"at0002\">\n          <name>\n            <value>any event</value>\n          </name>\n          <time><value>{% now 'iso-8601', 'YYYYMMDD' %}</value></time>\n          <data xsi:type=\"ITEM_TREE\" archetype_node_id=\"at0003\">\n            <name>\n              <value>Arbol</value>\n            </name>\n            <items xsi:type=\"ELEMENT\" archetype_node_id=\"at0011\">\n              <name>\n                <value>Count</value>\n              </name>\n              <value xsi:type=\"DV_COUNT\">\n                <magnitude>6</magnitude>\n              </value>\n            </items>\n          </data>\n        </events>\n      </data>\n    </content>\n  </data>\n  <lifecycle_state>\n    <value>complete</value>\n    <defining_code>\n      <terminology_id>\n        <value>openehr</value>\n      </terminology_id>\n      <code_string>532</code_string>\n    </defining_code>\n  </lifecycle_state>\n</version>\n</versions>"
+				"text": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?>\n<versions xmlns=\"http://schemas.openehr.org/v1\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n<version xsi:type=\"ORIGINAL_VERSION\">\n  <contribution>\n    <id xsi:type=\"HIER_OBJECT_ID\">\n      <value>{% uuid 'v4' %}</value>\n    </id>\n    <namespace>EHR::COMMON</namespace>\n    <type>CONTRIBUTION</type>\n  </contribution>\n  <commit_audit>\n    <system_id>CABOLABS_EHR</system_id>\n    <committer xsi:type=\"PARTY_IDENTIFIED\">\n      <name>Dr. Pablo Pazos</name>\n    </committer>\n    <time_committed>\n      <value>{% now 'iso-8601', '' %}</value>\n    </time_committed>\n    <change_type>\n      <value>creation</value>\n      <defining_code>\n        <terminology_id>\n          <value>openehr</value>\n        </terminology_id>\n        <code_string>249</code_string>\n      </defining_code>\n    </change_type>\n  </commit_audit>\n  <data xsi:type=\"COMPOSITION\" archetype_node_id=\"openEHR-EHR-COMPOSITION.test_all_datatypes.v1\">\n    <name>\n      <value>Test all datatypes</value>\n    </name>\n    <archetype_details>\n      <archetype_id>\n        <value>openEHR-EHR-COMPOSITION.test_all_datatypes.v1</value>\n      </archetype_id>\n      <template_id>\n        <value>test_all_datatypes.es.v1</value>\n      </template_id>\n      <rm_version>1.0.2</rm_version>\n    </archetype_details>\n    <language>\n      <terminology_id>\n        <value>ISO_639-1</value>\n      </terminology_id>\n      <code_string>es</code_string>\n    </language>\n    <territory>\n      <terminology_id>\n        <value>ISO_3166-1</value>\n      </terminology_id>\n      <code_string>UY</code_string>\n    </territory>\n    <category>\n      <value>event</value>\n      <defining_code>\n        <terminology_id>\n          <value>openehr</value>\n        </terminology_id>\n        <code_string>433</code_string>\n      </defining_code>\n    </category>\n    <composer xsi:type=\"PARTY_IDENTIFIED\">\n      <name>Dr. Pablo Pazos</name>\n    </composer>\n    <context>\n      <start_time>\n        <value>{% now 'iso-8601', '' %}</value>\n      </start_time>\n      <setting>\n        <value>Hospital Montevideo</value>\n        <defining_code>\n          <terminology_id>\n            <value>openehr</value>\n          </terminology_id>\n          <code_string>229</code_string>\n        </defining_code>\n      </setting>\n    </context>\n    <content xsi:type=\"OBSERVATION\" archetype_node_id=\"openEHR-EHR-OBSERVATION.test_all_datatypes.v1\">\n      <name>\n        <value>Blood Pressure</value>\n      </name>\n      <language>\n         <terminology_id>\n           <value>ISO_639-1</value>\n         </terminology_id>\n         <code_string>es</code_string>\n      </language>\n      <encoding>\n         <terminology_id>\n           <value>UNICODE</value>\n         </terminology_id>\n         <code_string>UTF-8</code_string>\n      </encoding>\n      <subject xsi:type=\"PARTY_IDENTIFIED\">\n        <external_ref>\n          <id xsi:type=\"HIER_OBJECT_ID\">\n            <value>11111111-1111-1111-1111-111111111111</value>\n          </id>\n          <namespace>DEMOGRAPHIC</namespace>\n          <type>PERSON</type>\n        </external_ref>\n      </subject>\n      <data xsi:type=\"HISTORY\" archetype_node_id=\"at0001\">\n        <name>\n          <value>history</value>\n        </name>\n        <origin>\n          <value>{% now 'iso-8601', 'YYYYMMDD' %}</value>\n        </origin>\n        <events xsi:type=\"POINT_EVENT\" archetype_node_id=\"at0002\">\n          <name>\n            <value>any event</value>\n          </name>\n          <time><value>{% now 'iso-8601', 'YYYYMMDD' %}</value></time>\n          <data xsi:type=\"ITEM_TREE\" archetype_node_id=\"at0003\">\n            <name>\n              <value>Arbol</value>\n            </name>\n            <items xsi:type=\"ELEMENT\" archetype_node_id=\"at0011\">\n              <name>\n                <value>Count</value>\n              </name>\n              <value xsi:type=\"DV_COUNT\">\n                <magnitude>4</magnitude>\n              </value>\n            </items>\n          </data>\n        </events>\n\t\t\t\t<events xsi:type=\"POINT_EVENT\" archetype_node_id=\"at0002\">\n          <name>\n            <value>any event</value>\n          </name>\n          <time><value>{% now 'iso-8601', 'YYYYMMDD' %}</value></time>\n          <data xsi:type=\"ITEM_TREE\" archetype_node_id=\"at0003\">\n            <name>\n              <value>Arbol</value>\n            </name>\n            <items xsi:type=\"ELEMENT\" archetype_node_id=\"at0011\">\n              <name>\n                <value>Count</value>\n              </name>\n              <value xsi:type=\"DV_COUNT\">\n                <magnitude>5</magnitude>\n              </value>\n            </items>\n          </data>\n        </events>\n\t\t\t\t<events xsi:type=\"POINT_EVENT\" archetype_node_id=\"at0002\">\n          <name>\n            <value>any event</value>\n          </name>\n          <time><value>{% now 'iso-8601', 'YYYYMMDD' %}</value></time>\n          <data xsi:type=\"ITEM_TREE\" archetype_node_id=\"at0003\">\n            <name>\n              <value>Arbol</value>\n            </name>\n            <items xsi:type=\"ELEMENT\" archetype_node_id=\"at0011\">\n              <name>\n                <value>Count</value>\n              </name>\n              <value xsi:type=\"DV_COUNT\">\n                <magnitude>6</magnitude>\n              </value>\n            </items>\n          </data>\n        </events>\n      </data>\n    </content>\n  </data>\n  <lifecycle_state>\n    <value>complete</value>\n    <defining_code>\n      <terminology_id>\n        <value>openehr</value>\n      </terminology_id>\n      <code_string>532</code_string>\n    </defining_code>\n  </lifecycle_state>\n</version>\n</versions>"
 			},
 			"created": 1523686988021,
 			"description": "",
@@ -843,10 +892,10 @@
 				}
 			],
 			"isPrivate": false,
-			"metaSortKey": -1507162338334.9688,
+			"metaSortKey": -1507162338484.9688,
 			"method": "POST",
-			"modified": 1557095977820,
-			"name": "ehrs/$uid/compositions",
+			"modified": 1562302578033,
+			"name": "ehrs/$uid/compositions (all dts)",
 			"parameters": [
 				{
 					"id": "pair_e1a62eada4a94e92972aae1c3e81dd66",
@@ -1049,7 +1098,7 @@
 			"isPrivate": false,
 			"metaSortKey": -1507162338328.7188,
 			"method": "POST",
-			"modified": 1551593956105,
+			"modified": 1558048624542,
 			"name": "ehrs/$uid/compositions (test error with date)",
 			"parameters": [
 				{
@@ -1064,7 +1113,7 @@
 			"settingRebuildPath": true,
 			"settingSendCookies": true,
 			"settingStoreCookies": true,
-			"url": "{{base_url}}/api/v1/ehrs/{% response 'body', 'req_811fd5cedc454c269d9f3de79fe6df51', '$.ehrs[0].uid' %}/compositions",
+			"url": "{{base_url}}/api/v1/ehrs/{% response 'body', 'req_de15e4e991bc4269afa8662f79fc442a', '$.ehrs[0].uid' %}/compositions",
 			"_type": "request"
 		},
 		{
@@ -1237,7 +1286,7 @@
 			"authentication": {},
 			"body": {
 				"mimeType": "application/xml",
-				"text": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?>\n<versions xmlns=\"http://schemas.openehr.org/v1\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n<version xsi:type=\"ORIGINAL_VERSION\">\n  <contribution>\n    <id xsi:type=\"HIER_OBJECT_ID\">\n      <value>{% uuid 'v4' %}</value>\n    </id>\n    <namespace>EHR::COMMON</namespace>\n    <type>CONTRIBUTION</type>\n  </contribution>\n  <commit_audit>\n    <system_id>CABOLABS_EHR</system_id>\n    <committer xsi:type=\"PARTY_IDENTIFIED\">\n      <name>Dr. Pablo Pazos</name>\n    </committer>\n    <time_committed>\n      <value>{% now 'iso-8601', '' %}</value>\n    </time_committed>\n    <change_type>\n      <value>modification</value>\n      <defining_code>\n        <terminology_id>\n          <value>openehr</value>\n        </terminology_id>\n        <code_string>251</code_string>\n      </defining_code>\n    </change_type>\n  </commit_audit>\n  <data xsi:type=\"COMPOSITION\" archetype_node_id=\"openEHR-EHR-COMPOSITION.test_all_datatypes.v1\">\n    <name>\n      <value>Test all datatypes</value>\n    </name>\n    <archetype_details>\n      <archetype_id>\n        <value>openEHR-EHR-COMPOSITION.test_all_datatypes.v1</value>\n      </archetype_id>\n      <template_id>\n        <value>test_all_datatypes.es.v1</value>\n      </template_id>\n      <rm_version>1.0.2</rm_version>\n    </archetype_details>\n    <language>\n      <terminology_id>\n        <value>ISO_639-1</value>\n      </terminology_id>\n      <code_string>es</code_string>\n    </language>\n    <territory>\n      <terminology_id>\n        <value>ISO_3166-1</value>\n      </terminology_id>\n      <code_string>UY</code_string>\n    </territory>\n    <category>\n      <value>event</value>\n      <defining_code>\n        <terminology_id>\n          <value>openehr</value>\n        </terminology_id>\n        <code_string>433</code_string>\n      </defining_code>\n    </category>\n    <composer xsi:type=\"PARTY_IDENTIFIED\">\n      <name>Dr. Pablo Pazos</name>\n    </composer>\n    <context>\n      <start_time>\n        <value>{% now 'iso-8601', '' %}</value>\n      </start_time>\n      <setting>\n        <value>Hospital Montevideo</value>\n        <defining_code>\n          <terminology_id>\n            <value>openehr</value>\n          </terminology_id>\n          <code_string>229</code_string>\n        </defining_code>\n      </setting>\n    </context>\n    <content xsi:type=\"OBSERVATION\" archetype_node_id=\"openEHR-EHR-OBSERVATION.test_all_datatypes.v1\">\n      <name>\n        <value>Blood Pressure</value>\n      </name>\n      <language>\n         <terminology_id>\n           <value>ISO_639-1</value>\n         </terminology_id>\n         <code_string>es</code_string>\n       </language>\n       <encoding>\n         <terminology_id>\n           <value>UNICODE</value>\n         </terminology_id>\n         <code_string>UTF-8</code_string>\n      </encoding>\n      <subject xsi:type=\"PARTY_IDENTIFIED\">\n        <external_ref>\n          <id xsi:type=\"HIER_OBJECT_ID\">\n            <value>11111111-1111-1111-1111-111111111111</value>\n          </id>\n          <namespace>DEMOGRAPHIC</namespace>\n          <type>PERSON</type>\n        </external_ref>\n      </subject>\n      <data xsi:type=\"HISTORY\" archetype_node_id=\"at0001\">\n        <name>\n          <value>history</value>\n        </name>\n        <origin>\n          <value>{% now 'iso-8601', 'YYYYMMDD' %}</value>\n        </origin>\n        <events xsi:type=\"POINT_EVENT\" archetype_node_id=\"at0002\">\n          <name>\n            <value>any event</value>\n          </name>\n          <time><value>{% now 'iso-8601', 'YYYYMMDD' %}</value></time>\n          <data xsi:type=\"ITEM_TREE\" archetype_node_id=\"at0003\">\n            <name>\n              <value>Arbol</value>\n            </name>\n            <items xsi:type=\"ELEMENT\" archetype_node_id=\"at0011\">\n              <name>\n                <value>Count</value>\n              </name>\n              <value xsi:type=\"DV_COUNT\">\n                <magnitude>3</magnitude>\n              </value>\n            </items>\n          </data>\n        </events>\n      </data>\n    </content>\n  </data>\n\t<preceding_version_uid>\n\t\t<value>{% response 'body', 'req_7cc1f85518474a2da079f8fb93ba9f4b', '//versions/version/uid' %}</value>\n\t</preceding_version_uid>\n  <lifecycle_state>\n    <value>complete</value>\n    <defining_code>\n      <terminology_id>\n        <value>openehr</value>\n      </terminology_id>\n      <code_string>532</code_string>\n    </defining_code>\n  </lifecycle_state>\n</version>\n</versions>"
+				"text": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?>\n<versions xmlns=\"http://schemas.openehr.org/v1\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n<version xsi:type=\"ORIGINAL_VERSION\">\n  <contribution>\n    <id xsi:type=\"HIER_OBJECT_ID\">\n      <value>{% uuid 'v4' %}</value>\n    </id>\n    <namespace>EHR::COMMON</namespace>\n    <type>CONTRIBUTION</type>\n  </contribution>\n  <commit_audit>\n    <system_id>CABOLABS_EHR</system_id>\n    <committer xsi:type=\"PARTY_IDENTIFIED\">\n      <name>Dr. Pablo Pazos</name>\n    </committer>\n    <time_committed>\n      <value>{% now 'iso-8601', '' %}</value>\n    </time_committed>\n    <change_type>\n      <value>modification</value>\n      <defining_code>\n        <terminology_id>\n          <value>openehr</value>\n        </terminology_id>\n        <code_string>251</code_string>\n      </defining_code>\n    </change_type>\n  </commit_audit>\n  <data xsi:type=\"COMPOSITION\" archetype_node_id=\"openEHR-EHR-COMPOSITION.test_all_datatypes.v1\">\n    <name>\n      <value>Test all datatypes</value>\n    </name>\n    <archetype_details>\n      <archetype_id>\n        <value>openEHR-EHR-COMPOSITION.test_all_datatypes.v1</value>\n      </archetype_id>\n      <template_id>\n        <value>test_all_datatypes.es.v1</value>\n      </template_id>\n      <rm_version>1.0.2</rm_version>\n    </archetype_details>\n    <language>\n      <terminology_id>\n        <value>ISO_639-1</value>\n      </terminology_id>\n      <code_string>es</code_string>\n    </language>\n    <territory>\n      <terminology_id>\n        <value>ISO_3166-1</value>\n      </terminology_id>\n      <code_string>UY</code_string>\n    </territory>\n    <category>\n      <value>event</value>\n      <defining_code>\n        <terminology_id>\n          <value>openehr</value>\n        </terminology_id>\n        <code_string>433</code_string>\n      </defining_code>\n    </category>\n    <composer xsi:type=\"PARTY_IDENTIFIED\">\n      <name>Dr. Pablo Pazos</name>\n    </composer>\n    <context>\n      <start_time>\n        <value>{% now 'iso-8601', '' %}</value>\n      </start_time>\n      <setting>\n        <value>Hospital Montevideo</value>\n        <defining_code>\n          <terminology_id>\n            <value>openehr</value>\n          </terminology_id>\n          <code_string>229</code_string>\n        </defining_code>\n      </setting>\n    </context>\n    <content xsi:type=\"OBSERVATION\" archetype_node_id=\"openEHR-EHR-OBSERVATION.test_all_datatypes.v1\">\n      <name>\n        <value>Blood Pressure</value>\n      </name>\n      <language>\n         <terminology_id>\n           <value>ISO_639-1</value>\n         </terminology_id>\n         <code_string>es</code_string>\n       </language>\n       <encoding>\n         <terminology_id>\n           <value>UNICODE</value>\n         </terminology_id>\n         <code_string>UTF-8</code_string>\n      </encoding>\n      <subject xsi:type=\"PARTY_IDENTIFIED\">\n        <external_ref>\n          <id xsi:type=\"HIER_OBJECT_ID\">\n            <value>11111111-1111-1111-1111-111111111111</value>\n          </id>\n          <namespace>DEMOGRAPHIC</namespace>\n          <type>PERSON</type>\n        </external_ref>\n      </subject>\n      <data xsi:type=\"HISTORY\" archetype_node_id=\"at0001\">\n        <name>\n          <value>history</value>\n        </name>\n        <origin>\n          <value>{% now 'iso-8601', 'YYYYMMDD' %}</value>\n        </origin>\n        <events xsi:type=\"POINT_EVENT\" archetype_node_id=\"at0002\">\n          <name>\n            <value>any event</value>\n          </name>\n          <time><value>{% now 'iso-8601', 'YYYYMMDD' %}</value></time>\n          <data xsi:type=\"ITEM_TREE\" archetype_node_id=\"at0003\">\n            <name>\n              <value>Arbol</value>\n            </name>\n            <items xsi:type=\"ELEMENT\" archetype_node_id=\"at0011\">\n              <name>\n                <value>Count</value>\n              </name>\n              <value xsi:type=\"DV_COUNT\">\n                <magnitude>3</magnitude>\n              </value>\n            </items>\n          </data>\n        </events>\n      </data>\n    </content>\n  </data>\n\t<preceding_version_uid>\n\t\t<value>{% response 'body', 'req_71f8610d495b4515bf4cfbe050363ca0', '//versions/version/uid' %}</value>\n\t</preceding_version_uid>\n  <lifecycle_state>\n    <value>incomplete</value>\n    <defining_code>\n      <terminology_id>\n        <value>openehr</value>\n      </terminology_id>\n      <code_string>553</code_string>\n    </defining_code>\n  </lifecycle_state>\n</version>\n</versions>"
 			},
 			"created": 1524239626276,
 			"description": "",
@@ -1254,10 +1303,10 @@
 				}
 			],
 			"isPrivate": false,
-			"metaSortKey": -1507162338334.1875,
+			"metaSortKey": -1507162338459.9688,
 			"method": "POST",
-			"modified": 1551593946378,
-			"name": "ehrs/$uid/compositions (new version)",
+			"modified": 1562301344270,
+			"name": "ehrs/$uid/compositions (all dts new version)",
 			"parameters": [
 				{
 					"id": "pair_e1a62eada4a94e92972aae1c3e81dd66",
@@ -1405,7 +1454,7 @@
 			"authentication": {},
 			"body": {
 				"mimeType": "application/xml",
-				"text": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?>\n<versions xmlns=\"http://schemas.openehr.org/v1\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n<version xsi:type=\"ORIGINAL_VERSION\">\n  <contribution>\n    <id xsi:type=\"HIER_OBJECT_ID\">\n      <value>{% uuid 'v4' %}</value>\n    </id>\n    <namespace>EHR::COMMON</namespace>\n    <type>CONTRIBUTION</type>\n  </contribution>\n  <commit_audit>\n    <system_id>CABOLABS_EHR</system_id>\n    <committer xsi:type=\"PARTY_IDENTIFIED\">\n      <name>Dr. Pablo Pazos</name>\n    </committer>\n    <time_committed>\n      <value>{% now 'iso-8601', '' %}</value>\n    </time_committed>\n    <change_type>\n      <value>creation</value>\n      <defining_code>\n        <terminology_id>\n          <value>openehr</value>\n        </terminology_id>\n        <code_string>249</code_string>\n      </defining_code>\n    </change_type>\n  </commit_audit>\n  <data xsi:type=\"COMPOSITION\" archetype_node_id=\"openEHR-EHR-COMPOSITION.basic_demographic.v1\">\n    <name>\n      <value>Datos demográficos básicos</value>\n    </name>\n    <archetype_details>\n      <archetype_id>\n        <value>openEHR-EHR-COMPOSITION.basic_demographic.v1</value>\n      </archetype_id>\n      <template_id>\n        <value>datos_demograficos.es.v1</value>\n      </template_id>\n      <rm_version>1.0.2</rm_version>\n    </archetype_details>\n    <language>\n      <terminology_id>\n        <value>ISO_639-1</value>\n      </terminology_id>\n      <code_string>es</code_string>\n    </language>\n    <territory>\n      <terminology_id>\n        <value>ISO_3166-1</value>\n      </terminology_id>\n      <code_string>UY</code_string>\n    </territory>\n    <category>\n      <value>persistente</value>\n      <defining_code>\n        <terminology_id>\n          <value>openehr</value>\n        </terminology_id>\n        <code_string>431</code_string>\n      </defining_code>\n    </category>\n    <composer xsi:type=\"PARTY_IDENTIFIED\">\n      <external_ref>\n        <id xsi:type=\"HIER_OBJECT_ID\">\n          <value>581e019c-8551-4687-967f-0c43dceb8e20</value>\n        </id>\n        <namespace>DEMOGRAPHIC</namespace>\n        <type>PERSON</type>\n      </external_ref>\n      <name>Dr. Yamamoto</name>\n    </composer>\n    <content archetype_node_id=\"openEHR-EHR-ADMIN_ENTRY.basic_demographic.v1\" xsi:type=\"ADMIN_ENTRY\">\n      <name>\n        <value>Datos demográficos básicos</value>\n      </name>\n      <language>\n        <terminology_id>\n          <value>ISO_639-1</value>\n        </terminology_id>\n        <code_string>es</code_string>\n      </language>\n      <encoding>\n        <terminology_id>\n          <value>Unicode</value>\n        </terminology_id>\n        <code_string>UTF-8</code_string>\n      </encoding>\n      <subject xsi:type=\"PARTY_SELF\" />\n      <data archetype_node_id=\"at0001\" xsi:type=\"ITEM_TREE\">\n        <name>\n          <value>Arbol</value>\n        </name>\n        <items archetype_node_id=\"at0002\" xsi:type=\"ELEMENT\">\n          <name>\n            <value>Género</value>\n          </name>\n          <value xsi:type=\"DV_CODED_TEXT\">\n            <value>Masculino</value>\n            <defining_code>\n              <terminology_id>\n                <value>local</value>\n              </terminology_id>\n              <code_string>at0003</code_string>\n            </defining_code>\n          </value>\n        </items>\n        <items archetype_node_id=\"at0006\" xsi:type=\"ELEMENT\">\n          <name>\n            <value>Fecha de nacimiento</value>\n          </name>\n          <value xsi:type=\"DV_DATE\">\n            <value>20180917</value>\n          </value>\n        </items>\n      </data>\n    </content>\n  </data>\n  <lifecycle_state>\n    <value>complete</value>\n    <defining_code>\n      <terminology_id>\n        <value>openehr</value>\n      </terminology_id>\n      <code_string>532</code_string>\n    </defining_code>\n  </lifecycle_state>\n</version>\n</versions>"
+				"text": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?>\n<versions xmlns=\"http://schemas.openehr.org/v1\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n<version xsi:type=\"ORIGINAL_VERSION\">\n  <contribution>\n    <id xsi:type=\"HIER_OBJECT_ID\">\n      <value>{% uuid 'v4' %}</value>\n    </id>\n    <namespace>EHR::COMMON</namespace>\n    <type>CONTRIBUTION</type>\n  </contribution>\n  <commit_audit>\n    <system_id>CABOLABS_EHR</system_id>\n    <committer xsi:type=\"PARTY_IDENTIFIED\">\n\t\t\t<external_ref>\n        <id xsi:type=\"GENERIC_ID\">\n          <value>581e019c-8551-4687-967f-0c43dceb8e20</value>\n\t\t\t\t\t<scheme>test_ehr</scheme>\n        </id>\n        <namespace>DEMOGRAPHIC</namespace>\n        <type>PERSON</type>\n      </external_ref>\n\t\t\t<name>Dr. Pablo Pazos</name>\n    </committer>\n    <time_committed>\n      <value>{% now 'iso-8601', '' %}</value>\n    </time_committed>\n    <change_type>\n      <value>creation</value>\n      <defining_code>\n        <terminology_id>\n          <value>openehr</value>\n        </terminology_id>\n        <code_string>249</code_string>\n      </defining_code>\n    </change_type>\n  </commit_audit>\n  <data xsi:type=\"COMPOSITION\" archetype_node_id=\"openEHR-EHR-COMPOSITION.basic_demographic.v1\">\n    <name>\n      <value>Datos demográficos básicos</value>\n    </name>\n    <archetype_details>\n      <archetype_id>\n        <value>openEHR-EHR-COMPOSITION.basic_demographic.v1</value>\n      </archetype_id>\n      <template_id>\n        <value>datos_demograficos.es.v1</value>\n      </template_id>\n      <rm_version>1.0.2</rm_version>\n    </archetype_details>\n    <language>\n      <terminology_id>\n        <value>ISO_639-1</value>\n      </terminology_id>\n      <code_string>es</code_string>\n    </language>\n    <territory>\n      <terminology_id>\n        <value>ISO_3166-1</value>\n      </terminology_id>\n      <code_string>UY</code_string>\n    </territory>\n    <category>\n      <value>persistente</value>\n      <defining_code>\n        <terminology_id>\n          <value>openehr</value>\n        </terminology_id>\n        <code_string>431</code_string>\n      </defining_code>\n    </category>\n    <composer xsi:type=\"PARTY_IDENTIFIED\">\n      <external_ref>\n        <id xsi:type=\"HIER_OBJECT_ID\">\n          <value>581e019c-8551-4687-967f-0c43dceb8e20</value>\n        </id>\n        <namespace>DEMOGRAPHIC</namespace>\n        <type>PERSON</type>\n      </external_ref>\n      <name>Dr. Yamamoto</name>\n    </composer>\n    <content archetype_node_id=\"openEHR-EHR-ADMIN_ENTRY.basic_demographic.v1\" xsi:type=\"ADMIN_ENTRY\">\n      <name>\n        <value>Datos demográficos básicos</value>\n      </name>\n      <language>\n        <terminology_id>\n          <value>ISO_639-1</value>\n        </terminology_id>\n        <code_string>es</code_string>\n      </language>\n      <encoding>\n        <terminology_id>\n          <value>Unicode</value>\n        </terminology_id>\n        <code_string>UTF-8</code_string>\n      </encoding>\n      <subject xsi:type=\"PARTY_SELF\" />\n      <data archetype_node_id=\"at0001\" xsi:type=\"ITEM_TREE\">\n        <name>\n          <value>Arbol</value>\n        </name>\n        <items archetype_node_id=\"at0002\" xsi:type=\"ELEMENT\">\n          <name>\n            <value>Género</value>\n          </name>\n          <value xsi:type=\"DV_CODED_TEXT\">\n            <value>Masculino</value>\n            <defining_code>\n              <terminology_id>\n                <value>local</value>\n              </terminology_id>\n              <code_string>at0003</code_string>\n            </defining_code>\n          </value>\n        </items>\n        <items archetype_node_id=\"at0006\" xsi:type=\"ELEMENT\">\n          <name>\n            <value>Fecha de nacimiento</value>\n          </name>\n          <value xsi:type=\"DV_DATE\">\n            <value>20180917</value>\n          </value>\n        </items>\n      </data>\n    </content>\n  </data>\n  <lifecycle_state>\n    <value>complete</value>\n    <defining_code>\n      <terminology_id>\n        <value>openehr</value>\n      </terminology_id>\n      <code_string>532</code_string>\n    </defining_code>\n  </lifecycle_state>\n</version>\n</versions>"
 			},
 			"created": 1537156958189,
 			"description": "",
@@ -1424,7 +1473,7 @@
 			"isPrivate": false,
 			"metaSortKey": -1507162338434.9688,
 			"method": "POST",
-			"modified": 1557095985210,
+			"modified": 1561006116396,
 			"name": "ehrs/$uid/compositions (demographic, M)",
 			"parameters": [
 				{
@@ -1695,6 +1744,90 @@
 			"url": "{{base_url}}/api/v1/ehrs/{% response 'body', 'req_de15e4e991bc4269afa8662f79fc442a', '$.ehrs[0].uid' %}/compositions",
 			"_type": "request"
 		},
+		{
+			"_id": "req_71f8610d495b4515bf4cfbe050363ca0",
+			"authentication": {},
+			"body": {
+				"mimeType": "application/xml",
+				"text": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?>\n<versions xmlns=\"http://schemas.openehr.org/v1\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n<version xsi:type=\"ORIGINAL_VERSION\">\n  <contribution>\n    <id xsi:type=\"HIER_OBJECT_ID\">\n      <value>{% uuid 'v4' %}</value>\n    </id>\n    <namespace>EHR::COMMON</namespace>\n    <type>CONTRIBUTION</type>\n  </contribution>\n  <commit_audit>\n    <system_id>CABOLABS_EHR</system_id>\n    <committer xsi:type=\"PARTY_IDENTIFIED\">\n      <name>Dr. Pablo Pazos</name>\n    </committer>\n    <time_committed>\n      <value>{% now 'iso-8601', '' %}</value>\n    </time_committed>\n    <change_type>\n      <value>deleted</value>\n      <defining_code>\n        <terminology_id>\n          <value>openehr</value>\n        </terminology_id>\n        <code_string>523</code_string>\n      </defining_code>\n    </change_type>\n  </commit_audit>\n  <data xsi:type=\"COMPOSITION\" archetype_node_id=\"openEHR-EHR-COMPOSITION.test_all_datatypes.v1\">\n    <name>\n      <value>Test all datatypes</value>\n    </name>\n    <archetype_details>\n      <archetype_id>\n        <value>openEHR-EHR-COMPOSITION.test_all_datatypes.v1</value>\n      </archetype_id>\n      <template_id>\n        <value>test_all_datatypes.es.v1</value>\n      </template_id>\n      <rm_version>1.0.2</rm_version>\n    </archetype_details>\n    <language>\n      <terminology_id>\n        <value>ISO_639-1</value>\n      </terminology_id>\n      <code_string>es</code_string>\n    </language>\n    <territory>\n      <terminology_id>\n        <value>ISO_3166-1</value>\n      </terminology_id>\n      <code_string>UY</code_string>\n    </territory>\n    <category>\n      <value>event</value>\n      <defining_code>\n        <terminology_id>\n          <value>openehr</value>\n        </terminology_id>\n        <code_string>433</code_string>\n      </defining_code>\n    </category>\n    <composer xsi:type=\"PARTY_IDENTIFIED\">\n      <name>Dr. Pablo Pazos</name>\n    </composer>\n    <context>\n      <start_time>\n        <value>{% now 'iso-8601', '' %}</value>\n      </start_time>\n      <setting>\n        <value>Hospital Montevideo</value>\n        <defining_code>\n          <terminology_id>\n            <value>openehr</value>\n          </terminology_id>\n          <code_string>229</code_string>\n        </defining_code>\n      </setting>\n    </context>\n    <content xsi:type=\"OBSERVATION\" archetype_node_id=\"openEHR-EHR-OBSERVATION.test_all_datatypes.v1\">\n      <name>\n        <value>Blood Pressure</value>\n      </name>\n      <language>\n         <terminology_id>\n           <value>ISO_639-1</value>\n         </terminology_id>\n         <code_string>es</code_string>\n       </language>\n       <encoding>\n         <terminology_id>\n           <value>UNICODE</value>\n         </terminology_id>\n         <code_string>UTF-8</code_string>\n      </encoding>\n      <subject xsi:type=\"PARTY_IDENTIFIED\">\n        <external_ref>\n          <id xsi:type=\"HIER_OBJECT_ID\">\n            <value>11111111-1111-1111-1111-111111111111</value>\n          </id>\n          <namespace>DEMOGRAPHIC</namespace>\n          <type>PERSON</type>\n        </external_ref>\n      </subject>\n      <data xsi:type=\"HISTORY\" archetype_node_id=\"at0001\">\n        <name>\n          <value>history</value>\n        </name>\n        <origin>\n          <value>{% now 'iso-8601', 'YYYYMMDD' %}</value>\n        </origin>\n        <events xsi:type=\"POINT_EVENT\" archetype_node_id=\"at0002\">\n          <name>\n            <value>any event</value>\n          </name>\n          <time><value>{% now 'iso-8601', 'YYYYMMDD' %}</value></time>\n          <data xsi:type=\"ITEM_TREE\" archetype_node_id=\"at0003\">\n            <name>\n              <value>Arbol</value>\n            </name>\n            <items xsi:type=\"ELEMENT\" archetype_node_id=\"at0011\">\n              <name>\n                <value>Count</value>\n              </name>\n              <value xsi:type=\"DV_COUNT\">\n                <magnitude>3</magnitude>\n              </value>\n            </items>\n          </data>\n        </events>\n      </data>\n    </content>\n  </data>\n\t<preceding_version_uid>\n\t\t<value>{% response 'body', 'req_7cc1f85518474a2da079f8fb93ba9f4b', '//versions/version/uid' %}</value>\n\t</preceding_version_uid>\n  <lifecycle_state>\n    <value>deleted</value>\n    <defining_code>\n      <terminology_id>\n        <value>openehr</value>\n      </terminology_id>\n      <code_string>523</code_string>\n    </defining_code>\n  </lifecycle_state>\n</version>\n</versions>"
+			},
+			"created": 1562301106650,
+			"description": "",
+			"headers": [
+				{
+					"id": "pair_00d15d6f7e6b455faf8d98b60cfcc7cf",
+					"name": "Authorization",
+					"value": "Bearer {% response 'body', 'req_f10af8cc21d848a2b902075a015d1d2f', '$.token' %}"
+				},
+				{
+					"id": "pair_a66cc0d99dab4236b8053a1aa8a74e96",
+					"name": "Content-Type",
+					"value": "application/xml"
+				}
+			],
+			"isPrivate": false,
+			"metaSortKey": -1507162338447.4688,
+			"method": "POST",
+			"modified": 1562301182253,
+			"name": "ehrs/$uid/compositions (all dts delete)",
+			"parameters": [
+				{
+					"id": "pair_e1a62eada4a94e92972aae1c3e81dd66",
+					"name": "auditCommitter",
+					"value": "Gregory House, MD."
+				}
+			],
+			"parentId": "fld_1091dcc1fc4c4f1395f9276fcda7d4c2",
+			"settingDisableRenderRequestBody": false,
+			"settingEncodeUrl": true,
+			"settingRebuildPath": true,
+			"settingSendCookies": true,
+			"settingStoreCookies": true,
+			"url": "{{base_url}}/api/v1/ehrs/{% response 'body', 'req_de15e4e991bc4269afa8662f79fc442a', '$.ehrs[0].uid' %}/compositions",
+			"_type": "request"
+		},
+		{
+			"_id": "req_576a0138237c49239008791e2757100e",
+			"authentication": {},
+			"body": {
+				"mimeType": "application/xml",
+				"text": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?>\n<versions xmlns=\"http://schemas.openehr.org/v1\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n<version xsi:type=\"ORIGINAL_VERSION\">\n  <contribution>\n    <id xsi:type=\"HIER_OBJECT_ID\">\n      <value>7b6e53ce-ae3f-4971-9cb2-f7d719246531</value>\n    </id>\n    <namespace>EHR::COMMON</namespace>\n    <type>CONTRIBUTION</type>\n  </contribution>\n  <commit_audit>\n    <system_id>CABOLABS_EHR</system_id>\n    <committer xsi:type=\"PARTY_IDENTIFIED\">\n      <name>Dr. Pablo Pazos</name>\n    </committer>\n    <time_committed>\n      <value>{% now 'iso-8601', '' %}</value>\n    </time_committed>\n    <change_type>\n      <value>creation</value>\n      <defining_code>\n        <terminology_id>\n          <value>openehr</value>\n        </terminology_id>\n        <code_string>249</code_string>\n      </defining_code>\n    </change_type>\n  </commit_audit>\n  <data xsi:type=\"COMPOSITION\" archetype_node_id=\"openEHR-EHR-COMPOSITION.test_all_datatypes.v1\">\n    <name>\n      <value>Test all datatypes</value>\n    </name>\n    <archetype_details>\n      <archetype_id>\n        <value>openEHR-EHR-COMPOSITION.test_all_datatypes.v1</value>\n      </archetype_id>\n      <template_id>\n        <value>test_all_datatypes.es.v1</value>\n      </template_id>\n      <rm_version>1.0.2</rm_version>\n    </archetype_details>\n    <language>\n      <terminology_id>\n        <value>ISO_639-1</value>\n      </terminology_id>\n      <code_string>es</code_string>\n    </language>\n    <territory>\n      <terminology_id>\n        <value>ISO_3166-1</value>\n      </terminology_id>\n      <code_string>UY</code_string>\n    </territory>\n    <category>\n      <value>event</value>\n      <defining_code>\n        <terminology_id>\n          <value>openehr</value>\n        </terminology_id>\n        <code_string>433</code_string>\n      </defining_code>\n    </category>\n    <composer xsi:type=\"PARTY_IDENTIFIED\">\n      <name>Dr. Pablo Pazos</name>\n    </composer>\n    <context>\n      <start_time>\n        <value>{% now 'iso-8601', '' %}</value>\n      </start_time>\n      <setting>\n        <value>Hospital Montevideo</value>\n        <defining_code>\n          <terminology_id>\n            <value>openehr</value>\n          </terminology_id>\n          <code_string>229</code_string>\n        </defining_code>\n      </setting>\n    </context>\n    <content xsi:type=\"OBSERVATION\" archetype_node_id=\"openEHR-EHR-OBSERVATION.test_all_datatypes.v1\">\n      <name>\n        <value>Blood Pressure</value>\n      </name>\n      <language>\n         <terminology_id>\n           <value>ISO_639-1</value>\n         </terminology_id>\n         <code_string>es</code_string>\n      </language>\n      <encoding>\n         <terminology_id>\n           <value>UNICODE</value>\n         </terminology_id>\n         <code_string>UTF-8</code_string>\n      </encoding>\n      <subject xsi:type=\"PARTY_IDENTIFIED\">\n        <external_ref>\n          <id xsi:type=\"HIER_OBJECT_ID\">\n            <value>11111111-1111-1111-1111-111111111111</value>\n          </id>\n          <namespace>DEMOGRAPHIC</namespace>\n          <type>PERSON</type>\n        </external_ref>\n      </subject>\n      <data xsi:type=\"HISTORY\" archetype_node_id=\"at0001\">\n        <name>\n          <value>history</value>\n        </name>\n        <origin>\n          <value>{% now 'iso-8601', 'YYYYMMDD' %}</value>\n        </origin>\n        <events xsi:type=\"POINT_EVENT\" archetype_node_id=\"at0002\">\n          <name>\n            <value>any event</value>\n          </name>\n          <time><value>{% now 'iso-8601', 'YYYYMMDD' %}</value></time>\n          <data xsi:type=\"ITEM_TREE\" archetype_node_id=\"at0003\">\n            <name>\n              <value>Arbol</value>\n            </name>\n            <items xsi:type=\"ELEMENT\" archetype_node_id=\"at0011\">\n              <name>\n                <value>Count</value>\n              </name>\n              <value xsi:type=\"DV_COUNT\">\n                <magnitude>4</magnitude>\n              </value>\n            </items>\n          </data>\n        </events>\n\t\t\t\t<events xsi:type=\"POINT_EVENT\" archetype_node_id=\"at0002\">\n          <name>\n            <value>any event</value>\n          </name>\n          <time><value>{% now 'iso-8601', 'YYYYMMDD' %}</value></time>\n          <data xsi:type=\"ITEM_TREE\" archetype_node_id=\"at0003\">\n            <name>\n              <value>Arbol</value>\n            </name>\n            <items xsi:type=\"ELEMENT\" archetype_node_id=\"at0011\">\n              <name>\n                <value>Count</value>\n              </name>\n              <value xsi:type=\"DV_COUNT\">\n                <magnitude>5</magnitude>\n              </value>\n            </items>\n          </data>\n        </events>\n\t\t\t\t<events xsi:type=\"POINT_EVENT\" archetype_node_id=\"at0002\">\n          <name>\n            <value>any event</value>\n          </name>\n          <time><value>{% now 'iso-8601', 'YYYYMMDD' %}</value></time>\n          <data xsi:type=\"ITEM_TREE\" archetype_node_id=\"at0003\">\n            <name>\n              <value>Arbol</value>\n            </name>\n            <items xsi:type=\"ELEMENT\" archetype_node_id=\"at0011\">\n              <name>\n                <value>Count</value>\n              </name>\n              <value xsi:type=\"DV_COUNT\">\n                <magnitude>6</magnitude>\n              </value>\n            </items>\n          </data>\n        </events>\n      </data>\n    </content>\n  </data>\n  <lifecycle_state>\n    <value>complete</value>\n    <defining_code>\n      <terminology_id>\n        <value>openehr</value>\n      </terminology_id>\n      <code_string>532</code_string>\n    </defining_code>\n  </lifecycle_state>\n</version>\n<version xsi:type=\"ORIGINAL_VERSION\">\n  <contribution>\n    <id xsi:type=\"HIER_OBJECT_ID\">\n      <value>7b6e53ce-ae3f-4971-9cb2-f7d719246531</value>\n    </id>\n    <namespace>EHR::COMMON</namespace>\n    <type>CONTRIBUTION</type>\n  </contribution>\n  <commit_audit>\n    <system_id>XXXXXX_SYSTEM_ID</system_id>\n    <committer xsi:type=\"PARTY_IDENTIFIED\">\n      <name>Dr. Pablo Pazos</name>\n    </committer>\n    <time_committed>\n      <value>{% now 'iso-8601', '' %}</value>\n    </time_committed>\n    <change_type>\n      <value>creation</value>\n      <defining_code>\n        <terminology_id>\n          <value>openehr</value>\n        </terminology_id>\n        <code_string>249</code_string>\n      </defining_code>\n    </change_type>\n  </commit_audit>\n  <data xsi:type=\"COMPOSITION\" archetype_node_id=\"openEHR-EHR-COMPOSITION.test_all_datatypes.v1\">\n    <name>\n      <value>Test all datatypes</value>\n    </name>\n    <archetype_details>\n      <archetype_id>\n        <value>openEHR-EHR-COMPOSITION.test_all_datatypes.v1</value>\n      </archetype_id>\n      <template_id>\n        <value>test_all_datatypes.es.v1</value>\n      </template_id>\n      <rm_version>1.0.2</rm_version>\n    </archetype_details>\n    <language>\n      <terminology_id>\n        <value>ISO_639-1</value>\n      </terminology_id>\n      <code_string>es</code_string>\n    </language>\n    <territory>\n      <terminology_id>\n        <value>ISO_3166-1</value>\n      </terminology_id>\n      <code_string>UY</code_string>\n    </territory>\n    <category>\n      <value>event</value>\n      <defining_code>\n        <terminology_id>\n          <value>openehr</value>\n        </terminology_id>\n        <code_string>433</code_string>\n      </defining_code>\n    </category>\n    <composer xsi:type=\"PARTY_IDENTIFIED\">\n      <name>Dr. Pablo Pazos</name>\n    </composer>\n    <context>\n      <start_time>\n        <value>{% now 'iso-8601', '' %}</value>\n      </start_time>\n      <setting>\n        <value>Hospital Montevideo</value>\n        <defining_code>\n          <terminology_id>\n            <value>openehr</value>\n          </terminology_id>\n          <code_string>229</code_string>\n        </defining_code>\n      </setting>\n    </context>\n    <content xsi:type=\"OBSERVATION\" archetype_node_id=\"openEHR-EHR-OBSERVATION.test_all_datatypes.v1\">\n      <name>\n        <value>Blood Pressure</value>\n      </name>\n      <language>\n         <terminology_id>\n           <value>ISO_639-1</value>\n         </terminology_id>\n         <code_string>es</code_string>\n      </language>\n      <encoding>\n         <terminology_id>\n           <value>UNICODE</value>\n         </terminology_id>\n         <code_string>UTF-8</code_string>\n      </encoding>\n      <subject xsi:type=\"PARTY_IDENTIFIED\">\n        <external_ref>\n          <id xsi:type=\"HIER_OBJECT_ID\">\n            <value>11111111-1111-1111-1111-111111111111</value>\n          </id>\n          <namespace>DEMOGRAPHIC</namespace>\n          <type>PERSON</type>\n        </external_ref>\n      </subject>\n      <data xsi:type=\"HISTORY\" archetype_node_id=\"at0001\">\n        <name>\n          <value>history</value>\n        </name>\n        <origin>\n          <value>{% now 'iso-8601', 'YYYYMMDD' %}</value>\n        </origin>\n        <events xsi:type=\"POINT_EVENT\" archetype_node_id=\"at0002\">\n          <name>\n            <value>any event</value>\n          </name>\n          <time><value>{% now 'iso-8601', 'YYYYMMDD' %}</value></time>\n          <data xsi:type=\"ITEM_TREE\" archetype_node_id=\"at0003\">\n            <name>\n              <value>Arbol</value>\n            </name>\n            <items xsi:type=\"ELEMENT\" archetype_node_id=\"at0011\">\n              <name>\n                <value>Count</value>\n              </name>\n              <value xsi:type=\"DV_COUNT\">\n                <magnitude>14</magnitude>\n              </value>\n            </items>\n          </data>\n        </events>\n\t\t\t\t<events xsi:type=\"POINT_EVENT\" archetype_node_id=\"at0002\">\n          <name>\n            <value>any event</value>\n          </name>\n          <time><value>{% now 'iso-8601', 'YYYYMMDD' %}</value></time>\n          <data xsi:type=\"ITEM_TREE\" archetype_node_id=\"at0003\">\n            <name>\n              <value>Arbol</value>\n            </name>\n            <items xsi:type=\"ELEMENT\" archetype_node_id=\"at0011\">\n              <name>\n                <value>Count</value>\n              </name>\n              <value xsi:type=\"DV_COUNT\">\n                <magnitude>15</magnitude>\n              </value>\n            </items>\n          </data>\n        </events>\n\t\t\t\t<events xsi:type=\"POINT_EVENT\" archetype_node_id=\"at0002\">\n          <name>\n            <value>any event</value>\n          </name>\n          <time><value>{% now 'iso-8601', 'YYYYMMDD' %}</value></time>\n          <data xsi:type=\"ITEM_TREE\" archetype_node_id=\"at0003\">\n            <name>\n              <value>Arbol</value>\n            </name>\n            <items xsi:type=\"ELEMENT\" archetype_node_id=\"at0011\">\n              <name>\n                <value>Count</value>\n              </name>\n              <value xsi:type=\"DV_COUNT\">\n                <magnitude>16</magnitude>\n              </value>\n            </items>\n          </data>\n        </events>\n      </data>\n    </content>\n  </data>\n  <lifecycle_state>\n    <value>complete</value>\n    <defining_code>\n      <terminology_id>\n        <value>openehr</value>\n      </terminology_id>\n      <code_string>532</code_string>\n    </defining_code>\n  </lifecycle_state>\n</version>\n</versions>"
+			},
+			"created": 1562478151274,
+			"description": "",
+			"headers": [
+				{
+					"id": "pair_00d15d6f7e6b455faf8d98b60cfcc7cf",
+					"name": "Authorization",
+					"value": "Bearer {% response 'body', 'req_7cda708f9e7f40a3a9901f8dd5c17b9f', '$.token' %}"
+				},
+				{
+					"id": "pair_a66cc0d99dab4236b8053a1aa8a74e96",
+					"name": "Content-Type",
+					"value": "application/xml"
+				}
+			],
+			"isPrivate": false,
+			"metaSortKey": -1507162338472.4688,
+			"method": "POST",
+			"modified": 1562482983623,
+			"name": "ehrs/$uid/compositions (all dts 2 vers)",
+			"parameters": [
+				{
+					"id": "pair_e1a62eada4a94e92972aae1c3e81dd66",
+					"name": "auditCommitter",
+					"value": "Gregory House, MD."
+				}
+			],
+			"parentId": "fld_1091dcc1fc4c4f1395f9276fcda7d4c2",
+			"settingDisableRenderRequestBody": false,
+			"settingEncodeUrl": true,
+			"settingRebuildPath": true,
+			"settingSendCookies": true,
+			"settingStoreCookies": true,
+			"url": "{{base_url}}/api/v1/ehrs/{% response 'body', 'req_de15e4e991bc4269afa8662f79fc442a', '$.ehrs[0].uid' %}/compositions",
+			"_type": "request"
+		},
 		{
 			"_id": "req_93fb7c8afdeb4be28b3e7e4aa70ad656",
 			"authentication": {},
@@ -2686,23 +2819,7 @@
 		{
 			"_id": "req_5f3e25a2054845d08a35d11b40ab2438",
 			"authentication": {},
-			"body": {
-				"mimeType": "application/x-www-form-urlencoded",
-				"params": [
-					{
-						"disabled": false,
-						"id": "pair_0cf98eb8153c4164bc8804ac2d690e07",
-						"name": "cache",
-						"value": "false"
-					},
-					{
-						"disabled": false,
-						"id": "pair_faff5bfe5d114b9488169a4305015d85",
-						"name": "query",
-						"value": "<< 73211009 |diabetes mellitus|"
-					}
-				]
-			},
+			"body": {},
 			"created": 1523686988103,
 			"description": "",
 			"headers": [
@@ -2720,9 +2837,20 @@
 			"isPrivate": false,
 			"metaSortKey": -1513023425210.75,
 			"method": "GET",
-			"modified": 1557945988991,
+			"modified": 1558023524014,
 			"name": "validate expression (GET)",
-			"parameters": [],
+			"parameters": [
+				{
+					"id": "pair_5da7a7eb675b44e58e6d8307b91c369a",
+					"name": "query",
+					"value": "<< 73211009 |diabetes mellitus|"
+				},
+				{
+					"id": "pair_b3f9cf8f12b048b49a0fe2003a103a27",
+					"name": "cache",
+					"value": "false"
+				}
+			],
 			"parentId": "fld_be3fffbf41a845e4a71c1d36f2ed36c1",
 			"settingDisableRenderRequestBody": false,
 			"settingEncodeUrl": true,
@@ -2787,7 +2915,7 @@
 			"isPrivate": false,
 			"metaSortKey": -1507163382756.2812,
 			"method": "GET",
-			"modified": 1557097511044,
+			"modified": 1559413715691,
 			"name": "ehr query get ehrs",
 			"parameters": [
 				{
@@ -2826,7 +2954,7 @@
 			"isPrivate": false,
 			"metaSortKey": -1507162929111.6406,
 			"method": "GET",
-			"modified": 1557946989656,
+			"modified": 1559413644099,
 			"name": "ehr query ehr matches",
 			"parameters": [
 				{
diff --git a/grails-app/controllers/com/cabolabs/ehrserver/api/RestController.groovy b/grails-app/controllers/com/cabolabs/ehrserver/api/RestController.groovy
index d45d490ad..a75f97c72 100644
--- a/grails-app/controllers/com/cabolabs/ehrserver/api/RestController.groovy
+++ b/grails-app/controllers/com/cabolabs/ehrserver/api/RestController.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 CaboLabs Health Informatics
+ * Copyright 2011-2019 CaboLabs Health Informatics
  *
  * The EHRServer was designed and developed by Pablo Pazos Gutierrez <pablo.pazos@cabolabs.com> at CaboLabs Health Informatics (www.cabolabs.com).
  *
@@ -75,6 +75,7 @@ class RestController {
    def notificationService
    def apiResponsesService
    def queryService
+   def configurationService
 
    // Para acceder a las opciones de localizacion
    def config = Holders.config.app
@@ -639,7 +640,7 @@ class RestController {
    @SecuredStateless
    def ehrList(String format, int max, int offset)
    {
-      if (!max) max = 30
+      if (!max) max = configurationService.getValue('ehrserver.console.lists.max_items')
       if (!offset) offset = 0
 
       def _ehrs = Ehr.findAllByOrganizationUid(request.securityStatelessMap.extradata.org_uid, [max: max, offset: offset, readOnly: true])
@@ -2030,17 +2031,21 @@ class RestController {
    }
 
    @SecuredStateless
-   def templates(String format)
+   def templates(String format, int max, int offset)
    {
-      def opts = OperationalTemplateIndex.findAllByOrganizationUidAndLastVersion(request.securityStatelessMap.extradata.org_uid, true)
+      if (!max) max = configurationService.getValue('ehrserver.console.lists.max_items')
+      if (!offset) offset = 0
+
+      def opts = OperationalTemplateIndex.findAllByOrganizationUidAndLastVersion(request.securityStatelessMap.extradata.org_uid, true, [max: max, offset: offset, readOnly: true])
+      def res = new PaginatedResults(listName:'templates', list:opts, max:max, offset:offset)
 
       if (!format || format == 'xml')
       {
-         render(text: opts as XML, contentType:"text/xml", encoding:"UTF-8")
+         render(text: res as XML, contentType:"text/xml", encoding:"UTF-8")
       }
       else if (format == 'json')
       {
-         render(text: opts as JSON, contentType:"application/json", encoding:"UTF-8")
+         render(text: res as JSON, contentType:"application/json", encoding:"UTF-8")
       }
       else
       {
diff --git a/guide/EHRServer_v1.5.doc b/guide/EHRServer_v1.5.doc
index 0bed395e8..6f6198f98 100644
Binary files a/guide/EHRServer_v1.5.doc and b/guide/EHRServer_v1.5.doc differ
diff --git a/guide/EHRServer_v1.5.pdf b/guide/EHRServer_v1.5.pdf
new file mode 100644
index 000000000..b785a6595
Binary files /dev/null and b/guide/EHRServer_v1.5.pdf differ