diff --git a/view-templates/1.efx b/view-templates/1.efx
index 9f70b9265..229e18357 100644
--- a/view-templates/1.efx
+++ b/view-templates/1.efx
@@ -34,11 +34,10 @@
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -65,34 +64,8 @@
 			{BT-509-Organization-TouchPoint[OPT-200-Organization-Company == OPT-300-Procedure-Buyer] } #{field|name|BT-509-Organization-TouchPoint}: ${BT-509-Organization-TouchPoint} // Touchpoint eDelivery Gateway
 		0 {ND-Organization} #{auxiliary|text|roles}: // Roles of this organisation
 			0 {ND-Organization[count(for text:$orgid in OPT-200-Organization-Company return OPT-300-Procedure-Buyer[OPT-300-Procedure-Buyer == $orgid])>0]} #{auxiliary|text|buyer} // This org is a Buyer
-				{OPP-050-Organization[OPP-050-Organization == TRUE]} #{field|name|OPP-050-Organization} // Leader of the group
-				{OPP-052-Organization[OPP-052-Organization == TRUE]} #{field|name|OPP-052-Organization} // CPB Acquiring
-				{OPP-051-Organization[OPP-051-Organization == TRUE]} #{field|name|OPP-051-Organization} // CPB Awarding
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'serv-prov') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'serv-prov')]} #{auxiliary|text|organisation-providing-procurement-service} // This org is a Service Provider
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'ted-esen') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'ted-esen')]} #{auxiliary|text|organisation-esender} // This org is an eSender
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Part-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Part-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Part-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Part-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Part-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Part-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Part-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (PART)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -106,7 +79,9 @@
 		{BT-701-notice} #{field|name|BT-701-notice}: ${BT-701-notice} - ${BT-757-notice} // Notice identifier / version
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
+		{OPP-070-notice} #{field|name|OPP-070-notice}: ${OPP-070-notice} // Notice subtype
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/10.efx b/view-templates/10.efx
index e344c3bd6..9e3517826 100644
--- a/view-templates/10.efx
+++ b/view-templates/10.efx
@@ -39,8 +39,7 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
 		5 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present or BT-33-Procedure is present]} #{auxiliary|text|procurement-terms} // 2.1.5 Procurement terms
 			0 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present]} #{auxiliary|text|submission-terms}: // Terms of submission
 				{BT-31-Procedure} #{field|name|BT-31-Procedure}: ${format-number(BT-31-Procedure, '###,##0')} // Maximum number of lots for which one tenderer can submit tenders
@@ -144,7 +143,6 @@
 				{BT-50-Lot[BT-50-Lot is present]} #{field|name|BT-50-Lot}: ${BT-50-Lot} // Minimum Candidates
 				{BT-661-Lot[BT-51-Lot is present]} #{field|name|BT-51-Lot}: ${BT-51-Lot} // Maximum Candidates
 				{BT-52-Lot[BT-52-Lot == TRUE]} #{field|name|BT-52-Lot} // The procedure will take place in successive stages. In each stage, some participants may be eliminated.
-				{BT-120-Lot[BT-120-Lot == TRUE]} #{field|name|BT-120-Lot} // The buyer reserves the right to award the contract on the basis of the initial tenders without any further negotiations.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
 				0 {ND-LotAwardCriterion[BT-539-Lot != 'unpublished']} #{field|name|BT-539-Lot}: #{BT-539-Lot} // Type
@@ -158,8 +156,8 @@
 		11 {BT-137-Lot[(BT-14-Lot is present) or (BT-632-Lot is present) or (BT-124-Lot is present)]} #{auxiliary|text|procurement-documents} // 5.1.11 Procurement documents
 			{BT-137-Lot[some text:$restricted in (for text:$somerestricted in BT-14-Lot return $somerestricted) satisfies $restricted == 'restricted-document']} #{field|name|BT-14-Lot} // The access to certain procurement documents is restricted. (Lot)
 			{BT-707-Lot} #{field|name|BT-707-Lot}: #{BT-707-Lot} // Justification for restricting access to certain procurement documents (Lot)
-			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: ${distinct-values(for text:$lang in BT-708-Lot return $lang)} // Languages in which the procurement documents are officially available (Lot)
-			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: ${distinct-values(for text:$lang in BT-737-Lot return $lang)} // Languages in which the procurement documents are unofficially available (Lot)
+			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: #{BT-708-Lot} // Languages in which the procurement documents are officially available (Lot)
+			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: #{BT-737-Lot} // Languages in which the procurement documents are unofficially available (Lot)
 			{BT-13(d)-Lot} #{field|name|BT-13(d)-Lot}: ${BT-13(d)-Lot} ${BT-13(t)-Lot} // Deadline for requesting additional information (Lot)
 			{BT-137-Lot[BT-615-Lot is present]} #{field|name|BT-615-Lot}: ${distinct-values(for text:$url in BT-615-Lot return concat($url, ', '))} // Information about restricted documents is available at (Lot) 
 			{BT-137-Lot[BT-15-Lot is present]} #{field|name|BT-15-Lot}: ${distinct-values(for text:$url in BT-15-Lot return concat($url, ', '))} // Information about non-restricted documents is available at (Lot) 
@@ -183,7 +181,7 @@
 				{BT-18-Lot} #{field|name|BT-18-Lot}: ${BT-18-Lot} // Address for submission (URL)
 				{BT-19-Lot} #{field|name|BT-19-Lot}: #{BT-19-Lot} // Submission Nonelectronic Justification
 				{BT-137-Lot[BT-745-Lot is present]} #{field|name|BT-745-Lot}: ${BT-745-Lot} // Submission Nonelectronic Description
-				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders, requests to participate, or expressions of interest may be submitted
+				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders or requests to participate may be submitted
 				{BT-764-Lot} #{field|name|BT-764-Lot}: #{BT-764-Lot} // Electronic catalogue
 				{BT-744-Lot[BT-744-Lot == 'true']} #{field|name|BT-744-Lot} // Advanced or qualified electronic signature or seal (as defined in Regulation (EU) No 910/2014) is required. (true/false)
 				{BT-63-Lot} #{field|name|BT-63-Lot}: #{BT-63-Lot} // Variants
@@ -197,11 +195,11 @@
 			0 {ND-LotTenderingTerms[(BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present)]} #{auxiliary|text|contract-terms}: // Terms of contract
 				{BT-736-Lot[BT-736-Lot != 'no']} #{field|name|BT-736-Lot}: #{BT-736-Lot} // The execution of the contract must be performed in the framework of sheltered employment programmes (yes / no / not-known)
 				{ND-ExecutionRequirements[BT-70-Lot is present]} #{field|name|BT-70-Lot}: ${BT-70-Lot} // Terms Performance
-				0 {BT-801-Lot} #{field|name|BT-801-Lot} // A non-disclosure agreement is required.
+				0 {BT-801-Lot} #{field|name|BT-801-Lot}: #{code|name|${concat('indicator.', BT-801-Lot)}} // A non-disclosure agreement is required.
 					{BT-137-Lot[BT-802-Lot is present]} #{field|name|BT-802-Lot} : ${BT-802-Lot} // Additional information about the non-disclosure agreement
 				{BT-743-Lot} #{field|name|BT-743-Lot}: #{BT-743-Lot} // Electronic invoicing
-				{BT-92-Lot[BT-92-Lot == TRUE]} #{field|name|BT-92-Lot} // Electronic ordering will be used (true / false)
-				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot} // Electronic payment will be used (true/false)
+				{BT-92-Lot} #{field|name|BT-92-Lot}: #{code|name|${if (BT-92-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic ordering will be used (true / false)
+				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot}: #{code|name|${if (BT-93-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic payment will be used (true/false)
 				{BT-761-Lot[(BT-76-Lot is present)]} #{field|name|BT-76-Lot}: ${BT-76-Lot} // Legal form that must be taken by a group of tenderers that is awarded a contract
 				{ND-PaymentTerms[BT-77-Lot is present]} #{field|name|BT-77-Lot}: ${BT-77-Lot} // Financial arrangement
 			{BT-137-Lot[BT-99-Lot is present]} #{field|name|BT-99-Lot}: ${BT-99-Lot} // Information about review deadlines
@@ -211,9 +209,9 @@
 				{BT-113-Lot} #{field|name|BT-113-Lot}: ${BT-113-Lot} // Maximum number of participants
 				{BT-137-Lot[BT-109-Lot is present]} #{field|name|BT-109-Lot}: ${BT-109-Lot} // Justification for the duration of framework agreement
 				{BT-137-Lot[BT-111-Lot is present]} #{field|name|BT-111-Lot}: ${BT-111-Lot} // Framework Buyer Categories (Lot)
-			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system} // Dynamic purchasing system 
+			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system}: // Information about the dynamic purchasing system
 				{BT-766-Lot} #{BT-766-Lot} // Dynamic Purchasing System
-			0 {ND-AuctionTerms[(BT-767-Lot is present) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|electronic-auction}: // Electronic auction #{code|name|indicator.true}
+			0 {ND-AuctionTerms[BT-767-Lot == TRUE]} #{auxiliary|text|electronic-auction}: #{code|name|${'indicator.true'}} // Electronic auction
 				{BT-123-Lot[BT-767-Lot == TRUE]} #{field|name|BT-123-Lot}: ${BT-123-Lot} // An electronic auction at the following address is used
 				{ND-AuctionTerms[BT-122-Lot[BT-767-Lot == TRUE] is present]} #{field|name|BT-122-Lot}: ${BT-122-Lot} // Electronic auction - Description
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
@@ -227,14 +225,15 @@
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -275,20 +274,7 @@
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -303,6 +289,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/11.efx b/view-templates/11.efx
index 895c23a85..483af75fb 100644
--- a/view-templates/11.efx
+++ b/view-templates/11.efx
@@ -40,8 +40,7 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
 		5 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present or BT-33-Procedure is present]} #{auxiliary|text|procurement-terms} // 2.1.5 Procurement terms
 			0 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present]} #{auxiliary|text|submission-terms}: // Terms of submission
 				{BT-31-Procedure} #{field|name|BT-31-Procedure}: ${format-number(BT-31-Procedure, '###,##0')} // Maximum number of lots for which one tenderer can submit tenders
@@ -145,7 +144,6 @@
 				{BT-50-Lot[BT-50-Lot is present]} #{field|name|BT-50-Lot}: ${BT-50-Lot} // Minimum Candidates
 				{BT-661-Lot[BT-51-Lot is present]} #{field|name|BT-51-Lot}: ${BT-51-Lot} // Maximum Candidates
 				{BT-52-Lot[BT-52-Lot == TRUE]} #{field|name|BT-52-Lot} // The procedure will take place in successive stages. In each stage, some participants may be eliminated.
-				{BT-120-Lot[BT-120-Lot == TRUE]} #{field|name|BT-120-Lot} // The buyer reserves the right to award the contract on the basis of the initial tenders without any further negotiations.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
 				0 {ND-LotAwardCriterion[BT-539-Lot != 'unpublished']} #{field|name|BT-539-Lot}: #{BT-539-Lot} // Type
@@ -159,8 +157,8 @@
 		11 {BT-137-Lot[(BT-14-Lot is present) or (BT-632-Lot is present) or (BT-124-Lot is present)]} #{auxiliary|text|procurement-documents} // 5.1.11 Procurement documents
 			{BT-137-Lot[some text:$restricted in (for text:$somerestricted in BT-14-Lot return $somerestricted) satisfies $restricted == 'restricted-document']} #{field|name|BT-14-Lot} // The access to certain procurement documents is restricted. (Lot)
 			{BT-707-Lot} #{field|name|BT-707-Lot}: #{BT-707-Lot} // Justification for restricting access to certain procurement documents (Lot)
-			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: ${distinct-values(for text:$lang in BT-708-Lot return $lang)} // Languages in which the procurement documents are officially available (Lot)
-			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: ${distinct-values(for text:$lang in BT-737-Lot return $lang)} // Languages in which the procurement documents are unofficially available (Lot)
+			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: #{BT-708-Lot} // Languages in which the procurement documents are officially available (Lot)
+			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: #{BT-737-Lot} // Languages in which the procurement documents are unofficially available (Lot)
 			{BT-13(d)-Lot} #{field|name|BT-13(d)-Lot}: ${BT-13(d)-Lot} ${BT-13(t)-Lot} // Deadline for requesting additional information (Lot)
 			{BT-137-Lot[BT-615-Lot is present]} #{field|name|BT-615-Lot}: ${distinct-values(for text:$url in BT-615-Lot return concat($url, ', '))} // Information about restricted documents is available at (Lot) 
 			{BT-137-Lot[BT-15-Lot is present]} #{field|name|BT-15-Lot}: ${distinct-values(for text:$url in BT-15-Lot return concat($url, ', '))} // Information about non-restricted documents is available at (Lot) 
@@ -184,7 +182,7 @@
 				{BT-18-Lot} #{field|name|BT-18-Lot}: ${BT-18-Lot} // Address for submission (URL)
 				{BT-19-Lot} #{field|name|BT-19-Lot}: #{BT-19-Lot} // Submission Nonelectronic Justification
 				{BT-137-Lot[BT-745-Lot is present]} #{field|name|BT-745-Lot}: ${BT-745-Lot} // Submission Nonelectronic Description
-				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders, requests to participate, or expressions of interest may be submitted
+				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders or requests to participate may be submitted
 				{BT-764-Lot} #{field|name|BT-764-Lot}: #{BT-764-Lot} // Electronic catalogue
 				{BT-744-Lot[BT-744-Lot == 'true']} #{field|name|BT-744-Lot} // Advanced or qualified electronic signature or seal (as defined in Regulation (EU) No 910/2014) is required. (true/false)
 				{BT-63-Lot} #{field|name|BT-63-Lot}: #{BT-63-Lot} // Variants
@@ -198,11 +196,11 @@
 			0 {ND-LotTenderingTerms[(BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present)]} #{auxiliary|text|contract-terms}: // Terms of contract
 				{BT-736-Lot[BT-736-Lot != 'no']} #{field|name|BT-736-Lot}: #{BT-736-Lot} // The execution of the contract must be performed in the framework of sheltered employment programmes (yes / no / not-known)
 				{ND-ExecutionRequirements[BT-70-Lot is present]} #{field|name|BT-70-Lot}: ${BT-70-Lot} // Terms Performance
-				0 {BT-801-Lot} #{field|name|BT-801-Lot} // A non-disclosure agreement is required.
+				0 {BT-801-Lot} #{field|name|BT-801-Lot}: #{code|name|${concat('indicator.', BT-801-Lot)}} // A non-disclosure agreement is required.
 					{BT-137-Lot[BT-802-Lot is present]} #{field|name|BT-802-Lot} : ${BT-802-Lot} // Additional information about the non-disclosure agreement
 				{BT-743-Lot} #{field|name|BT-743-Lot}: #{BT-743-Lot} // Electronic invoicing
-				{BT-92-Lot[BT-92-Lot == TRUE]} #{field|name|BT-92-Lot} // Electronic ordering will be used (true / false)
-				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot} // Electronic payment will be used (true/false)
+				{BT-92-Lot} #{field|name|BT-92-Lot}: #{code|name|${if (BT-92-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic ordering will be used (true / false)
+				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot}: #{code|name|${if (BT-93-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic payment will be used (true/false)
 				{BT-761-Lot[(BT-76-Lot is present)]} #{field|name|BT-76-Lot}: ${BT-76-Lot} // Legal form that must be taken by a group of tenderers that is awarded a contract
 				{ND-PaymentTerms[BT-77-Lot is present]} #{field|name|BT-77-Lot}: ${BT-77-Lot} // Financial arrangement
 			{BT-137-Lot[BT-99-Lot is present]} #{field|name|BT-99-Lot}: ${BT-99-Lot} // Information about review deadlines
@@ -212,9 +210,9 @@
 				{BT-113-Lot} #{field|name|BT-113-Lot}: ${BT-113-Lot} // Maximum number of participants
 				{BT-137-Lot[BT-109-Lot is present]} #{field|name|BT-109-Lot}: ${BT-109-Lot} // Justification for the duration of framework agreement
 				{BT-137-Lot[BT-111-Lot is present]} #{field|name|BT-111-Lot}: ${BT-111-Lot} // Framework Buyer Categories (Lot)
-			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system} // Dynamic purchasing system 
+			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system}: // Information about the dynamic purchasing system
 				{BT-766-Lot} #{BT-766-Lot} // Dynamic Purchasing System
-			0 {ND-AuctionTerms[(BT-767-Lot is present) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|electronic-auction}: // Electronic auction #{code|name|indicator.true}
+			0 {ND-AuctionTerms[BT-767-Lot == TRUE]} #{auxiliary|text|electronic-auction}: #{code|name|${'indicator.true'}} // Electronic auction
 				{BT-123-Lot[BT-767-Lot == TRUE]} #{field|name|BT-123-Lot}: ${BT-123-Lot} // An electronic auction at the following address is used
 				{ND-AuctionTerms[BT-122-Lot[BT-767-Lot == TRUE] is present]} #{field|name|BT-122-Lot}: ${BT-122-Lot} // Electronic auction - Description
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
@@ -228,14 +226,15 @@
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -276,20 +275,7 @@
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -304,6 +290,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/12.efx b/view-templates/12.efx
index 84b02e9e0..18d9b5f7c 100644
--- a/view-templates/12.efx
+++ b/view-templates/12.efx
@@ -39,8 +39,7 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
 		5 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present or BT-33-Procedure is present]} #{auxiliary|text|procurement-terms} // 2.1.5 Procurement terms
 			0 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present]} #{auxiliary|text|submission-terms}: // Terms of submission
 				{BT-31-Procedure} #{field|name|BT-31-Procedure}: ${format-number(BT-31-Procedure, '###,##0')} // Maximum number of lots for which one tenderer can submit tenders
@@ -143,7 +142,6 @@
 				{BT-50-Lot[BT-50-Lot is present]} #{field|name|BT-50-Lot}: ${BT-50-Lot} // Minimum Candidates
 				{BT-661-Lot[BT-51-Lot is present]} #{field|name|BT-51-Lot}: ${BT-51-Lot} // Maximum Candidates
 				{BT-52-Lot[BT-52-Lot == TRUE]} #{field|name|BT-52-Lot} // The procedure will take place in successive stages. In each stage, some participants may be eliminated.
-				{BT-120-Lot[BT-120-Lot == TRUE]} #{field|name|BT-120-Lot} // The buyer reserves the right to award the contract on the basis of the initial tenders without any further negotiations.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
 				0 {ND-LotAwardCriterion[BT-539-Lot != 'unpublished']} #{field|name|BT-539-Lot}: #{BT-539-Lot} // Type
@@ -157,8 +155,8 @@
 		11 {BT-137-Lot[(BT-14-Lot is present) or (BT-632-Lot is present) or (BT-124-Lot is present)]} #{auxiliary|text|procurement-documents} // 5.1.11 Procurement documents
 			{BT-137-Lot[some text:$restricted in (for text:$somerestricted in BT-14-Lot return $somerestricted) satisfies $restricted == 'restricted-document']} #{field|name|BT-14-Lot} // The access to certain procurement documents is restricted. (Lot)
 			{BT-707-Lot} #{field|name|BT-707-Lot}: #{BT-707-Lot} // Justification for restricting access to certain procurement documents (Lot)
-			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: ${distinct-values(for text:$lang in BT-708-Lot return $lang)} // Languages in which the procurement documents are officially available (Lot)
-			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: ${distinct-values(for text:$lang in BT-737-Lot return $lang)} // Languages in which the procurement documents are unofficially available (Lot)
+			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: #{BT-708-Lot} // Languages in which the procurement documents are officially available (Lot)
+			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: #{BT-737-Lot} // Languages in which the procurement documents are unofficially available (Lot)
 			{BT-13(d)-Lot} #{field|name|BT-13(d)-Lot}: ${BT-13(d)-Lot} ${BT-13(t)-Lot} // Deadline for requesting additional information (Lot)
 			{BT-137-Lot[BT-615-Lot is present]} #{field|name|BT-615-Lot}: ${distinct-values(for text:$url in BT-615-Lot return concat($url, ', '))} // Information about restricted documents is available at (Lot) 
 			{BT-137-Lot[BT-15-Lot is present]} #{field|name|BT-15-Lot}: ${distinct-values(for text:$url in BT-15-Lot return concat($url, ', '))} // Information about non-restricted documents is available at (Lot) 
@@ -182,7 +180,7 @@
 				{BT-18-Lot} #{field|name|BT-18-Lot}: ${BT-18-Lot} // Address for submission (URL)
 				{BT-19-Lot} #{field|name|BT-19-Lot}: #{BT-19-Lot} // Submission Nonelectronic Justification
 				{BT-137-Lot[BT-745-Lot is present]} #{field|name|BT-745-Lot}: ${BT-745-Lot} // Submission Nonelectronic Description
-				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders, requests to participate, or expressions of interest may be submitted
+				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders or requests to participate may be submitted
 				{BT-764-Lot} #{field|name|BT-764-Lot}: #{BT-764-Lot} // Electronic catalogue
 				{BT-744-Lot[BT-744-Lot == 'true']} #{field|name|BT-744-Lot} // Advanced or qualified electronic signature or seal (as defined in Regulation (EU) No 910/2014) is required. (true/false)
 				{BT-63-Lot} #{field|name|BT-63-Lot}: #{BT-63-Lot} // Variants
@@ -196,11 +194,11 @@
 			0 {ND-LotTenderingTerms[(BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present)]} #{auxiliary|text|contract-terms}: // Terms of contract
 				{BT-736-Lot[BT-736-Lot != 'no']} #{field|name|BT-736-Lot}: #{BT-736-Lot} // The execution of the contract must be performed in the framework of sheltered employment programmes (yes / no / not-known)
 				{ND-ExecutionRequirements[BT-70-Lot is present]} #{field|name|BT-70-Lot}: ${BT-70-Lot} // Terms Performance
-				0 {BT-801-Lot} #{field|name|BT-801-Lot} // A non-disclosure agreement is required.
+				0 {BT-801-Lot} #{field|name|BT-801-Lot}: #{code|name|${concat('indicator.', BT-801-Lot)}} // A non-disclosure agreement is required.
 					{BT-137-Lot[BT-802-Lot is present]} #{field|name|BT-802-Lot} : ${BT-802-Lot} // Additional information about the non-disclosure agreement
 				{BT-743-Lot} #{field|name|BT-743-Lot}: #{BT-743-Lot} // Electronic invoicing
-				{BT-92-Lot[BT-92-Lot == TRUE]} #{field|name|BT-92-Lot} // Electronic ordering will be used (true / false)
-				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot} // Electronic payment will be used (true/false)
+				{BT-92-Lot} #{field|name|BT-92-Lot}: #{code|name|${if (BT-92-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic ordering will be used (true / false)
+				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot}: #{code|name|${if (BT-93-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic payment will be used (true/false)
 				{BT-761-Lot[(BT-76-Lot is present)]} #{field|name|BT-76-Lot}: ${BT-76-Lot} // Legal form that must be taken by a group of tenderers that is awarded a contract
 				{ND-PaymentTerms[BT-77-Lot is present]} #{field|name|BT-77-Lot}: ${BT-77-Lot} // Financial arrangement
 			{BT-137-Lot[BT-99-Lot is present]} #{field|name|BT-99-Lot}: ${BT-99-Lot} // Information about review deadlines
@@ -210,9 +208,9 @@
 				{BT-113-Lot} #{field|name|BT-113-Lot}: ${BT-113-Lot} // Maximum number of participants
 				{BT-137-Lot[BT-109-Lot is present]} #{field|name|BT-109-Lot}: ${BT-109-Lot} // Justification for the duration of framework agreement
 				{BT-137-Lot[BT-111-Lot is present]} #{field|name|BT-111-Lot}: ${BT-111-Lot} // Framework Buyer Categories (Lot)
-			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system} // Dynamic purchasing system 
+			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system}: // Information about the dynamic purchasing system
 				{BT-766-Lot} #{BT-766-Lot} // Dynamic Purchasing System
-			0 {ND-AuctionTerms[(BT-767-Lot is present) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|electronic-auction}: // Electronic auction #{code|name|indicator.true}
+			0 {ND-AuctionTerms[BT-767-Lot == TRUE]} #{auxiliary|text|electronic-auction}: #{code|name|${'indicator.true'}} // Electronic auction
 				{BT-123-Lot[BT-767-Lot == TRUE]} #{field|name|BT-123-Lot}: ${BT-123-Lot} // An electronic auction at the following address is used
 				{ND-AuctionTerms[BT-122-Lot[BT-767-Lot == TRUE] is present]} #{field|name|BT-122-Lot}: ${BT-122-Lot} // Electronic auction - Description
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
@@ -226,14 +224,15 @@
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -274,20 +273,7 @@
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -302,6 +288,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/13.efx b/view-templates/13.efx
index 0122ae23e..f4fc7e70f 100644
--- a/view-templates/13.efx
+++ b/view-templates/13.efx
@@ -40,8 +40,7 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
 		5 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present or BT-33-Procedure is present]} #{auxiliary|text|procurement-terms} // 2.1.5 Procurement terms
 			0 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present]} #{auxiliary|text|submission-terms}: // Terms of submission
 				{BT-31-Procedure} #{field|name|BT-31-Procedure}: ${format-number(BT-31-Procedure, '###,##0')} // Maximum number of lots for which one tenderer can submit tenders
@@ -144,7 +143,6 @@
 				{BT-50-Lot[BT-50-Lot is present]} #{field|name|BT-50-Lot}: ${BT-50-Lot} // Minimum Candidates
 				{BT-661-Lot[BT-51-Lot is present]} #{field|name|BT-51-Lot}: ${BT-51-Lot} // Maximum Candidates
 				{BT-52-Lot[BT-52-Lot == TRUE]} #{field|name|BT-52-Lot} // The procedure will take place in successive stages. In each stage, some participants may be eliminated.
-				{BT-120-Lot[BT-120-Lot == TRUE]} #{field|name|BT-120-Lot} // The buyer reserves the right to award the contract on the basis of the initial tenders without any further negotiations.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
 				0 {ND-LotAwardCriterion[BT-539-Lot != 'unpublished']} #{field|name|BT-539-Lot}: #{BT-539-Lot} // Type
@@ -158,8 +156,8 @@
 		11 {BT-137-Lot[(BT-14-Lot is present) or (BT-632-Lot is present) or (BT-124-Lot is present)]} #{auxiliary|text|procurement-documents} // 5.1.11 Procurement documents
 			{BT-137-Lot[some text:$restricted in (for text:$somerestricted in BT-14-Lot return $somerestricted) satisfies $restricted == 'restricted-document']} #{field|name|BT-14-Lot} // The access to certain procurement documents is restricted. (Lot)
 			{BT-707-Lot} #{field|name|BT-707-Lot}: #{BT-707-Lot} // Justification for restricting access to certain procurement documents (Lot)
-			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: ${distinct-values(for text:$lang in BT-708-Lot return $lang)} // Languages in which the procurement documents are officially available (Lot)
-			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: ${distinct-values(for text:$lang in BT-737-Lot return $lang)} // Languages in which the procurement documents are unofficially available (Lot)
+			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: #{BT-708-Lot} // Languages in which the procurement documents are officially available (Lot)
+			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: #{BT-737-Lot} // Languages in which the procurement documents are unofficially available (Lot)
 			{BT-13(d)-Lot} #{field|name|BT-13(d)-Lot}: ${BT-13(d)-Lot} ${BT-13(t)-Lot} // Deadline for requesting additional information (Lot)
 			{BT-137-Lot[BT-615-Lot is present]} #{field|name|BT-615-Lot}: ${distinct-values(for text:$url in BT-615-Lot return concat($url, ', '))} // Information about restricted documents is available at (Lot) 
 			{BT-137-Lot[BT-15-Lot is present]} #{field|name|BT-15-Lot}: ${distinct-values(for text:$url in BT-15-Lot return concat($url, ', '))} // Information about non-restricted documents is available at (Lot) 
@@ -183,7 +181,7 @@
 				{BT-18-Lot} #{field|name|BT-18-Lot}: ${BT-18-Lot} // Address for submission (URL)
 				{BT-19-Lot} #{field|name|BT-19-Lot}: #{BT-19-Lot} // Submission Nonelectronic Justification
 				{BT-137-Lot[BT-745-Lot is present]} #{field|name|BT-745-Lot}: ${BT-745-Lot} // Submission Nonelectronic Description
-				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders, requests to participate, or expressions of interest may be submitted
+				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders or requests to participate may be submitted
 				{BT-764-Lot} #{field|name|BT-764-Lot}: #{BT-764-Lot} // Electronic catalogue
 				{BT-744-Lot[BT-744-Lot == 'true']} #{field|name|BT-744-Lot} // Advanced or qualified electronic signature or seal (as defined in Regulation (EU) No 910/2014) is required. (true/false)
 				{BT-63-Lot} #{field|name|BT-63-Lot}: #{BT-63-Lot} // Variants
@@ -197,11 +195,11 @@
 			0 {ND-LotTenderingTerms[(BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present)]} #{auxiliary|text|contract-terms}: // Terms of contract
 				{BT-736-Lot[BT-736-Lot != 'no']} #{field|name|BT-736-Lot}: #{BT-736-Lot} // The execution of the contract must be performed in the framework of sheltered employment programmes (yes / no / not-known)
 				{ND-ExecutionRequirements[BT-70-Lot is present]} #{field|name|BT-70-Lot}: ${BT-70-Lot} // Terms Performance
-				0 {BT-801-Lot} #{field|name|BT-801-Lot} // A non-disclosure agreement is required.
+				0 {BT-801-Lot} #{field|name|BT-801-Lot}: #{code|name|${concat('indicator.', BT-801-Lot)}} // A non-disclosure agreement is required.
 					{BT-137-Lot[BT-802-Lot is present]} #{field|name|BT-802-Lot} : ${BT-802-Lot} // Additional information about the non-disclosure agreement
 				{BT-743-Lot} #{field|name|BT-743-Lot}: #{BT-743-Lot} // Electronic invoicing
-				{BT-92-Lot[BT-92-Lot == TRUE]} #{field|name|BT-92-Lot} // Electronic ordering will be used (true / false)
-				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot} // Electronic payment will be used (true/false)
+				{BT-92-Lot} #{field|name|BT-92-Lot}: #{code|name|${if (BT-92-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic ordering will be used (true / false)
+				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot}: #{code|name|${if (BT-93-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic payment will be used (true/false)
 				{BT-761-Lot[(BT-76-Lot is present)]} #{field|name|BT-76-Lot}: ${BT-76-Lot} // Legal form that must be taken by a group of tenderers that is awarded a contract
 				{ND-PaymentTerms[BT-77-Lot is present]} #{field|name|BT-77-Lot}: ${BT-77-Lot} // Financial arrangement
 			{BT-137-Lot[BT-99-Lot is present]} #{field|name|BT-99-Lot}: ${BT-99-Lot} // Information about review deadlines
@@ -211,9 +209,9 @@
 				{BT-113-Lot} #{field|name|BT-113-Lot}: ${BT-113-Lot} // Maximum number of participants
 				{BT-137-Lot[BT-109-Lot is present]} #{field|name|BT-109-Lot}: ${BT-109-Lot} // Justification for the duration of framework agreement
 				{BT-137-Lot[BT-111-Lot is present]} #{field|name|BT-111-Lot}: ${BT-111-Lot} // Framework Buyer Categories (Lot)
-			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system} // Dynamic purchasing system 
+			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system}: // Information about the dynamic purchasing system
 				{BT-766-Lot} #{BT-766-Lot} // Dynamic Purchasing System
-			0 {ND-AuctionTerms[(BT-767-Lot is present) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|electronic-auction}: // Electronic auction #{code|name|indicator.true}
+			0 {ND-AuctionTerms[BT-767-Lot == TRUE]} #{auxiliary|text|electronic-auction}: #{code|name|${'indicator.true'}} // Electronic auction
 				{BT-123-Lot[BT-767-Lot == TRUE]} #{field|name|BT-123-Lot}: ${BT-123-Lot} // An electronic auction at the following address is used
 				{ND-AuctionTerms[BT-122-Lot[BT-767-Lot == TRUE] is present]} #{field|name|BT-122-Lot}: ${BT-122-Lot} // Electronic auction - Description
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
@@ -227,14 +225,15 @@
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -275,20 +274,7 @@
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -303,6 +289,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/14.efx b/view-templates/14.efx
index 829dfd3a4..d7f8091a8 100644
--- a/view-templates/14.efx
+++ b/view-templates/14.efx
@@ -14,7 +14,6 @@
 		{BT-04-notice} #{field|name|BT-04-notice}: ${BT-04-notice} // Procedure identifier
 		{OPP-090-Procedure} #{field|name|OPP-090-Procedure}: ${OPP-090-Procedure} // Previous Notice
 		{BT-22-Procedure} #{field|name|BT-22-Procedure}: ${BT-22-Procedure} // Internal identifier
-		0 {BT-105-Procedure[BT-105-Procedure != 'unpublished']} #{field|name|BT-105-Procedure}: #{BT-105-Procedure} // Type of the procedure
 		1 {ND-ProcedureProcurementScope[(BT-23-Procedure is present) or (BT-531-Procedure is present) or (BT-262-Procedure is present) or (BT-263-Procedure is present)]} #{auxiliary|text|purpose} // 2.1.1 Purpose
 			{BT-23-Procedure} #{field|name|BT-23-Procedure}: #{BT-23-Procedure} // Nature of the contract
 			{BT-531-Procedure} #{field|name|BT-531-Procedure}: #{BT-531-Procedure} // Additional nature of the contract
@@ -32,7 +31,6 @@
 			{ND-ProcedurePlacePerformance[BT-728-Procedure is present]} #{field|name|BT-728-Procedure}: ${BT-728-Procedure} // Place Performance Additional information
 		3 {ND-ProcedureProcurementScope[(BT-27-Procedure is present) or (BT-271-Procedure is present)]} #{auxiliary|text|value} // 2.1.3 Value
 			{BT-27-Procedure} #{field|name|BT-27-Procedure}: ${format-number(BT-27-Procedure, '###,##0.##')} ${BT-27-Procedure/@currencyID} // Estimated value
-			{BT-271-Procedure} #{field|name|BT-271-Procedure}: ${format-number(BT-271-Procedure, '###,##0.##')} ${BT-271-Procedure/@currencyID} // Estimated Framework Maximum Value
 		4 {ND-ProcedureProcurementScope[BT-01-notice is present]} #{auxiliary|text|general-information} // 2.1.4 General information
 			{BT-634-Procedure[BT-634-Procedure == TRUE]} #{field|name|BT-634-Procedure} // Procurement Relaunch
 			{ND-ProcedureProcurementScope[BT-300-Procedure is present]} #{field|name|BT-300-Procedure}: ${BT-300-Procedure} // Additional information
@@ -40,8 +38,7 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
 		5 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present or BT-33-Procedure is present]} #{auxiliary|text|procurement-terms} // 2.1.5 Procurement terms
 			0 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present]} #{auxiliary|text|submission-terms}: // Terms of submission
 				{BT-31-Procedure} #{field|name|BT-31-Procedure}: ${format-number(BT-31-Procedure, '###,##0')} // Maximum number of lots for which one tenderer can submit tenders
@@ -58,7 +55,6 @@
 		{BT-22-LotsGroup} #{field|name|BT-22-LotsGroup}: ${BT-22-LotsGroup} // Internal identifier of LotsGroup
 		1 {BT-137-LotsGroup[(BT-27-LotsGroup is present) or (BT-271-LotsGroup is present) or (BT-157-LotsGroup is present)]} #{auxiliary|text|value} // 4.1.1 Value
 			{BT-27-LotsGroup} #{field|name|BT-27-LotsGroup}: ${format-number(BT-27-LotsGroup, '###,##0.##')} ${BT-27-LotsGroup/@currencyID} // Estimated value
-			{BT-271-LotsGroup} #{field|name|BT-271-LotsGroup}: ${format-number(BT-271-LotsGroup, '###,##0.##')} ${BT-271-LotsGroup/@currencyID} // Framework Maximum Value
 		2 {ND-LotsGroupProcurementScope[BT-300-LotsGroup is present]} #{auxiliary|text|general-information} // 4.1.2 General information
 			{BT-137-LotsGroup[BT-300-LotsGroup is present]} #{field|name|BT-300-LotsGroup}: ${BT-300-LotsGroup} // Additional information
 		3 {ND-LotsGroupAwardCriteria} #{auxiliary|text|award-criteria} // 4.1.3 Award criteria
@@ -100,7 +96,6 @@
 			{BT-538-Lot} #{field|name|BT-538-Lot}: #{BT-538-Lot} // Planned Period (Unlimited)
 		5 {ND-LotValueEstimate[(BT-27-Lot is present) or (BT-271-Lot is present) or (some text:$glo in (for text:$lotid in BT-137-Lot, text:$ldgloid in BT-330-Procedure[BT-1375-Procedure == $lotid], text:$gloid in BT-137-LotsGroup[BT-137-LotsGroup[BT-157-LotsGroup is present] == $ldgloid] return $gloid) satisfies $glo != '')]} #{auxiliary|text|value} // 5.1.5 Value
 			{BT-27-Lot} #{field|name|BT-27-Lot}: ${format-number(BT-27-Lot, '###,##0.##')} ${BT-27-Lot/@currencyID} // Estimated value
-			{BT-271-Lot} #{field|name|BT-271-Lot}: ${format-number(BT-271-Lot, '###,##0.##')} ${BT-271-Lot/@currencyID} // Framework Maximum Value
 		6 {BT-137-Lot[(BT-634-Lot == TRUE) or (BT-94-Lot == TRUE) or (BT-95-Lot is present) or (BT-71-Lot is present) or (BT-79-Lot is present) or (BT-60-Lot == 'eu-funds') or (BT-7220-Lot is present) or (BT-5010-Lot is present) or (BT-6140-Lot is present) or (BT-115-Lot == TRUE) or (BT-726-Lot == TRUE) or (BT-125(i)-Lot is present) or (BT-1251-Lot is present) or (BT-300-Lot is present)]} #{auxiliary|text|general-information} // 5.1.6 General information
 			{BT-634-Lot[BT-634-Lot == TRUE]} #{field|name|BT-634-Lot} // This cancelled or unsuccessful procedure or lot will be relaunched (only true allowed).
 			{BT-71-Lot} #{field|name|BT-71-Lot}: #{BT-71-Lot} // Reserved Participation
@@ -137,7 +132,6 @@
 				{BT-50-Lot[BT-50-Lot is present]} #{field|name|BT-50-Lot}: ${BT-50-Lot} // Minimum Candidates
 				{BT-661-Lot[BT-51-Lot is present]} #{field|name|BT-51-Lot}: ${BT-51-Lot} // Maximum Candidates
 				{BT-52-Lot[BT-52-Lot == TRUE]} #{field|name|BT-52-Lot} // The procedure will take place in successive stages. In each stage, some participants may be eliminated.
-				{BT-120-Lot[BT-120-Lot == TRUE]} #{field|name|BT-120-Lot} // The buyer reserves the right to award the contract on the basis of the initial tenders without any further negotiations.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
 				0 {ND-LotAwardCriterion[BT-539-Lot != 'unpublished']} #{field|name|BT-539-Lot}: #{BT-539-Lot} // Type
@@ -151,8 +145,8 @@
 		11 {BT-137-Lot[(BT-14-Lot is present) or (BT-632-Lot is present) or (BT-124-Lot is present)]} #{auxiliary|text|procurement-documents} // 5.1.11 Procurement documents
 			{BT-137-Lot[some text:$restricted in (for text:$somerestricted in BT-14-Lot return $somerestricted) satisfies $restricted == 'restricted-document']} #{field|name|BT-14-Lot} // The access to certain procurement documents is restricted. (Lot)
 			{BT-707-Lot} #{field|name|BT-707-Lot}: #{BT-707-Lot} // Justification for restricting access to certain procurement documents (Lot)
-			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: ${distinct-values(for text:$lang in BT-708-Lot return $lang)} // Languages in which the procurement documents are officially available (Lot)
-			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: ${distinct-values(for text:$lang in BT-737-Lot return $lang)} // Languages in which the procurement documents are unofficially available (Lot)
+			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: #{BT-708-Lot} // Languages in which the procurement documents are officially available (Lot)
+			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: #{BT-737-Lot} // Languages in which the procurement documents are unofficially available (Lot)
 			{BT-13(d)-Lot} #{field|name|BT-13(d)-Lot}: ${BT-13(d)-Lot} ${BT-13(t)-Lot} // Deadline for requesting additional information (Lot)
 			{BT-137-Lot[BT-615-Lot is present]} #{field|name|BT-615-Lot}: ${distinct-values(for text:$url in BT-615-Lot return concat($url, ', '))} // Information about restricted documents is available at (Lot) 
 			{BT-137-Lot[BT-15-Lot is present]} #{field|name|BT-15-Lot}: ${distinct-values(for text:$url in BT-15-Lot return concat($url, ', '))} // Information about non-restricted documents is available at (Lot) 
@@ -176,8 +170,7 @@
 				{BT-18-Lot} #{field|name|BT-18-Lot}: ${BT-18-Lot} // Address for submission (URL)
 				{BT-19-Lot} #{field|name|BT-19-Lot}: #{BT-19-Lot} // Submission Nonelectronic Justification
 				{BT-137-Lot[BT-745-Lot is present]} #{field|name|BT-745-Lot}: ${BT-745-Lot} // Submission Nonelectronic Description
-				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders, requests to participate, or expressions of interest may be submitted
-				{BT-764-Lot} #{field|name|BT-764-Lot}: #{BT-764-Lot} // Electronic catalogue
+				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders or requests to participate may be submitted
 				{BT-744-Lot[BT-744-Lot == 'true']} #{field|name|BT-744-Lot} // Advanced or qualified electronic signature or seal (as defined in Regulation (EU) No 910/2014) is required. (true/false)
 				{BT-63-Lot} #{field|name|BT-63-Lot}: #{BT-63-Lot} // Variants
 				{BT-769-Lot[BT-769-Lot == 'allowed']} #{field|name|BT-769-Lot} // Tenderers may submit more than one tender.
@@ -190,16 +183,16 @@
 			0 {ND-LotTenderingTerms[(BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present)]} #{auxiliary|text|contract-terms}: // Terms of contract
 				{BT-736-Lot[BT-736-Lot != 'no']} #{field|name|BT-736-Lot}: #{BT-736-Lot} // The execution of the contract must be performed in the framework of sheltered employment programmes (yes / no / not-known)
 				{ND-ExecutionRequirements[BT-70-Lot is present]} #{field|name|BT-70-Lot}: ${BT-70-Lot} // Terms Performance
-				0 {BT-801-Lot} #{field|name|BT-801-Lot} // A non-disclosure agreement is required.
+				0 {BT-801-Lot} #{field|name|BT-801-Lot}: #{code|name|${concat('indicator.', BT-801-Lot)}} // A non-disclosure agreement is required.
 					{BT-137-Lot[BT-802-Lot is present]} #{field|name|BT-802-Lot} : ${BT-802-Lot} // Additional information about the non-disclosure agreement
 				{BT-743-Lot} #{field|name|BT-743-Lot}: #{BT-743-Lot} // Electronic invoicing
-				{BT-92-Lot[BT-92-Lot == TRUE]} #{field|name|BT-92-Lot} // Electronic ordering will be used (true / false)
-				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot} // Electronic payment will be used (true/false)
+				{BT-92-Lot} #{field|name|BT-92-Lot}: #{code|name|${if (BT-92-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic ordering will be used (true / false)
+				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot}: #{code|name|${if (BT-93-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic payment will be used (true/false)
 				{BT-761-Lot[(BT-76-Lot is present)]} #{field|name|BT-76-Lot}: ${BT-76-Lot} // Legal form that must be taken by a group of tenderers that is awarded a contract
 				{ND-PaymentTerms[BT-77-Lot is present]} #{field|name|BT-77-Lot}: ${BT-77-Lot} // Financial arrangement
 			{BT-137-Lot[BT-99-Lot is present]} #{field|name|BT-99-Lot}: ${BT-99-Lot} // Information about review deadlines
 		15 {ND-LotTenderingProcess[(BT-765-Lot is present) or (BT-113-Lot is present) or (BT-109-Lot is present) or (BT-111-Lot is present) or (BT-766-Lot is present) or (BT-119-LotResult == TRUE) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|techniques} // 5.1.15 Techniques
-			0 {ND-AuctionTerms[(BT-767-Lot is present) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|electronic-auction}: // Electronic auction #{code|name|indicator.true}
+			0 {ND-AuctionTerms[BT-767-Lot == TRUE]} #{auxiliary|text|electronic-auction}: #{code|name|${'indicator.true'}} // Electronic auction
 				{BT-123-Lot[BT-767-Lot == TRUE]} #{field|name|BT-123-Lot}: ${BT-123-Lot} // An electronic auction at the following address is used
 				{ND-AuctionTerms[BT-122-Lot[BT-767-Lot == TRUE] is present]} #{field|name|BT-122-Lot}: ${BT-122-Lot} // Electronic auction - Description
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
@@ -213,14 +206,15 @@
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -248,8 +242,6 @@
 		0 {ND-Organization} #{auxiliary|text|roles}: // Roles of this organisation
 			0 {ND-Organization[count(for text:$orgid in OPT-200-Organization-Company return OPT-300-Procedure-Buyer[OPT-300-Procedure-Buyer == $orgid])>0]} #{auxiliary|text|buyer} // This org is a Buyer
 				{OPP-050-Organization[OPP-050-Organization == TRUE]} #{field|name|OPP-050-Organization} // Leader of the group
-				{OPP-052-Organization[OPP-052-Organization == TRUE]} #{field|name|OPP-052-Organization} // CPB Acquiring
-				{OPP-051-Organization[OPP-051-Organization == TRUE]} #{field|name|OPP-051-Organization} // CPB Awarding
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'serv-prov') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'serv-prov')]} #{auxiliary|text|organisation-providing-procurement-service} // This org is a Service Provider
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'ted-esen') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'ted-esen')]} #{auxiliary|text|organisation-esender} // This org is an eSender
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (LOT)
@@ -261,20 +253,7 @@
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -289,6 +268,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/15.efx b/view-templates/15.efx
index d060c193f..143943c74 100644
--- a/view-templates/15.efx
+++ b/view-templates/15.efx
@@ -37,24 +37,6 @@
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
 		6 {ND-ProcedureTerms[(BT-67(a)-Procedure is present)]} #{auxiliary|text|exclusion-grounds} // 2.1.6 Exclusion grounds
 			{BT-67(a)-Procedure} #{BT-67(a)-Procedure}: ${for text:$egdesc in BT-67(b)-Procedure return $egdesc} // Description
-4 {ND-Root[BT-137-LotsGroup is present]} #{auxiliary|text|group-of-lots} // 4. Group of lots
-	1 {ND-LotsGroup} #{field|name|BT-330-Procedure}: ${BT-137-LotsGroup} // 4.1 Group of lots
-		{BT-137-LotsGroup} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-137-LotsGroup return BT-1375-Procedure[BT-330-Procedure == $gloid]} // Lots included / Group Lot Identifier 
-		{BT-137-LotsGroup[BT-21-LotsGroup is present]} #{field|name|BT-21-LotsGroup}: ${BT-21-LotsGroup} // Title of LotsGroup
-		{BT-137-LotsGroup[BT-24-LotsGroup is present]} #{field|name|BT-24-LotsGroup}: ${BT-24-LotsGroup} // Description of LotsGroup
-		{BT-22-LotsGroup} #{field|name|BT-22-LotsGroup}: ${BT-22-LotsGroup} // Internal identifier of LotsGroup
-		2 {ND-LotsGroupProcurementScope[BT-300-LotsGroup is present]} #{auxiliary|text|general-information} // 4.1.2 General information
-			{BT-137-LotsGroup[BT-300-LotsGroup is present]} #{field|name|BT-300-LotsGroup}: ${BT-300-LotsGroup} // Additional information
-		3 {ND-LotsGroupAwardCriteria} #{auxiliary|text|award-criteria} // 4.1.3 Award criteria
-			0 {ND-LotsGroupAwardCriterion} #{auxiliary|text|criterion}: // Criterion
-				0 {ND-LotsGroupAwardCriterion[BT-539-LotsGroup != 'unpublished' ]} #{field|name|BT-539-LotsGroup}: #{BT-539-LotsGroup} // Criterion Type
-				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup != 'unpublished']} #{field|name|BT-734-LotsGroup}: ${BT-734-LotsGroup} // Criterion Name
-				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup != 'unpublished']} #{field|name|BT-540-LotsGroup}: ${BT-540-LotsGroup} // Award Criterion Description
-				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup != 'unpublished']} #{BT-5421-LotsGroup}: ${format-number(BT-541-LotsGroup, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
-				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup != 'unpublished']} #{BT-5422-LotsGroup}: ${format-number(BT-541-LotsGroup, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
-				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup != 'unpublished']} #{BT-5423-LotsGroup}: ${format-number(BT-541-LotsGroup, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
-			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup != 'unpublished']} #{field|name|BT-543-LotsGroup}: ${BT-543-LotsGroup} // Award Criteria Complicated
-			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup != 'unpublished']} #{field|name|BT-733-LotsGroup}: ${BT-733-LotsGroup} // Award Criteria Order Justification
 5 {ND-Root[BT-137-Lot is present]} #{auxiliary|text|lot} // 5. Lots
 	1 {ND-Lot} #{field|name|BT-137-Lot}: ${BT-137-Lot} // 5.1 Lot
 		{ND-Lot} #{field|name|BT-21-Lot}: ${BT-21-Lot} // Title
@@ -133,8 +115,8 @@
 		11 {BT-137-Lot[(BT-14-Lot is present) or (BT-632-Lot is present) or (BT-124-Lot is present)]} #{auxiliary|text|procurement-documents} // 5.1.11 Procurement documents
 			{BT-137-Lot[some text:$restricted in (for text:$somerestricted in BT-14-Lot return $somerestricted) satisfies $restricted == 'restricted-document']} #{field|name|BT-14-Lot} // The access to certain procurement documents is restricted. (Lot)
 			{BT-707-Lot} #{field|name|BT-707-Lot}: #{BT-707-Lot} // Justification for restricting access to certain procurement documents (Lot)
-			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: ${distinct-values(for text:$lang in BT-708-Lot return $lang)} // Languages in which the procurement documents are officially available (Lot)
-			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: ${distinct-values(for text:$lang in BT-737-Lot return $lang)} // Languages in which the procurement documents are unofficially available (Lot)
+			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: #{BT-708-Lot} // Languages in which the procurement documents are officially available (Lot)
+			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: #{BT-737-Lot} // Languages in which the procurement documents are unofficially available (Lot)
 			{BT-13(d)-Lot} #{field|name|BT-13(d)-Lot}: ${BT-13(d)-Lot} ${BT-13(t)-Lot} // Deadline for requesting additional information (Lot)
 			{BT-137-Lot[BT-615-Lot is present]} #{field|name|BT-615-Lot}: ${distinct-values(for text:$url in BT-615-Lot return concat($url, ', '))} // Information about restricted documents is available at (Lot) 
 			{BT-137-Lot[BT-15-Lot is present]} #{field|name|BT-15-Lot}: ${distinct-values(for text:$url in BT-15-Lot return concat($url, ', '))} // Information about non-restricted documents is available at (Lot) 
@@ -151,10 +133,8 @@
 				{BT-18-Lot} #{field|name|BT-18-Lot}: ${BT-18-Lot} // Address for submission (URL)
 				{BT-19-Lot} #{field|name|BT-19-Lot}: #{BT-19-Lot} // Submission Nonelectronic Justification
 				{BT-137-Lot[BT-745-Lot is present]} #{field|name|BT-745-Lot}: ${BT-745-Lot} // Submission Nonelectronic Description
-				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders, requests to participate, or expressions of interest may be submitted
-				{BT-764-Lot} #{field|name|BT-764-Lot}: #{BT-764-Lot} // Electronic catalogue
+				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders or requests to participate may be submitted
 				{BT-744-Lot[BT-744-Lot == 'true']} #{field|name|BT-744-Lot} // Advanced or qualified electronic signature or seal (as defined in Regulation (EU) No 910/2014) is required. (true/false)
-				{BT-769-Lot[BT-769-Lot == 'allowed']} #{field|name|BT-769-Lot} // Tenderers may submit more than one tender.
 				{BT-751-Lot[BT-75-Lot is present]} #{field|name|BT-75-Lot}: ${for text:$fgdesc in BT-75-Lot return $fgdesc} // Financial Guarantee Description
 				{BT-98-Lot} #{field|name|BT-98-Lot}: ${OPA-98-Lot-Number} ${BT-98-Lot/@unitCode} // Deadline until which the tender must remain valid
 			0 {ND-LateTendererInformation[(BT-771-Lot is present) and (BT-772-Lot is present)]} #{auxiliary|text|late-tenderer-info}: // Information that can be supplemented after the submission deadline
@@ -163,11 +143,11 @@
 			0 {ND-LotTenderingTerms[(BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present)]} #{auxiliary|text|contract-terms}: // Terms of contract
 				{BT-736-Lot[BT-736-Lot != 'no']} #{field|name|BT-736-Lot}: #{BT-736-Lot} // The execution of the contract must be performed in the framework of sheltered employment programmes (yes / no / not-known)
 				{ND-ExecutionRequirements[BT-70-Lot is present]} #{field|name|BT-70-Lot}: ${BT-70-Lot} // Terms Performance
-				0 {BT-801-Lot} #{field|name|BT-801-Lot} // A non-disclosure agreement is required.
+				0 {BT-801-Lot} #{field|name|BT-801-Lot}: #{code|name|${concat('indicator.', BT-801-Lot)}} // A non-disclosure agreement is required.
 					{BT-137-Lot[BT-802-Lot is present]} #{field|name|BT-802-Lot} : ${BT-802-Lot} // Additional information about the non-disclosure agreement
 				{BT-743-Lot} #{field|name|BT-743-Lot}: #{BT-743-Lot} // Electronic invoicing
-				{BT-92-Lot[BT-92-Lot == TRUE]} #{field|name|BT-92-Lot} // Electronic ordering will be used (true / false)
-				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot} // Electronic payment will be used (true/false)
+				{BT-92-Lot} #{field|name|BT-92-Lot}: #{code|name|${if (BT-92-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic ordering will be used (true / false)
+				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot}: #{code|name|${if (BT-93-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic payment will be used (true/false)
 				{BT-761-Lot[(BT-76-Lot is present)]} #{field|name|BT-76-Lot}: ${BT-76-Lot} // Legal form that must be taken by a group of tenderers that is awarded a contract
 				{ND-PaymentTerms[BT-77-Lot is present]} #{field|name|BT-77-Lot}: ${BT-77-Lot} // Financial arrangement
 			{BT-137-Lot[BT-99-Lot is present]} #{field|name|BT-99-Lot}: ${BT-99-Lot} // Information about review deadlines
@@ -182,14 +162,15 @@
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -230,20 +211,7 @@
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -258,6 +226,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/16.efx b/view-templates/16.efx
index d512991fe..aff47ae3d 100644
--- a/view-templates/16.efx
+++ b/view-templates/16.efx
@@ -13,7 +13,7 @@
 		{OPP-090-Procedure} #{field|name|OPP-090-Procedure}: ${OPP-090-Procedure} // Previous Notice
 		{BT-22-Procedure} #{field|name|BT-22-Procedure}: ${BT-22-Procedure} // Internal identifier
 		0 {BT-105-Procedure[BT-105-Procedure != 'unpublished']} #{field|name|BT-105-Procedure}: #{BT-105-Procedure} // Type of the procedure
-		0 {BT-106-Procedure[BT-106-Procedure != 'unpublished']} #{field|name|BT-106-Procedure}: ${if (BT-106-Procedure == 'true') then 'Yes' else 'No'} // The procedure is accelerated. (true/false)
+		0 {BT-106-Procedure[BT-106-Procedure != 'unpublished']} #{field|name|BT-106-Procedure}: #{code|name|${concat('indicator.',BT-106-Procedure)}} // The procedure is accelerated. (true/false)
 		0 {ND-ProcedureProcurementScope[BT-1351-Procedure != 'unpublished']} #{field|name|BT-1351-Procedure}: ${BT-1351-Procedure} // Justification for the accelerated procedure
 		0 {ND-ProcedureProcurementScope[BT-88-Procedure != 'unpublished']} #{field|name|BT-88-Procedure}: ${BT-88-Procedure} // Procedure Features / Description of the procedure
 		1 {ND-ProcedureProcurementScope[(BT-23-Procedure is present) or (BT-531-Procedure is present) or (BT-262-Procedure is present) or (BT-263-Procedure is present)]} #{auxiliary|text|purpose} // 2.1.1 Purpose
@@ -41,8 +41,7 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
 		5 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present or BT-33-Procedure is present]} #{auxiliary|text|procurement-terms} // 2.1.5 Procurement terms
 			0 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present]} #{auxiliary|text|submission-terms}: // Terms of submission
 				{BT-31-Procedure} #{field|name|BT-31-Procedure}: ${format-number(BT-31-Procedure, '###,##0')} // Maximum number of lots for which one tenderer can submit tenders
@@ -162,8 +161,8 @@
 		11 {BT-137-Lot[(BT-14-Lot is present) or (BT-632-Lot is present) or (BT-124-Lot is present)]} #{auxiliary|text|procurement-documents} // 5.1.11 Procurement documents
 			{BT-137-Lot[some text:$restricted in (for text:$somerestricted in BT-14-Lot return $somerestricted) satisfies $restricted == 'restricted-document']} #{field|name|BT-14-Lot} // The access to certain procurement documents is restricted. (Lot)
 			{BT-707-Lot} #{field|name|BT-707-Lot}: #{BT-707-Lot} // Justification for restricting access to certain procurement documents (Lot)
-			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: ${distinct-values(for text:$lang in BT-708-Lot return $lang)} // Languages in which the procurement documents are officially available (Lot)
-			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: ${distinct-values(for text:$lang in BT-737-Lot return $lang)} // Languages in which the procurement documents are unofficially available (Lot)
+			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: #{BT-708-Lot} // Languages in which the procurement documents are officially available (Lot)
+			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: #{BT-737-Lot} // Languages in which the procurement documents are unofficially available (Lot)
 			{BT-13(d)-Lot} #{field|name|BT-13(d)-Lot}: ${BT-13(d)-Lot} ${BT-13(t)-Lot} // Deadline for requesting additional information (Lot)
 			{BT-137-Lot[BT-615-Lot is present]} #{field|name|BT-615-Lot}: ${distinct-values(for text:$url in BT-615-Lot return concat($url, ', '))} // Information about restricted documents is available at (Lot) 
 			{BT-137-Lot[BT-15-Lot is present]} #{field|name|BT-15-Lot}: ${distinct-values(for text:$url in BT-15-Lot return concat($url, ', '))} // Information about non-restricted documents is available at (Lot) 
@@ -186,7 +185,7 @@
 				{BT-18-Lot} #{field|name|BT-18-Lot}: ${BT-18-Lot} // Address for submission (URL)
 				{BT-19-Lot} #{field|name|BT-19-Lot}: #{BT-19-Lot} // Submission Nonelectronic Justification
 				{BT-137-Lot[BT-745-Lot is present]} #{field|name|BT-745-Lot}: ${BT-745-Lot} // Submission Nonelectronic Description
-				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders, requests to participate, or expressions of interest may be submitted
+				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders or requests to participate may be submitted
 				{BT-764-Lot} #{field|name|BT-764-Lot}: #{BT-764-Lot} // Electronic catalogue
 				{BT-744-Lot[BT-744-Lot == 'true']} #{field|name|BT-744-Lot} // Advanced or qualified electronic signature or seal (as defined in Regulation (EU) No 910/2014) is required. (true/false)
 				{BT-63-Lot} #{field|name|BT-63-Lot}: #{BT-63-Lot} // Variants
@@ -205,11 +204,11 @@
 			0 {ND-LotTenderingTerms[(BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present)]} #{auxiliary|text|contract-terms}: // Terms of contract
 				{BT-736-Lot[BT-736-Lot != 'no']} #{field|name|BT-736-Lot}: #{BT-736-Lot} // The execution of the contract must be performed in the framework of sheltered employment programmes (yes / no / not-known)
 				{ND-ExecutionRequirements[BT-70-Lot is present]} #{field|name|BT-70-Lot}: ${BT-70-Lot} // Terms Performance
-				0 {BT-801-Lot} #{field|name|BT-801-Lot} // A non-disclosure agreement is required.
+				0 {BT-801-Lot} #{field|name|BT-801-Lot}: #{code|name|${concat('indicator.', BT-801-Lot)}} // A non-disclosure agreement is required.
 					{BT-137-Lot[BT-802-Lot is present]} #{field|name|BT-802-Lot} : ${BT-802-Lot} // Additional information about the non-disclosure agreement
 				{BT-743-Lot} #{field|name|BT-743-Lot}: #{BT-743-Lot} // Electronic invoicing
-				{BT-92-Lot[BT-92-Lot == TRUE]} #{field|name|BT-92-Lot} // Electronic ordering will be used (true / false)
-				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot} // Electronic payment will be used (true/false)
+				{BT-92-Lot} #{field|name|BT-92-Lot}: #{code|name|${if (BT-92-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic ordering will be used (true / false)
+				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot}: #{code|name|${if (BT-93-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic payment will be used (true/false)
 				{BT-761-Lot[(BT-76-Lot is present)]} #{field|name|BT-76-Lot}: ${BT-76-Lot} // Legal form that must be taken by a group of tenderers that is awarded a contract
 				{ND-PaymentTerms[BT-77-Lot is present]} #{field|name|BT-77-Lot}: ${BT-77-Lot} // Financial arrangement
 			{BT-137-Lot[BT-99-Lot is present]} #{field|name|BT-99-Lot}: ${BT-99-Lot} // Information about review deadlines
@@ -219,9 +218,9 @@
 				{BT-113-Lot} #{field|name|BT-113-Lot}: ${BT-113-Lot} // Maximum number of participants
 				{BT-137-Lot[BT-109-Lot is present]} #{field|name|BT-109-Lot}: ${BT-109-Lot} // Justification for the duration of framework agreement
 				{BT-137-Lot[BT-111-Lot is present]} #{field|name|BT-111-Lot}: ${BT-111-Lot} // Framework Buyer Categories (Lot)
-			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system} // Dynamic purchasing system 
+			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system}: // Information about the dynamic purchasing system
 				{BT-766-Lot} #{BT-766-Lot} // Dynamic Purchasing System
-			0 {ND-AuctionTerms[(BT-767-Lot is present) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|electronic-auction}: // Electronic auction #{code|name|indicator.true}
+			0 {ND-AuctionTerms[BT-767-Lot == TRUE]} #{auxiliary|text|electronic-auction}: #{code|name|${'indicator.true'}} // Electronic auction
 				{BT-123-Lot[BT-767-Lot == TRUE]} #{field|name|BT-123-Lot}: ${BT-123-Lot} // An electronic auction at the following address is used
 				{ND-AuctionTerms[BT-122-Lot[BT-767-Lot == TRUE] is present]} #{field|name|BT-122-Lot}: ${BT-122-Lot} // Electronic auction - Description
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
@@ -235,14 +234,15 @@
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -283,20 +283,7 @@
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -311,6 +298,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/17.efx b/view-templates/17.efx
index d88a526b6..c312c83b1 100644
--- a/view-templates/17.efx
+++ b/view-templates/17.efx
@@ -14,7 +14,7 @@
 		{OPP-090-Procedure} #{field|name|OPP-090-Procedure}: ${OPP-090-Procedure} // Previous Notice
 		{BT-22-Procedure} #{field|name|BT-22-Procedure}: ${BT-22-Procedure} // Internal identifier
 		0 {BT-105-Procedure[BT-105-Procedure != 'unpublished']} #{field|name|BT-105-Procedure}: #{BT-105-Procedure} // Type of the procedure
-		0 {BT-106-Procedure[BT-106-Procedure != 'unpublished']} #{field|name|BT-106-Procedure}: ${if (BT-106-Procedure == 'true') then 'Yes' else 'No'} // The procedure is accelerated. (true/false)
+		0 {BT-106-Procedure[BT-106-Procedure != 'unpublished']} #{field|name|BT-106-Procedure}: #{code|name|${concat('indicator.',BT-106-Procedure)}} // The procedure is accelerated. (true/false)
 		0 {ND-ProcedureProcurementScope[BT-1351-Procedure != 'unpublished']} #{field|name|BT-1351-Procedure}: ${BT-1351-Procedure} // Justification for the accelerated procedure
 		0 {ND-ProcedureProcurementScope[BT-88-Procedure != 'unpublished']} #{field|name|BT-88-Procedure}: ${BT-88-Procedure} // Procedure Features / Description of the procedure
 		1 {ND-ProcedureProcurementScope[(BT-23-Procedure is present) or (BT-531-Procedure is present) or (BT-262-Procedure is present) or (BT-263-Procedure is present)]} #{auxiliary|text|purpose} // 2.1.1 Purpose
@@ -42,8 +42,7 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
 		5 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present or BT-33-Procedure is present]} #{auxiliary|text|procurement-terms} // 2.1.5 Procurement terms
 			0 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present]} #{auxiliary|text|submission-terms}: // Terms of submission
 				{BT-31-Procedure} #{field|name|BT-31-Procedure}: ${format-number(BT-31-Procedure, '###,##0')} // Maximum number of lots for which one tenderer can submit tenders
@@ -149,7 +148,6 @@
 				{BT-50-Lot[BT-50-Lot is present]} #{field|name|BT-50-Lot}: ${BT-50-Lot} // Minimum Candidates
 				{BT-661-Lot[BT-51-Lot is present]} #{field|name|BT-51-Lot}: ${BT-51-Lot} // Maximum Candidates
 				{BT-52-Lot[BT-52-Lot == TRUE]} #{field|name|BT-52-Lot} // The procedure will take place in successive stages. In each stage, some participants may be eliminated.
-				{BT-120-Lot[BT-120-Lot == TRUE]} #{field|name|BT-120-Lot} // The buyer reserves the right to award the contract on the basis of the initial tenders without any further negotiations.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
 				0 {ND-LotAwardCriterion[BT-539-Lot != 'unpublished']} #{field|name|BT-539-Lot}: #{BT-539-Lot} // Type
@@ -163,8 +161,8 @@
 		11 {BT-137-Lot[(BT-14-Lot is present) or (BT-632-Lot is present) or (BT-124-Lot is present)]} #{auxiliary|text|procurement-documents} // 5.1.11 Procurement documents
 			{BT-137-Lot[some text:$restricted in (for text:$somerestricted in BT-14-Lot return $somerestricted) satisfies $restricted == 'restricted-document']} #{field|name|BT-14-Lot} // The access to certain procurement documents is restricted. (Lot)
 			{BT-707-Lot} #{field|name|BT-707-Lot}: #{BT-707-Lot} // Justification for restricting access to certain procurement documents (Lot)
-			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: ${distinct-values(for text:$lang in BT-708-Lot return $lang)} // Languages in which the procurement documents are officially available (Lot)
-			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: ${distinct-values(for text:$lang in BT-737-Lot return $lang)} // Languages in which the procurement documents are unofficially available (Lot)
+			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: #{BT-708-Lot} // Languages in which the procurement documents are officially available (Lot)
+			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: #{BT-737-Lot} // Languages in which the procurement documents are unofficially available (Lot)
 			{BT-13(d)-Lot} #{field|name|BT-13(d)-Lot}: ${BT-13(d)-Lot} ${BT-13(t)-Lot} // Deadline for requesting additional information (Lot)
 			{BT-137-Lot[BT-615-Lot is present]} #{field|name|BT-615-Lot}: ${distinct-values(for text:$url in BT-615-Lot return concat($url, ', '))} // Information about restricted documents is available at (Lot) 
 			{BT-137-Lot[BT-15-Lot is present]} #{field|name|BT-15-Lot}: ${distinct-values(for text:$url in BT-15-Lot return concat($url, ', '))} // Information about non-restricted documents is available at (Lot) 
@@ -187,7 +185,7 @@
 				{BT-18-Lot} #{field|name|BT-18-Lot}: ${BT-18-Lot} // Address for submission (URL)
 				{BT-19-Lot} #{field|name|BT-19-Lot}: #{BT-19-Lot} // Submission Nonelectronic Justification
 				{BT-137-Lot[BT-745-Lot is present]} #{field|name|BT-745-Lot}: ${BT-745-Lot} // Submission Nonelectronic Description
-				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders, requests to participate, or expressions of interest may be submitted
+				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders or requests to participate may be submitted
 				{BT-764-Lot} #{field|name|BT-764-Lot}: #{BT-764-Lot} // Electronic catalogue
 				{BT-744-Lot[BT-744-Lot == 'true']} #{field|name|BT-744-Lot} // Advanced or qualified electronic signature or seal (as defined in Regulation (EU) No 910/2014) is required. (true/false)
 				{BT-63-Lot} #{field|name|BT-63-Lot}: #{BT-63-Lot} // Variants
@@ -206,11 +204,11 @@
 			0 {ND-LotTenderingTerms[(BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present)]} #{auxiliary|text|contract-terms}: // Terms of contract
 				{BT-736-Lot[BT-736-Lot != 'no']} #{field|name|BT-736-Lot}: #{BT-736-Lot} // The execution of the contract must be performed in the framework of sheltered employment programmes (yes / no / not-known)
 				{ND-ExecutionRequirements[BT-70-Lot is present]} #{field|name|BT-70-Lot}: ${BT-70-Lot} // Terms Performance
-				0 {BT-801-Lot} #{field|name|BT-801-Lot} // A non-disclosure agreement is required.
+				0 {BT-801-Lot} #{field|name|BT-801-Lot}: #{code|name|${concat('indicator.', BT-801-Lot)}} // A non-disclosure agreement is required.
 					{BT-137-Lot[BT-802-Lot is present]} #{field|name|BT-802-Lot} : ${BT-802-Lot} // Additional information about the non-disclosure agreement
 				{BT-743-Lot} #{field|name|BT-743-Lot}: #{BT-743-Lot} // Electronic invoicing
-				{BT-92-Lot[BT-92-Lot == TRUE]} #{field|name|BT-92-Lot} // Electronic ordering will be used (true / false)
-				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot} // Electronic payment will be used (true/false)
+				{BT-92-Lot} #{field|name|BT-92-Lot}: #{code|name|${if (BT-92-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic ordering will be used (true / false)
+				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot}: #{code|name|${if (BT-93-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic payment will be used (true/false)
 				{BT-761-Lot[(BT-76-Lot is present)]} #{field|name|BT-76-Lot}: ${BT-76-Lot} // Legal form that must be taken by a group of tenderers that is awarded a contract
 				{ND-PaymentTerms[BT-77-Lot is present]} #{field|name|BT-77-Lot}: ${BT-77-Lot} // Financial arrangement
 			{BT-137-Lot[BT-99-Lot is present]} #{field|name|BT-99-Lot}: ${BT-99-Lot} // Information about review deadlines
@@ -220,9 +218,9 @@
 				{BT-113-Lot} #{field|name|BT-113-Lot}: ${BT-113-Lot} // Maximum number of participants
 				{BT-137-Lot[BT-109-Lot is present]} #{field|name|BT-109-Lot}: ${BT-109-Lot} // Justification for the duration of framework agreement
 				{BT-137-Lot[BT-111-Lot is present]} #{field|name|BT-111-Lot}: ${BT-111-Lot} // Framework Buyer Categories (Lot)
-			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system} // Dynamic purchasing system 
+			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system}: // Information about the dynamic purchasing system
 				{BT-766-Lot} #{BT-766-Lot} // Dynamic Purchasing System
-			0 {ND-AuctionTerms[(BT-767-Lot is present) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|electronic-auction}: // Electronic auction #{code|name|indicator.true}
+			0 {ND-AuctionTerms[BT-767-Lot == TRUE]} #{auxiliary|text|electronic-auction}: #{code|name|${'indicator.true'}} // Electronic auction
 				{BT-123-Lot[BT-767-Lot == TRUE]} #{field|name|BT-123-Lot}: ${BT-123-Lot} // An electronic auction at the following address is used
 				{ND-AuctionTerms[BT-122-Lot[BT-767-Lot == TRUE] is present]} #{field|name|BT-122-Lot}: ${BT-122-Lot} // Electronic auction - Description
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
@@ -236,14 +234,15 @@
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -284,20 +283,7 @@
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -312,6 +298,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/18.efx b/view-templates/18.efx
index 25d81c6af..6a9e710d1 100644
--- a/view-templates/18.efx
+++ b/view-templates/18.efx
@@ -15,7 +15,7 @@
 		{OPP-090-Procedure} #{field|name|OPP-090-Procedure}: ${OPP-090-Procedure} // Previous Notice
 		{BT-22-Procedure} #{field|name|BT-22-Procedure}: ${BT-22-Procedure} // Internal identifier
 		0 {BT-105-Procedure[BT-105-Procedure != 'unpublished']} #{field|name|BT-105-Procedure}: #{BT-105-Procedure} // Type of the procedure
-		0 {BT-106-Procedure[BT-106-Procedure != 'unpublished']} #{field|name|BT-106-Procedure}: ${if (BT-106-Procedure == 'true') then 'Yes' else 'No'} // The procedure is accelerated. (true/false)
+		0 {BT-106-Procedure[BT-106-Procedure != 'unpublished']} #{field|name|BT-106-Procedure}: #{code|name|${concat('indicator.',BT-106-Procedure)}} // The procedure is accelerated. (true/false)
 		0 {ND-ProcedureProcurementScope[BT-1351-Procedure != 'unpublished']} #{field|name|BT-1351-Procedure}: ${BT-1351-Procedure} // Justification for the accelerated procedure
 		0 {ND-ProcedureProcurementScope[BT-88-Procedure != 'unpublished']} #{field|name|BT-88-Procedure}: ${BT-88-Procedure} // Procedure Features / Description of the procedure
 		1 {ND-ProcedureProcurementScope[(BT-23-Procedure is present) or (BT-531-Procedure is present) or (BT-262-Procedure is present) or (BT-263-Procedure is present)]} #{auxiliary|text|purpose} // 2.1.1 Purpose
@@ -43,8 +43,7 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
 		5 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present or BT-33-Procedure is present]} #{auxiliary|text|procurement-terms} // 2.1.5 Procurement terms
 			0 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present]} #{auxiliary|text|submission-terms}: // Terms of submission
 				{BT-31-Procedure} #{field|name|BT-31-Procedure}: ${format-number(BT-31-Procedure, '###,##0')} // Maximum number of lots for which one tenderer can submit tenders
@@ -149,7 +148,6 @@
 				{BT-50-Lot[BT-50-Lot is present]} #{field|name|BT-50-Lot}: ${BT-50-Lot} // Minimum Candidates
 				{BT-661-Lot[BT-51-Lot is present]} #{field|name|BT-51-Lot}: ${BT-51-Lot} // Maximum Candidates
 				{BT-52-Lot[BT-52-Lot == TRUE]} #{field|name|BT-52-Lot} // The procedure will take place in successive stages. In each stage, some participants may be eliminated.
-				{BT-120-Lot[BT-120-Lot == TRUE]} #{field|name|BT-120-Lot} // The buyer reserves the right to award the contract on the basis of the initial tenders without any further negotiations.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
 				0 {ND-LotAwardCriterion[BT-539-Lot != 'unpublished']} #{field|name|BT-539-Lot}: #{BT-539-Lot} // Type
@@ -163,8 +161,8 @@
 		11 {BT-137-Lot[(BT-14-Lot is present) or (BT-632-Lot is present) or (BT-124-Lot is present)]} #{auxiliary|text|procurement-documents} // 5.1.11 Procurement documents
 			{BT-137-Lot[some text:$restricted in (for text:$somerestricted in BT-14-Lot return $somerestricted) satisfies $restricted == 'restricted-document']} #{field|name|BT-14-Lot} // The access to certain procurement documents is restricted. (Lot)
 			{BT-707-Lot} #{field|name|BT-707-Lot}: #{BT-707-Lot} // Justification for restricting access to certain procurement documents (Lot)
-			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: ${distinct-values(for text:$lang in BT-708-Lot return $lang)} // Languages in which the procurement documents are officially available (Lot)
-			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: ${distinct-values(for text:$lang in BT-737-Lot return $lang)} // Languages in which the procurement documents are unofficially available (Lot)
+			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: #{BT-708-Lot} // Languages in which the procurement documents are officially available (Lot)
+			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: #{BT-737-Lot} // Languages in which the procurement documents are unofficially available (Lot)
 			{BT-13(d)-Lot} #{field|name|BT-13(d)-Lot}: ${BT-13(d)-Lot} ${BT-13(t)-Lot} // Deadline for requesting additional information (Lot)
 			{BT-137-Lot[BT-615-Lot is present]} #{field|name|BT-615-Lot}: ${distinct-values(for text:$url in BT-615-Lot return concat($url, ', '))} // Information about restricted documents is available at (Lot) 
 			{BT-137-Lot[BT-15-Lot is present]} #{field|name|BT-15-Lot}: ${distinct-values(for text:$url in BT-15-Lot return concat($url, ', '))} // Information about non-restricted documents is available at (Lot) 
@@ -188,7 +186,7 @@
 				{BT-18-Lot} #{field|name|BT-18-Lot}: ${BT-18-Lot} // Address for submission (URL)
 				{BT-19-Lot} #{field|name|BT-19-Lot}: #{BT-19-Lot} // Submission Nonelectronic Justification
 				{BT-137-Lot[BT-745-Lot is present]} #{field|name|BT-745-Lot}: ${BT-745-Lot} // Submission Nonelectronic Description
-				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders, requests to participate, or expressions of interest may be submitted
+				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders or requests to participate may be submitted
 				{BT-764-Lot} #{field|name|BT-764-Lot}: #{BT-764-Lot} // Electronic catalogue
 				{BT-744-Lot[BT-744-Lot == 'true']} #{field|name|BT-744-Lot} // Advanced or qualified electronic signature or seal (as defined in Regulation (EU) No 910/2014) is required. (true/false)
 				{BT-63-Lot} #{field|name|BT-63-Lot}: #{BT-63-Lot} // Variants
@@ -203,11 +201,11 @@
 			0 {ND-LotTenderingTerms[(BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present)]} #{auxiliary|text|contract-terms}: // Terms of contract
 				{BT-736-Lot[BT-736-Lot != 'no']} #{field|name|BT-736-Lot}: #{BT-736-Lot} // The execution of the contract must be performed in the framework of sheltered employment programmes (yes / no / not-known)
 				{ND-ExecutionRequirements[BT-70-Lot is present]} #{field|name|BT-70-Lot}: ${BT-70-Lot} // Terms Performance
-				0 {BT-801-Lot} #{field|name|BT-801-Lot} // A non-disclosure agreement is required.
+				0 {BT-801-Lot} #{field|name|BT-801-Lot}: #{code|name|${concat('indicator.', BT-801-Lot)}} // A non-disclosure agreement is required.
 					{BT-137-Lot[BT-802-Lot is present]} #{field|name|BT-802-Lot} : ${BT-802-Lot} // Additional information about the non-disclosure agreement
 				{BT-743-Lot} #{field|name|BT-743-Lot}: #{BT-743-Lot} // Electronic invoicing
-				{BT-92-Lot[BT-92-Lot == TRUE]} #{field|name|BT-92-Lot} // Electronic ordering will be used (true / false)
-				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot} // Electronic payment will be used (true/false)
+				{BT-92-Lot} #{field|name|BT-92-Lot}: #{code|name|${if (BT-92-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic ordering will be used (true / false)
+				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot}: #{code|name|${if (BT-93-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic payment will be used (true/false)
 				{BT-761-Lot[(BT-76-Lot is present)]} #{field|name|BT-76-Lot}: ${BT-76-Lot} // Legal form that must be taken by a group of tenderers that is awarded a contract
 				{ND-PaymentTerms[BT-77-Lot is present]} #{field|name|BT-77-Lot}: ${BT-77-Lot} // Financial arrangement
 				0 {ND-LotTenderingTerms[(BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present)]} #{auxiliary|text|subcontracting-terms}: // Terms of subcontracting
@@ -221,9 +219,9 @@
 				{BT-113-Lot} #{field|name|BT-113-Lot}: ${BT-113-Lot} // Maximum number of participants
 				{BT-137-Lot[BT-109-Lot is present]} #{field|name|BT-109-Lot}: ${BT-109-Lot} // Justification for the duration of framework agreement
 				{BT-137-Lot[BT-111-Lot is present]} #{field|name|BT-111-Lot}: ${BT-111-Lot} // Framework Buyer Categories (Lot)
-			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system} // Dynamic purchasing system 
+			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system}: // Information about the dynamic purchasing system
 				{BT-766-Lot} #{BT-766-Lot} // Dynamic Purchasing System
-			0 {ND-AuctionTerms[(BT-767-Lot is present) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|electronic-auction}: // Electronic auction #{code|name|indicator.true}
+			0 {ND-AuctionTerms[BT-767-Lot == TRUE]} #{auxiliary|text|electronic-auction}: #{code|name|${'indicator.true'}} // Electronic auction
 				{BT-123-Lot[BT-767-Lot == TRUE]} #{field|name|BT-123-Lot}: ${BT-123-Lot} // An electronic auction at the following address is used
 				{ND-AuctionTerms[BT-122-Lot[BT-767-Lot == TRUE] is present]} #{field|name|BT-122-Lot}: ${BT-122-Lot} // Electronic auction - Description
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
@@ -237,14 +235,15 @@
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -285,20 +284,7 @@
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -313,6 +299,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/19.efx b/view-templates/19.efx
index 210d0c356..695e0bea4 100644
--- a/view-templates/19.efx
+++ b/view-templates/19.efx
@@ -14,7 +14,6 @@
 		{BT-04-notice} #{field|name|BT-04-notice}: ${BT-04-notice} // Procedure identifier
 		{OPP-090-Procedure} #{field|name|OPP-090-Procedure}: ${OPP-090-Procedure} // Previous Notice
 		{BT-22-Procedure} #{field|name|BT-22-Procedure}: ${BT-22-Procedure} // Internal identifier
-		0 {BT-105-Procedure[BT-105-Procedure != 'unpublished']} #{field|name|BT-105-Procedure}: #{BT-105-Procedure} // Type of the procedure
 		0 {ND-ProcedureProcurementScope[BT-88-Procedure != 'unpublished']} #{field|name|BT-88-Procedure}: ${BT-88-Procedure} // Procedure Features / Description of the procedure
 		1 {ND-ProcedureProcurementScope[(BT-23-Procedure is present) or (BT-531-Procedure is present) or (BT-262-Procedure is present) or (BT-263-Procedure is present)]} #{auxiliary|text|purpose} // 2.1.1 Purpose
 			{BT-23-Procedure} #{field|name|BT-23-Procedure}: #{BT-23-Procedure} // Nature of the contract
@@ -33,7 +32,6 @@
 			{ND-ProcedurePlacePerformance[BT-728-Procedure is present]} #{field|name|BT-728-Procedure}: ${BT-728-Procedure} // Place Performance Additional information
 		3 {ND-ProcedureProcurementScope[(BT-27-Procedure is present) or (BT-271-Procedure is present)]} #{auxiliary|text|value} // 2.1.3 Value
 			{BT-27-Procedure} #{field|name|BT-27-Procedure}: ${format-number(BT-27-Procedure, '###,##0.##')} ${BT-27-Procedure/@currencyID} // Estimated value
-			{BT-271-Procedure} #{field|name|BT-271-Procedure}: ${format-number(BT-271-Procedure, '###,##0.##')} ${BT-271-Procedure/@currencyID} // Estimated Framework Maximum Value
 		4 {ND-ProcedureProcurementScope[BT-01-notice is present]} #{auxiliary|text|general-information} // 2.1.4 General information
 			{BT-634-Procedure[BT-634-Procedure == TRUE]} #{field|name|BT-634-Procedure} // Procurement Relaunch
 			{ND-ProcedureProcurementScope[BT-300-Procedure is present]} #{field|name|BT-300-Procedure}: ${BT-300-Procedure} // Additional information
@@ -41,8 +39,7 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
 		5 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present or BT-33-Procedure is present]} #{auxiliary|text|procurement-terms} // 2.1.5 Procurement terms
 			0 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present]} #{auxiliary|text|submission-terms}: // Terms of submission
 				{BT-31-Procedure} #{field|name|BT-31-Procedure}: ${format-number(BT-31-Procedure, '###,##0')} // Maximum number of lots for which one tenderer can submit tenders
@@ -59,7 +56,6 @@
 		{BT-22-LotsGroup} #{field|name|BT-22-LotsGroup}: ${BT-22-LotsGroup} // Internal identifier of LotsGroup
 		1 {BT-137-LotsGroup[(BT-27-LotsGroup is present) or (BT-271-LotsGroup is present) or (BT-157-LotsGroup is present)]} #{auxiliary|text|value} // 4.1.1 Value
 			{BT-27-LotsGroup} #{field|name|BT-27-LotsGroup}: ${format-number(BT-27-LotsGroup, '###,##0.##')} ${BT-27-LotsGroup/@currencyID} // Estimated value
-			{BT-271-LotsGroup} #{field|name|BT-271-LotsGroup}: ${format-number(BT-271-LotsGroup, '###,##0.##')} ${BT-271-LotsGroup/@currencyID} // Framework Maximum Value
 		2 {ND-LotsGroupProcurementScope[BT-300-LotsGroup is present]} #{auxiliary|text|general-information} // 4.1.2 General information
 			{BT-137-LotsGroup[BT-300-LotsGroup is present]} #{field|name|BT-300-LotsGroup}: ${BT-300-LotsGroup} // Additional information
 		3 {ND-LotsGroupAwardCriteria} #{auxiliary|text|award-criteria} // 4.1.3 Award criteria
@@ -104,7 +100,6 @@
 			{ND-OptionsAndRenewals[BT-57-Lot is present]} #{field|name|BT-57-Lot}: ${BT-57-Lot} // Description
 		5 {ND-LotValueEstimate[(BT-27-Lot is present) or (BT-271-Lot is present) or (some text:$glo in (for text:$lotid in BT-137-Lot, text:$ldgloid in BT-330-Procedure[BT-1375-Procedure == $lotid], text:$gloid in BT-137-LotsGroup[BT-137-LotsGroup[BT-157-LotsGroup is present] == $ldgloid] return $gloid) satisfies $glo != '')]} #{auxiliary|text|value} // 5.1.5 Value
 			{BT-27-Lot} #{field|name|BT-27-Lot}: ${format-number(BT-27-Lot, '###,##0.##')} ${BT-27-Lot/@currencyID} // Estimated value
-			{BT-271-Lot} #{field|name|BT-271-Lot}: ${format-number(BT-271-Lot, '###,##0.##')} ${BT-271-Lot/@currencyID} // Framework Maximum Value
 		6 {BT-137-Lot[(BT-634-Lot == TRUE) or (BT-94-Lot == TRUE) or (BT-95-Lot is present) or (BT-71-Lot is present) or (BT-79-Lot is present) or (BT-60-Lot == 'eu-funds') or (BT-7220-Lot is present) or (BT-5010-Lot is present) or (BT-6140-Lot is present) or (BT-115-Lot == TRUE) or (BT-726-Lot == TRUE) or (BT-125(i)-Lot is present) or (BT-1251-Lot is present) or (BT-300-Lot is present)]} #{auxiliary|text|general-information} // 5.1.6 General information
 			{BT-634-Lot[BT-634-Lot == TRUE]} #{field|name|BT-634-Lot} // This cancelled or unsuccessful procedure or lot will be relaunched (only true allowed).
 			{BT-94-Lot[BT-94-Lot == TRUE]} #{field|name|BT-94-Lot} // This is a recurrent procurement (true / false).
@@ -140,11 +135,6 @@
 				{BT-747-Lot[BT-749-Lot is present]} #{field|name|BT-749-Lot}: ${BT-749-Lot} // Selection Criterion Name
 				{BT-747-Lot[BT-750-Lot is present]} #{field|name|BT-750-Lot}: ${BT-750-Lot} // Selection Criterion Description
 				{BT-748-Lot} #{field|name|BT-748-Lot}: #{BT-748-Lot} // Use of this criterion
-			0 {ND-LotTenderingTerms[(BT-50-Lot is present) or (BT-51-Lot is present) or (BT-52-Lot == TRUE) or (BT-120-Lot == TRUE)]} #{auxiliary|text|second-stage}: // Information about the second stage of a two-stage procedure
-				{BT-50-Lot[BT-50-Lot is present]} #{field|name|BT-50-Lot}: ${BT-50-Lot} // Minimum Candidates
-				{BT-661-Lot[BT-51-Lot is present]} #{field|name|BT-51-Lot}: ${BT-51-Lot} // Maximum Candidates
-				{BT-52-Lot[BT-52-Lot == TRUE]} #{field|name|BT-52-Lot} // The procedure will take place in successive stages. In each stage, some participants may be eliminated.
-				{BT-120-Lot[BT-120-Lot == TRUE]} #{field|name|BT-120-Lot} // The buyer reserves the right to award the contract on the basis of the initial tenders without any further negotiations.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
 				0 {ND-LotAwardCriterion[BT-539-Lot != 'unpublished']} #{field|name|BT-539-Lot}: #{BT-539-Lot} // Type
@@ -158,8 +148,8 @@
 		11 {BT-137-Lot[(BT-14-Lot is present) or (BT-632-Lot is present) or (BT-124-Lot is present)]} #{auxiliary|text|procurement-documents} // 5.1.11 Procurement documents
 			{BT-137-Lot[some text:$restricted in (for text:$somerestricted in BT-14-Lot return $somerestricted) satisfies $restricted == 'restricted-document']} #{field|name|BT-14-Lot} // The access to certain procurement documents is restricted. (Lot)
 			{BT-707-Lot} #{field|name|BT-707-Lot}: #{BT-707-Lot} // Justification for restricting access to certain procurement documents (Lot)
-			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: ${distinct-values(for text:$lang in BT-708-Lot return $lang)} // Languages in which the procurement documents are officially available (Lot)
-			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: ${distinct-values(for text:$lang in BT-737-Lot return $lang)} // Languages in which the procurement documents are unofficially available (Lot)
+			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: #{BT-708-Lot} // Languages in which the procurement documents are officially available (Lot)
+			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: #{BT-737-Lot} // Languages in which the procurement documents are unofficially available (Lot)
 			{BT-13(d)-Lot} #{field|name|BT-13(d)-Lot}: ${BT-13(d)-Lot} ${BT-13(t)-Lot} // Deadline for requesting additional information (Lot)
 			{BT-137-Lot[BT-615-Lot is present]} #{field|name|BT-615-Lot}: ${distinct-values(for text:$url in BT-615-Lot return concat($url, ', '))} // Information about restricted documents is available at (Lot) 
 			{BT-137-Lot[BT-15-Lot is present]} #{field|name|BT-15-Lot}: ${distinct-values(for text:$url in BT-15-Lot return concat($url, ', '))} // Information about non-restricted documents is available at (Lot) 
@@ -182,8 +172,7 @@
 				{BT-18-Lot} #{field|name|BT-18-Lot}: ${BT-18-Lot} // Address for submission (URL)
 				{BT-19-Lot} #{field|name|BT-19-Lot}: #{BT-19-Lot} // Submission Nonelectronic Justification
 				{BT-137-Lot[BT-745-Lot is present]} #{field|name|BT-745-Lot}: ${BT-745-Lot} // Submission Nonelectronic Description
-				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders, requests to participate, or expressions of interest may be submitted
-				{BT-764-Lot} #{field|name|BT-764-Lot}: #{BT-764-Lot} // Electronic catalogue
+				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders or requests to participate may be submitted
 				{BT-744-Lot[BT-744-Lot == 'true']} #{field|name|BT-744-Lot} // Advanced or qualified electronic signature or seal (as defined in Regulation (EU) No 910/2014) is required. (true/false)
 				{BT-63-Lot} #{field|name|BT-63-Lot}: #{BT-63-Lot} // Variants
 				{BT-769-Lot[BT-769-Lot == 'allowed']} #{field|name|BT-769-Lot} // Tenderers may submit more than one tender.
@@ -197,16 +186,16 @@
 			0 {ND-LotTenderingTerms[(BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present)]} #{auxiliary|text|contract-terms}: // Terms of contract
 				{BT-736-Lot[BT-736-Lot != 'no']} #{field|name|BT-736-Lot}: #{BT-736-Lot} // The execution of the contract must be performed in the framework of sheltered employment programmes (yes / no / not-known)
 				{ND-ExecutionRequirements[BT-70-Lot is present]} #{field|name|BT-70-Lot}: ${BT-70-Lot} // Terms Performance
-				0 {BT-801-Lot} #{field|name|BT-801-Lot} // A non-disclosure agreement is required.
+				0 {BT-801-Lot} #{field|name|BT-801-Lot}: #{code|name|${concat('indicator.', BT-801-Lot)}} // A non-disclosure agreement is required.
 					{BT-137-Lot[BT-802-Lot is present]} #{field|name|BT-802-Lot} : ${BT-802-Lot} // Additional information about the non-disclosure agreement
 				{BT-743-Lot} #{field|name|BT-743-Lot}: #{BT-743-Lot} // Electronic invoicing
-				{BT-92-Lot[BT-92-Lot == TRUE]} #{field|name|BT-92-Lot} // Electronic ordering will be used (true / false)
-				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot} // Electronic payment will be used (true/false)
+				{BT-92-Lot} #{field|name|BT-92-Lot}: #{code|name|${if (BT-92-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic ordering will be used (true / false)
+				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot}: #{code|name|${if (BT-93-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic payment will be used (true/false)
 				{BT-761-Lot[(BT-76-Lot is present)]} #{field|name|BT-76-Lot}: ${BT-76-Lot} // Legal form that must be taken by a group of tenderers that is awarded a contract
 				{ND-PaymentTerms[BT-77-Lot is present]} #{field|name|BT-77-Lot}: ${BT-77-Lot} // Financial arrangement
 			{BT-137-Lot[BT-99-Lot is present]} #{field|name|BT-99-Lot}: ${BT-99-Lot} // Information about review deadlines
 		15 {ND-LotTenderingProcess[(BT-765-Lot is present) or (BT-113-Lot is present) or (BT-109-Lot is present) or (BT-111-Lot is present) or (BT-766-Lot is present) or (BT-119-LotResult == TRUE) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|techniques} // 5.1.15 Techniques
-			0 {ND-AuctionTerms[(BT-767-Lot is present) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|electronic-auction}: // Electronic auction #{code|name|indicator.true}
+			0 {ND-AuctionTerms[BT-767-Lot == TRUE]} #{auxiliary|text|electronic-auction}: #{code|name|${'indicator.true'}} // Electronic auction
 				{BT-123-Lot[BT-767-Lot == TRUE]} #{field|name|BT-123-Lot}: ${BT-123-Lot} // An electronic auction at the following address is used
 				{ND-AuctionTerms[BT-122-Lot[BT-767-Lot == TRUE] is present]} #{field|name|BT-122-Lot}: ${BT-122-Lot} // Electronic auction - Description
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
@@ -220,14 +209,15 @@
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -255,8 +245,6 @@
 		0 {ND-Organization} #{auxiliary|text|roles}: // Roles of this organisation
 			0 {ND-Organization[count(for text:$orgid in OPT-200-Organization-Company return OPT-300-Procedure-Buyer[OPT-300-Procedure-Buyer == $orgid])>0]} #{auxiliary|text|buyer} // This org is a Buyer
 				{OPP-050-Organization[OPP-050-Organization == TRUE]} #{field|name|OPP-050-Organization} // Leader of the group
-				{OPP-052-Organization[OPP-052-Organization == TRUE]} #{field|name|OPP-052-Organization} // CPB Acquiring
-				{OPP-051-Organization[OPP-051-Organization == TRUE]} #{field|name|OPP-051-Organization} // CPB Awarding
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'serv-prov') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'serv-prov')]} #{auxiliary|text|organisation-providing-procurement-service} // This org is a Service Provider
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'ted-esen') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'ted-esen')]} #{auxiliary|text|organisation-esender} // This org is an eSender
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (LOT)
@@ -268,20 +256,7 @@
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -296,6 +271,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/2.efx b/view-templates/2.efx
index 9e0fa3214..5208bfd6d 100644
--- a/view-templates/2.efx
+++ b/view-templates/2.efx
@@ -35,11 +35,10 @@
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -66,34 +65,8 @@
 			{BT-509-Organization-TouchPoint[OPT-200-Organization-Company == OPT-300-Procedure-Buyer] } #{field|name|BT-509-Organization-TouchPoint}: ${BT-509-Organization-TouchPoint} // Touchpoint eDelivery Gateway
 		0 {ND-Organization} #{auxiliary|text|roles}: // Roles of this organisation
 			0 {ND-Organization[count(for text:$orgid in OPT-200-Organization-Company return OPT-300-Procedure-Buyer[OPT-300-Procedure-Buyer == $orgid])>0]} #{auxiliary|text|buyer} // This org is a Buyer
-				{OPP-050-Organization[OPP-050-Organization == TRUE]} #{field|name|OPP-050-Organization} // Leader of the group
-				{OPP-052-Organization[OPP-052-Organization == TRUE]} #{field|name|OPP-052-Organization} // CPB Acquiring
-				{OPP-051-Organization[OPP-051-Organization == TRUE]} #{field|name|OPP-051-Organization} // CPB Awarding
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'serv-prov') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'serv-prov')]} #{auxiliary|text|organisation-providing-procurement-service} // This org is a Service Provider
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'ted-esen') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'ted-esen')]} #{auxiliary|text|organisation-esender} // This org is an eSender
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Part-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Part-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Part-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Part-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Part-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Part-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Part-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (PART)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -108,6 +81,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/20.efx b/view-templates/20.efx
index 4a526e378..18424231e 100644
--- a/view-templates/20.efx
+++ b/view-templates/20.efx
@@ -39,8 +39,7 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
 		5 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present or BT-33-Procedure is present]} #{auxiliary|text|procurement-terms} // 2.1.5 Procurement terms
 			0 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present]} #{auxiliary|text|submission-terms}: // Terms of submission
 				{BT-31-Procedure} #{field|name|BT-31-Procedure}: ${format-number(BT-31-Procedure, '###,##0')} // Maximum number of lots for which one tenderer can submit tenders
@@ -159,8 +158,8 @@
 		11 {BT-137-Lot[(BT-14-Lot is present) or (BT-632-Lot is present) or (BT-124-Lot is present)]} #{auxiliary|text|procurement-documents} // 5.1.11 Procurement documents
 			{BT-137-Lot[some text:$restricted in (for text:$somerestricted in BT-14-Lot return $somerestricted) satisfies $restricted == 'restricted-document']} #{field|name|BT-14-Lot} // The access to certain procurement documents is restricted. (Lot)
 			{BT-707-Lot} #{field|name|BT-707-Lot}: #{BT-707-Lot} // Justification for restricting access to certain procurement documents (Lot)
-			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: ${distinct-values(for text:$lang in BT-708-Lot return $lang)} // Languages in which the procurement documents are officially available (Lot)
-			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: ${distinct-values(for text:$lang in BT-737-Lot return $lang)} // Languages in which the procurement documents are unofficially available (Lot)
+			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: #{BT-708-Lot} // Languages in which the procurement documents are officially available (Lot)
+			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: #{BT-737-Lot} // Languages in which the procurement documents are unofficially available (Lot)
 			{BT-13(d)-Lot} #{field|name|BT-13(d)-Lot}: ${BT-13(d)-Lot} ${BT-13(t)-Lot} // Deadline for requesting additional information (Lot)
 			{BT-137-Lot[BT-615-Lot is present]} #{field|name|BT-615-Lot}: ${distinct-values(for text:$url in BT-615-Lot return concat($url, ', '))} // Information about restricted documents is available at (Lot) 
 			{BT-137-Lot[BT-15-Lot is present]} #{field|name|BT-15-Lot}: ${distinct-values(for text:$url in BT-15-Lot return concat($url, ', '))} // Information about non-restricted documents is available at (Lot) 
@@ -183,7 +182,7 @@
 				{BT-18-Lot} #{field|name|BT-18-Lot}: ${BT-18-Lot} // Address for submission (URL)
 				{BT-19-Lot} #{field|name|BT-19-Lot}: #{BT-19-Lot} // Submission Nonelectronic Justification
 				{BT-137-Lot[BT-745-Lot is present]} #{field|name|BT-745-Lot}: ${BT-745-Lot} // Submission Nonelectronic Description
-				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders, requests to participate, or expressions of interest may be submitted
+				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders or requests to participate may be submitted
 				{BT-764-Lot} #{field|name|BT-764-Lot}: #{BT-764-Lot} // Electronic catalogue
 				{BT-744-Lot[BT-744-Lot == 'true']} #{field|name|BT-744-Lot} // Advanced or qualified electronic signature or seal (as defined in Regulation (EU) No 910/2014) is required. (true/false)
 				{BT-63-Lot} #{field|name|BT-63-Lot}: #{BT-63-Lot} // Variants
@@ -203,11 +202,11 @@
 			0 {ND-LotTenderingTerms[(BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present)]} #{auxiliary|text|contract-terms}: // Terms of contract
 				{BT-736-Lot[BT-736-Lot != 'no']} #{field|name|BT-736-Lot}: #{BT-736-Lot} // The execution of the contract must be performed in the framework of sheltered employment programmes (yes / no / not-known)
 				{ND-ExecutionRequirements[BT-70-Lot is present]} #{field|name|BT-70-Lot}: ${BT-70-Lot} // Terms Performance
-				0 {BT-801-Lot} #{field|name|BT-801-Lot} // A non-disclosure agreement is required.
+				0 {BT-801-Lot} #{field|name|BT-801-Lot}: #{code|name|${concat('indicator.', BT-801-Lot)}} // A non-disclosure agreement is required.
 					{BT-137-Lot[BT-802-Lot is present]} #{field|name|BT-802-Lot} : ${BT-802-Lot} // Additional information about the non-disclosure agreement
 				{BT-743-Lot} #{field|name|BT-743-Lot}: #{BT-743-Lot} // Electronic invoicing
-				{BT-92-Lot[BT-92-Lot == TRUE]} #{field|name|BT-92-Lot} // Electronic ordering will be used (true / false)
-				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot} // Electronic payment will be used (true/false)
+				{BT-92-Lot} #{field|name|BT-92-Lot}: #{code|name|${if (BT-92-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic ordering will be used (true / false)
+				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot}: #{code|name|${if (BT-93-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic payment will be used (true/false)
 				{BT-761-Lot[(BT-76-Lot is present)]} #{field|name|BT-76-Lot}: ${BT-76-Lot} // Legal form that must be taken by a group of tenderers that is awarded a contract
 				{ND-PaymentTerms[BT-77-Lot is present]} #{field|name|BT-77-Lot}: ${BT-77-Lot} // Financial arrangement
 			{BT-137-Lot[BT-99-Lot is present]} #{field|name|BT-99-Lot}: ${BT-99-Lot} // Information about review deadlines
@@ -217,9 +216,9 @@
 				{BT-113-Lot} #{field|name|BT-113-Lot}: ${BT-113-Lot} // Maximum number of participants
 				{BT-137-Lot[BT-109-Lot is present]} #{field|name|BT-109-Lot}: ${BT-109-Lot} // Justification for the duration of framework agreement
 				{BT-137-Lot[BT-111-Lot is present]} #{field|name|BT-111-Lot}: ${BT-111-Lot} // Framework Buyer Categories (Lot)
-			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system} // Dynamic purchasing system 
+			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system}: // Information about the dynamic purchasing system
 				{BT-766-Lot} #{BT-766-Lot} // Dynamic Purchasing System
-			0 {ND-AuctionTerms[(BT-767-Lot is present) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|electronic-auction}: // Electronic auction #{code|name|indicator.true}
+			0 {ND-AuctionTerms[BT-767-Lot == TRUE]} #{auxiliary|text|electronic-auction}: #{code|name|${'indicator.true'}} // Electronic auction
 				{BT-123-Lot[BT-767-Lot == TRUE]} #{field|name|BT-123-Lot}: ${BT-123-Lot} // An electronic auction at the following address is used
 				{ND-AuctionTerms[BT-122-Lot[BT-767-Lot == TRUE] is present]} #{field|name|BT-122-Lot}: ${BT-122-Lot} // Electronic auction - Description
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
@@ -233,14 +232,15 @@
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -281,20 +281,7 @@
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -309,6 +296,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/21.efx b/view-templates/21.efx
index badf834e3..94b1edc15 100644
--- a/view-templates/21.efx
+++ b/view-templates/21.efx
@@ -40,8 +40,7 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
 		5 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present or BT-33-Procedure is present]} #{auxiliary|text|procurement-terms} // 2.1.5 Procurement terms
 			0 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present]} #{auxiliary|text|submission-terms}: // Terms of submission
 				{BT-31-Procedure} #{field|name|BT-31-Procedure}: ${format-number(BT-31-Procedure, '###,##0')} // Maximum number of lots for which one tenderer can submit tenders
@@ -146,7 +145,6 @@
 				{BT-50-Lot[BT-50-Lot is present]} #{field|name|BT-50-Lot}: ${BT-50-Lot} // Minimum Candidates
 				{BT-661-Lot[BT-51-Lot is present]} #{field|name|BT-51-Lot}: ${BT-51-Lot} // Maximum Candidates
 				{BT-52-Lot[BT-52-Lot == TRUE]} #{field|name|BT-52-Lot} // The procedure will take place in successive stages. In each stage, some participants may be eliminated.
-				{BT-120-Lot[BT-120-Lot == TRUE]} #{field|name|BT-120-Lot} // The buyer reserves the right to award the contract on the basis of the initial tenders without any further negotiations.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
 				0 {ND-LotAwardCriterion[BT-539-Lot != 'unpublished']} #{field|name|BT-539-Lot}: #{BT-539-Lot} // Type
@@ -160,8 +158,8 @@
 		11 {BT-137-Lot[(BT-14-Lot is present) or (BT-632-Lot is present) or (BT-124-Lot is present)]} #{auxiliary|text|procurement-documents} // 5.1.11 Procurement documents
 			{BT-137-Lot[some text:$restricted in (for text:$somerestricted in BT-14-Lot return $somerestricted) satisfies $restricted == 'restricted-document']} #{field|name|BT-14-Lot} // The access to certain procurement documents is restricted. (Lot)
 			{BT-707-Lot} #{field|name|BT-707-Lot}: #{BT-707-Lot} // Justification for restricting access to certain procurement documents (Lot)
-			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: ${distinct-values(for text:$lang in BT-708-Lot return $lang)} // Languages in which the procurement documents are officially available (Lot)
-			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: ${distinct-values(for text:$lang in BT-737-Lot return $lang)} // Languages in which the procurement documents are unofficially available (Lot)
+			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: #{BT-708-Lot} // Languages in which the procurement documents are officially available (Lot)
+			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: #{BT-737-Lot} // Languages in which the procurement documents are unofficially available (Lot)
 			{BT-13(d)-Lot} #{field|name|BT-13(d)-Lot}: ${BT-13(d)-Lot} ${BT-13(t)-Lot} // Deadline for requesting additional information (Lot)
 			{BT-137-Lot[BT-615-Lot is present]} #{field|name|BT-615-Lot}: ${distinct-values(for text:$url in BT-615-Lot return concat($url, ', '))} // Information about restricted documents is available at (Lot) 
 			{BT-137-Lot[BT-15-Lot is present]} #{field|name|BT-15-Lot}: ${distinct-values(for text:$url in BT-15-Lot return concat($url, ', '))} // Information about non-restricted documents is available at (Lot) 
@@ -184,7 +182,7 @@
 				{BT-18-Lot} #{field|name|BT-18-Lot}: ${BT-18-Lot} // Address for submission (URL)
 				{BT-19-Lot} #{field|name|BT-19-Lot}: #{BT-19-Lot} // Submission Nonelectronic Justification
 				{BT-137-Lot[BT-745-Lot is present]} #{field|name|BT-745-Lot}: ${BT-745-Lot} // Submission Nonelectronic Description
-				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders, requests to participate, or expressions of interest may be submitted
+				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders or requests to participate may be submitted
 				{BT-764-Lot} #{field|name|BT-764-Lot}: #{BT-764-Lot} // Electronic catalogue
 				{BT-744-Lot[BT-744-Lot == 'true']} #{field|name|BT-744-Lot} // Advanced or qualified electronic signature or seal (as defined in Regulation (EU) No 910/2014) is required. (true/false)
 				{BT-63-Lot} #{field|name|BT-63-Lot}: #{BT-63-Lot} // Variants
@@ -204,9 +202,11 @@
 			0 {ND-LotTenderingTerms[(BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present)]} #{auxiliary|text|contract-terms}: // Terms of contract
 				{BT-736-Lot[BT-736-Lot != 'no']} #{field|name|BT-736-Lot}: #{BT-736-Lot} // The execution of the contract must be performed in the framework of sheltered employment programmes (yes / no / not-known)
 				{ND-ExecutionRequirements[BT-70-Lot is present]} #{field|name|BT-70-Lot}: ${BT-70-Lot} // Terms Performance
+				0 {BT-801-Lot} #{field|name|BT-801-Lot}: #{code|name|${concat('indicator.', BT-801-Lot)}} // A non-disclosure agreement is required.
+					{BT-137-Lot[BT-802-Lot is present]} #{field|name|BT-802-Lot} : ${BT-802-Lot} // Additional information about the non-disclosure agreement
 				{BT-743-Lot} #{field|name|BT-743-Lot}: #{BT-743-Lot} // Electronic invoicing
-				{BT-92-Lot[BT-92-Lot == TRUE]} #{field|name|BT-92-Lot} // Electronic ordering will be used (true / false)
-				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot} // Electronic payment will be used (true/false)
+				{BT-92-Lot} #{field|name|BT-92-Lot}: #{code|name|${if (BT-92-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic ordering will be used (true / false)
+				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot}: #{code|name|${if (BT-93-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic payment will be used (true/false)
 				{BT-761-Lot[(BT-76-Lot is present)]} #{field|name|BT-76-Lot}: ${BT-76-Lot} // Legal form that must be taken by a group of tenderers that is awarded a contract
 				{ND-PaymentTerms[BT-77-Lot is present]} #{field|name|BT-77-Lot}: ${BT-77-Lot} // Financial arrangement
 			{BT-137-Lot[BT-99-Lot is present]} #{field|name|BT-99-Lot}: ${BT-99-Lot} // Information about review deadlines
@@ -216,9 +216,9 @@
 				{BT-113-Lot} #{field|name|BT-113-Lot}: ${BT-113-Lot} // Maximum number of participants
 				{BT-137-Lot[BT-109-Lot is present]} #{field|name|BT-109-Lot}: ${BT-109-Lot} // Justification for the duration of framework agreement
 				{BT-137-Lot[BT-111-Lot is present]} #{field|name|BT-111-Lot}: ${BT-111-Lot} // Framework Buyer Categories (Lot)
-			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system} // Dynamic purchasing system 
+			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system}: // Information about the dynamic purchasing system
 				{BT-766-Lot} #{BT-766-Lot} // Dynamic Purchasing System
-			0 {ND-AuctionTerms[(BT-767-Lot is present) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|electronic-auction}: // Electronic auction #{code|name|indicator.true}
+			0 {ND-AuctionTerms[BT-767-Lot == TRUE]} #{auxiliary|text|electronic-auction}: #{code|name|${'indicator.true'}} // Electronic auction
 				{BT-123-Lot[BT-767-Lot == TRUE]} #{field|name|BT-123-Lot}: ${BT-123-Lot} // An electronic auction at the following address is used
 				{ND-AuctionTerms[BT-122-Lot[BT-767-Lot == TRUE] is present]} #{field|name|BT-122-Lot}: ${BT-122-Lot} // Electronic auction - Description
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
@@ -232,14 +232,15 @@
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -280,20 +281,7 @@
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -308,6 +296,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/22.efx b/view-templates/22.efx
index f9801485c..2ebf6d176 100644
--- a/view-templates/22.efx
+++ b/view-templates/22.efx
@@ -11,7 +11,6 @@
 		{BT-04-notice} #{field|name|BT-04-notice}: ${BT-04-notice} // Procedure identifier
 		{OPP-090-Procedure} #{field|name|OPP-090-Procedure}: ${OPP-090-Procedure} // Previous Notice
 		{BT-22-Procedure} #{field|name|BT-22-Procedure}: ${BT-22-Procedure} // Internal identifier
-		0 {BT-105-Procedure[BT-105-Procedure != 'unpublished']} #{field|name|BT-105-Procedure}: #{BT-105-Procedure} // Type of the procedure
 		0 {ND-ProcedureProcurementScope[BT-88-Procedure != 'unpublished']} #{field|name|BT-88-Procedure}: ${BT-88-Procedure} // Procedure Features / Description of the procedure
 		1 {ND-ProcedureProcurementScope[(BT-23-Procedure is present) or (BT-531-Procedure is present) or (BT-262-Procedure is present) or (BT-263-Procedure is present)]} #{auxiliary|text|purpose} // 2.1.1 Purpose
 			{BT-23-Procedure} #{field|name|BT-23-Procedure}: #{BT-23-Procedure} // Nature of the contract
@@ -38,8 +37,7 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
 		5 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present or BT-33-Procedure is present]} #{auxiliary|text|procurement-terms} // 2.1.5 Procurement terms
 			0 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present]} #{auxiliary|text|submission-terms}: // Terms of submission
 				{BT-31-Procedure} #{field|name|BT-31-Procedure}: ${format-number(BT-31-Procedure, '###,##0')} // Maximum number of lots for which one tenderer can submit tenders
@@ -114,6 +112,7 @@
 				{BT-7220-Lot} #{field|name|BT-7220-Lot}: #{BT-7220-Lot} // EU Funds Programme
 				{BT-5010-Lot} #{field|name|BT-5010-Lot}: ${BT-5010-Lot} // EU Funds Financing Identifier
 				{ND-Funding[BT-6140-Lot is present]} #{field|name|BT-6140-Lot}: ${BT-6140-Lot} // EU Funds Details
+			{BT-726-Lot[BT-726-Lot == TRUE]} #{field|name|BT-726-Lot} // This procurement is also suitable for small and medium enterprises (SMEs). (true / false)
 			0 {ND-LotTenderingProcess[(BT-125(i)-Lot is present) or (BT-1251-Lot is present)]} #{auxiliary|text|previous-planning}: // Information about previous notices - Previous planning
 				0 {BT-125(i)-Lot} #{field|name|BT-125(i)-Lot}: ${BT-125(i)-Lot} // Identifier of previous notice
 					{BT-1251-Lot} #{field|name|BT-1251-Lot}: ${BT-1251-Lot} // Identifier of the part of the previous notice
@@ -143,7 +142,6 @@
 				{BT-50-Lot[BT-50-Lot is present]} #{field|name|BT-50-Lot}: ${BT-50-Lot} // Minimum Candidates
 				{BT-661-Lot[BT-51-Lot is present]} #{field|name|BT-51-Lot}: ${BT-51-Lot} // Maximum Candidates
 				{BT-52-Lot[BT-52-Lot == TRUE]} #{field|name|BT-52-Lot} // The procedure will take place in successive stages. In each stage, some participants may be eliminated.
-				{BT-120-Lot[BT-120-Lot == TRUE]} #{field|name|BT-120-Lot} // The buyer reserves the right to award the contract on the basis of the initial tenders without any further negotiations.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
 				0 {ND-LotAwardCriterion[BT-539-Lot != 'unpublished']} #{field|name|BT-539-Lot}: #{BT-539-Lot} // Type
@@ -157,8 +155,8 @@
 		11 {BT-137-Lot[(BT-14-Lot is present) or (BT-632-Lot is present) or (BT-124-Lot is present)]} #{auxiliary|text|procurement-documents} // 5.1.11 Procurement documents
 			{BT-137-Lot[some text:$restricted in (for text:$somerestricted in BT-14-Lot return $somerestricted) satisfies $restricted == 'restricted-document']} #{field|name|BT-14-Lot} // The access to certain procurement documents is restricted. (Lot)
 			{BT-707-Lot} #{field|name|BT-707-Lot}: #{BT-707-Lot} // Justification for restricting access to certain procurement documents (Lot)
-			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: ${distinct-values(for text:$lang in BT-708-Lot return $lang)} // Languages in which the procurement documents are officially available (Lot)
-			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: ${distinct-values(for text:$lang in BT-737-Lot return $lang)} // Languages in which the procurement documents are unofficially available (Lot)
+			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: #{BT-708-Lot} // Languages in which the procurement documents are officially available (Lot)
+			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: #{BT-737-Lot} // Languages in which the procurement documents are unofficially available (Lot)
 			{BT-13(d)-Lot} #{field|name|BT-13(d)-Lot}: ${BT-13(d)-Lot} ${BT-13(t)-Lot} // Deadline for requesting additional information (Lot)
 			{BT-137-Lot[BT-615-Lot is present]} #{field|name|BT-615-Lot}: ${distinct-values(for text:$url in BT-615-Lot return concat($url, ', '))} // Information about restricted documents is available at (Lot) 
 			{BT-137-Lot[BT-15-Lot is present]} #{field|name|BT-15-Lot}: ${distinct-values(for text:$url in BT-15-Lot return concat($url, ', '))} // Information about non-restricted documents is available at (Lot) 
@@ -181,7 +179,7 @@
 				{BT-18-Lot} #{field|name|BT-18-Lot}: ${BT-18-Lot} // Address for submission (URL)
 				{BT-19-Lot} #{field|name|BT-19-Lot}: #{BT-19-Lot} // Submission Nonelectronic Justification
 				{BT-137-Lot[BT-745-Lot is present]} #{field|name|BT-745-Lot}: ${BT-745-Lot} // Submission Nonelectronic Description
-				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders, requests to participate, or expressions of interest may be submitted
+				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders or requests to participate may be submitted
 				{BT-764-Lot} #{field|name|BT-764-Lot}: #{BT-764-Lot} // Electronic catalogue
 				{BT-744-Lot[BT-744-Lot == 'true']} #{field|name|BT-744-Lot} // Advanced or qualified electronic signature or seal (as defined in Regulation (EU) No 910/2014) is required. (true/false)
 				{BT-63-Lot} #{field|name|BT-63-Lot}: #{BT-63-Lot} // Variants
@@ -193,11 +191,11 @@
 			0 {ND-LotTenderingTerms[(BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present)]} #{auxiliary|text|contract-terms}: // Terms of contract
 				{BT-736-Lot[BT-736-Lot != 'no']} #{field|name|BT-736-Lot}: #{BT-736-Lot} // The execution of the contract must be performed in the framework of sheltered employment programmes (yes / no / not-known)
 				{ND-ExecutionRequirements[BT-70-Lot is present]} #{field|name|BT-70-Lot}: ${BT-70-Lot} // Terms Performance
-				0 {BT-801-Lot} #{field|name|BT-801-Lot} // A non-disclosure agreement is required.
+				0 {BT-801-Lot} #{field|name|BT-801-Lot}: #{code|name|${concat('indicator.', BT-801-Lot)}} // A non-disclosure agreement is required.
 					{BT-137-Lot[BT-802-Lot is present]} #{field|name|BT-802-Lot} : ${BT-802-Lot} // Additional information about the non-disclosure agreement
 				{BT-743-Lot} #{field|name|BT-743-Lot}: #{BT-743-Lot} // Electronic invoicing
-				{BT-92-Lot[BT-92-Lot == TRUE]} #{field|name|BT-92-Lot} // Electronic ordering will be used (true / false)
-				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot} // Electronic payment will be used (true/false)
+				{BT-92-Lot} #{field|name|BT-92-Lot}: #{code|name|${if (BT-92-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic ordering will be used (true / false)
+				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot}: #{code|name|${if (BT-93-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic payment will be used (true/false)
 				{BT-761-Lot[(BT-76-Lot is present)]} #{field|name|BT-76-Lot}: ${BT-76-Lot} // Legal form that must be taken by a group of tenderers that is awarded a contract
 				{ND-PaymentTerms[BT-77-Lot is present]} #{field|name|BT-77-Lot}: ${BT-77-Lot} // Financial arrangement
 		15 {ND-LotTenderingProcess[(BT-765-Lot is present) or (BT-113-Lot is present) or (BT-109-Lot is present) or (BT-111-Lot is present) or (BT-766-Lot is present) or (BT-119-LotResult == TRUE) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|techniques} // 5.1.15 Techniques
@@ -206,9 +204,9 @@
 				{BT-113-Lot} #{field|name|BT-113-Lot}: ${BT-113-Lot} // Maximum number of participants
 				{BT-137-Lot[BT-109-Lot is present]} #{field|name|BT-109-Lot}: ${BT-109-Lot} // Justification for the duration of framework agreement
 				{BT-137-Lot[BT-111-Lot is present]} #{field|name|BT-111-Lot}: ${BT-111-Lot} // Framework Buyer Categories (Lot)
-			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system} // Dynamic purchasing system 
+			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system}: // Information about the dynamic purchasing system
 				{BT-766-Lot} #{BT-766-Lot} // Dynamic Purchasing System
-			0 {ND-AuctionTerms[(BT-767-Lot is present) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|electronic-auction}: // Electronic auction #{code|name|indicator.true}
+			0 {ND-AuctionTerms[BT-767-Lot == TRUE]} #{auxiliary|text|electronic-auction}: #{code|name|${'indicator.true'}} // Electronic auction
 				{BT-123-Lot[BT-767-Lot == TRUE]} #{field|name|BT-123-Lot}: ${BT-123-Lot} // An electronic auction at the following address is used
 				{ND-AuctionTerms[BT-122-Lot[BT-767-Lot == TRUE] is present]} #{field|name|BT-122-Lot}: ${BT-122-Lot} // Electronic auction - Description
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
@@ -222,14 +220,15 @@
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -270,20 +269,7 @@
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -298,6 +284,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/23.efx b/view-templates/23.efx
index 352e56e54..5d76ced75 100644
--- a/view-templates/23.efx
+++ b/view-templates/23.efx
@@ -36,8 +36,7 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
 		5 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present or BT-33-Procedure is present]} #{auxiliary|text|procurement-terms} // 2.1.5 Procurement terms
 			0 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present]} #{auxiliary|text|submission-terms}: // Terms of submission
 				{BT-31-Procedure} #{field|name|BT-31-Procedure}: ${format-number(BT-31-Procedure, '###,##0')} // Maximum number of lots for which one tenderer can submit tenders
@@ -118,7 +117,6 @@
 				{BT-50-Lot[BT-50-Lot is present]} #{field|name|BT-50-Lot}: ${BT-50-Lot} // Minimum Candidates
 				{BT-661-Lot[BT-51-Lot is present]} #{field|name|BT-51-Lot}: ${BT-51-Lot} // Maximum Candidates
 				{BT-52-Lot[BT-52-Lot == TRUE]} #{field|name|BT-52-Lot} // The procedure will take place in successive stages. In each stage, some participants may be eliminated.
-				{BT-120-Lot[BT-120-Lot == TRUE]} #{field|name|BT-120-Lot} // The buyer reserves the right to award the contract on the basis of the initial tenders without any further negotiations.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
 				0 {ND-LotAwardCriterion[BT-539-Lot != 'unpublished']} #{field|name|BT-539-Lot}: #{BT-539-Lot} // Type
@@ -132,8 +130,8 @@
 		11 {BT-137-Lot[(BT-14-Lot is present) or (BT-632-Lot is present) or (BT-124-Lot is present)]} #{auxiliary|text|procurement-documents} // 5.1.11 Procurement documents
 			{BT-137-Lot[some text:$restricted in (for text:$somerestricted in BT-14-Lot return $somerestricted) satisfies $restricted == 'restricted-document']} #{field|name|BT-14-Lot} // The access to certain procurement documents is restricted. (Lot)
 			{BT-707-Lot} #{field|name|BT-707-Lot}: #{BT-707-Lot} // Justification for restricting access to certain procurement documents (Lot)
-			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: ${distinct-values(for text:$lang in BT-708-Lot return $lang)} // Languages in which the procurement documents are officially available (Lot)
-			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: ${distinct-values(for text:$lang in BT-737-Lot return $lang)} // Languages in which the procurement documents are unofficially available (Lot)
+			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: #{BT-708-Lot} // Languages in which the procurement documents are officially available (Lot)
+			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: #{BT-737-Lot} // Languages in which the procurement documents are unofficially available (Lot)
 			{BT-13(d)-Lot} #{field|name|BT-13(d)-Lot}: ${BT-13(d)-Lot} ${BT-13(t)-Lot} // Deadline for requesting additional information (Lot)
 			{BT-137-Lot[BT-615-Lot is present]} #{field|name|BT-615-Lot}: ${distinct-values(for text:$url in BT-615-Lot return concat($url, ', '))} // Information about restricted documents is available at (Lot) 
 			{BT-137-Lot[BT-15-Lot is present]} #{field|name|BT-15-Lot}: ${distinct-values(for text:$url in BT-15-Lot return concat($url, ', '))} // Information about non-restricted documents is available at (Lot) 
@@ -157,8 +155,7 @@
 				{BT-18-Lot} #{field|name|BT-18-Lot}: ${BT-18-Lot} // Address for submission (URL)
 				{BT-19-Lot} #{field|name|BT-19-Lot}: #{BT-19-Lot} // Submission Nonelectronic Justification
 				{BT-137-Lot[BT-745-Lot is present]} #{field|name|BT-745-Lot}: ${BT-745-Lot} // Submission Nonelectronic Description
-				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders, requests to participate, or expressions of interest may be submitted
-				{BT-764-Lot} #{field|name|BT-764-Lot}: #{BT-764-Lot} // Electronic catalogue
+				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders or requests to participate may be submitted
 				{BT-744-Lot[BT-744-Lot == 'true']} #{field|name|BT-744-Lot} // Advanced or qualified electronic signature or seal (as defined in Regulation (EU) No 910/2014) is required. (true/false)
 				{BT-63-Lot} #{field|name|BT-63-Lot}: #{BT-63-Lot} // Variants
 				{BT-769-Lot[BT-769-Lot == 'allowed']} #{field|name|BT-769-Lot} // Tenderers may submit more than one tender.
@@ -179,14 +176,15 @@
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -227,20 +225,7 @@
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -255,6 +240,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/24.efx b/view-templates/24.efx
index e3c360b50..9972cc62f 100644
--- a/view-templates/24.efx
+++ b/view-templates/24.efx
@@ -37,8 +37,7 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
 		5 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present or BT-33-Procedure is present]} #{auxiliary|text|procurement-terms} // 2.1.5 Procurement terms
 			0 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present]} #{auxiliary|text|submission-terms}: // Terms of submission
 				{BT-31-Procedure} #{field|name|BT-31-Procedure}: ${format-number(BT-31-Procedure, '###,##0')} // Maximum number of lots for which one tenderer can submit tenders
@@ -119,7 +118,6 @@
 				{BT-50-Lot[BT-50-Lot is present]} #{field|name|BT-50-Lot}: ${BT-50-Lot} // Minimum Candidates
 				{BT-661-Lot[BT-51-Lot is present]} #{field|name|BT-51-Lot}: ${BT-51-Lot} // Maximum Candidates
 				{BT-52-Lot[BT-52-Lot == TRUE]} #{field|name|BT-52-Lot} // The procedure will take place in successive stages. In each stage, some participants may be eliminated.
-				{BT-120-Lot[BT-120-Lot == TRUE]} #{field|name|BT-120-Lot} // The buyer reserves the right to award the contract on the basis of the initial tenders without any further negotiations.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
 				0 {ND-LotAwardCriterion[BT-539-Lot != 'unpublished']} #{field|name|BT-539-Lot}: #{BT-539-Lot} // Type
@@ -133,8 +131,8 @@
 		11 {BT-137-Lot[(BT-14-Lot is present) or (BT-632-Lot is present) or (BT-124-Lot is present)]} #{auxiliary|text|procurement-documents} // 5.1.11 Procurement documents
 			{BT-137-Lot[some text:$restricted in (for text:$somerestricted in BT-14-Lot return $somerestricted) satisfies $restricted == 'restricted-document']} #{field|name|BT-14-Lot} // The access to certain procurement documents is restricted. (Lot)
 			{BT-707-Lot} #{field|name|BT-707-Lot}: #{BT-707-Lot} // Justification for restricting access to certain procurement documents (Lot)
-			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: ${distinct-values(for text:$lang in BT-708-Lot return $lang)} // Languages in which the procurement documents are officially available (Lot)
-			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: ${distinct-values(for text:$lang in BT-737-Lot return $lang)} // Languages in which the procurement documents are unofficially available (Lot)
+			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: #{BT-708-Lot} // Languages in which the procurement documents are officially available (Lot)
+			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: #{BT-737-Lot} // Languages in which the procurement documents are unofficially available (Lot)
 			{BT-13(d)-Lot} #{field|name|BT-13(d)-Lot}: ${BT-13(d)-Lot} ${BT-13(t)-Lot} // Deadline for requesting additional information (Lot)
 			{BT-137-Lot[BT-615-Lot is present]} #{field|name|BT-615-Lot}: ${distinct-values(for text:$url in BT-615-Lot return concat($url, ', '))} // Information about restricted documents is available at (Lot) 
 			{BT-137-Lot[BT-15-Lot is present]} #{field|name|BT-15-Lot}: ${distinct-values(for text:$url in BT-15-Lot return concat($url, ', '))} // Information about non-restricted documents is available at (Lot) 
@@ -158,8 +156,7 @@
 				{BT-18-Lot} #{field|name|BT-18-Lot}: ${BT-18-Lot} // Address for submission (URL)
 				{BT-19-Lot} #{field|name|BT-19-Lot}: #{BT-19-Lot} // Submission Nonelectronic Justification
 				{BT-137-Lot[BT-745-Lot is present]} #{field|name|BT-745-Lot}: ${BT-745-Lot} // Submission Nonelectronic Description
-				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders, requests to participate, or expressions of interest may be submitted
-				{BT-764-Lot} #{field|name|BT-764-Lot}: #{BT-764-Lot} // Electronic catalogue
+				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders or requests to participate may be submitted
 				{BT-744-Lot[BT-744-Lot == 'true']} #{field|name|BT-744-Lot} // Advanced or qualified electronic signature or seal (as defined in Regulation (EU) No 910/2014) is required. (true/false)
 				{BT-63-Lot} #{field|name|BT-63-Lot}: #{BT-63-Lot} // Variants
 				{BT-769-Lot[BT-769-Lot == 'allowed']} #{field|name|BT-769-Lot} // Tenderers may submit more than one tender.
@@ -180,14 +177,15 @@
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -228,20 +226,7 @@
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -256,6 +241,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/25.efx b/view-templates/25.efx
index 56461155e..2aad8d0f4 100644
--- a/view-templates/25.efx
+++ b/view-templates/25.efx
@@ -38,11 +38,10 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
-					{BT-197(BT-09)-Procedure} #{field|name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
-					{ND-Root[BT-196(BT-09)-Procedure is present]} #{field|name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
-					{BT-198(BT-09)-Procedure} #{field|name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
+				{BT-197(BT-09)-Procedure} #{name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
+				{ND-Root[BT-196(BT-09)-Procedure is present]} #{name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
+				{BT-198(BT-09)-Procedure} #{name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
 4 {ND-Root[BT-137-LotsGroup is present]} #{auxiliary|text|group-of-lots} // 4. Group of lots
 	1 {ND-LotsGroup} #{field|name|BT-330-Procedure}: ${BT-137-LotsGroup} // 4.1 Group of lots
 		{BT-137-LotsGroup} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-137-LotsGroup return BT-1375-Procedure[BT-330-Procedure == $gloid]} // Lots included / Group Lot Identifier 
@@ -189,10 +188,8 @@
 		15 {ND-LotTenderingProcess[(BT-765-Lot is present) or (BT-113-Lot is present) or (BT-109-Lot is present) or (BT-111-Lot is present) or (BT-766-Lot is present) or (BT-119-LotResult == TRUE) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|techniques} // 5.1.15 Techniques
 			0 {ND-LotTenderingProcess[(BT-765-Lot is present) or (BT-113-Lot is present) or (BT-109-Lot is present) or (BT-111-Lot is present)]} #{auxiliary|text|framework-agreement}: // Information about framework agreement
 				{BT-765-Lot} #{BT-765-Lot} // Framework Agreement Type
-				{BT-113-Lot} #{field|name|BT-113-Lot}: ${BT-113-Lot} // Maximum number of participants
-				{BT-137-Lot[BT-109-Lot is present]} #{field|name|BT-109-Lot}: ${BT-109-Lot} // Justification for the duration of framework agreement
 				{BT-137-Lot[BT-111-Lot is present]} #{field|name|BT-111-Lot}: ${BT-111-Lot} // Framework Buyer Categories (Lot)
-			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system} // Dynamic purchasing system 
+			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system}: // Information about the dynamic purchasing system
 				{BT-766-Lot} #{BT-766-Lot} // Dynamic Purchasing System
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
 			{BT-137-Lot[OPT-301-Lot-Mediator is present]} #{auxiliary|text|organisation-mediation}: ${for text:$refid in OPT-301-Lot-Mediator, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Mediation organisation (Lot)
@@ -203,12 +200,12 @@
 			{BT-137-Lot[OPT-301-Lot-AddInfo is present]} #{auxiliary|text|organisation-providing-info-procedure}: ${for text:$refid in OPT-301-Lot-AddInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation providing additional information about the procurement procedure (Lot)
 			{BT-137-Lot[OPT-301-Lot-DocProvider is present]} #{auxiliary|text|organisation-providing-docs}: ${for text:$refid in OPT-301-Lot-DocProvider, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Documents provider organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-financing}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Financing Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-paying}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Paying Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$conid1 in OPT-315-LotResult[BT-13713-LotResult == $lotid1], text:$orgid1 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-signing-contract}: ${distinct-values(for text:$lotid2 in BT-137-Lot, text:$conid2 in OPT-315-LotResult[BT-13713-LotResult == $lotid2], text:$orgid2 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname)} // Contract Signatory (LotResult)
-6 {ND-Root[(BT-13713-LotResult is present)]} #{auxiliary|text|results} // 6. Results
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
+6 {ND-Root[(BT-3201-Tender is present)]} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} ${BT-161-NoticeResult/@currencyID} // Notice Value (Value of all contracts awarded in this procedure)
 	0 {ND-NoticeResult[BT-161-NoticeResult == -1]} #{field|name|BT-161-NoticeResult}: #{auxiliary|text|unpublished} // Notice Value (Value of all contracts awarded in this procedure) (unpublished)
 		{ND-NoticeValueUnpublish} #{field|name|BT-197(BT-161)-NoticeResult}: #{BT-197(BT-161)-NoticeResult} // Unpublished Justification Code
@@ -224,6 +221,18 @@
 		{ND-NoticeApproximateValueUnpublish} #{field|name|BT-197(BT-1118)-NoticeResult}: #{BT-197(BT-1118)-NoticeResult} // Unpublished Justification Code
 		{ND-NoticeApproximateValueUnpublish[BT-196(BT-1118)-NoticeResult is present]} #{field|name|BT-196(BT-1118)-NoticeResult}: ${BT-196(BT-1118)-NoticeResult} // Unpublished Justification Description
 		{ND-NoticeApproximateValueUnpublish[BT-198(BT-1118)-NoticeResult is present]} #{field|name|BT-198(BT-1118)-NoticeResult}: ${BT-198(BT-1118)-NoticeResult} // Unpublished Access Date
+	0 {ND-NoticeResultGroupFA[BT-556-NoticeResult != 'unpublished']} #{auxiliary|text|group-framework-value}: ${BT-556-NoticeResult} // Value of the framework agreements in this group of lots
+		0 {ND-NoticeResultGroupFA} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-556-NoticeResult return BT-1375-Procedure[BT-330-Procedure == $gloid] } // Lots included: LOT-0001, LOT-0003
+		0 {BT-156-NoticeResult[BT-156-NoticeResult != -1]} #{field|name|BT-156-NoticeResult}: ${format-number(BT-156-NoticeResult, '###,##0.##')} ${BT-156-NoticeResult/@currencyID} // Maximum value of the framework agreements in this group of lots
+		0 {BT-156-NoticeResult[BT-156-NoticeResult == -1]} #{field|name|BT-156-NoticeResult}:#{auxiliary|text|unpublished} // Maximum value of the framework agreements in this group of lots (unpublished)
+			{ND-GroupMaximumValueUnpublish} #{field|name|BT-197(BT-156)-NoticeResult}: #{BT-197(BT-156)-NoticeResult} // Unpublished Justification Code
+			{ND-GroupMaximumValueUnpublish[BT-196(BT-156)-NoticeResult is present]} #{field|name|BT-196(BT-156)-NoticeResult}: ${BT-196(BT-156)-NoticeResult} // Unpublished Justification Description
+			{ND-GroupMaximumValueUnpublish[BT-198(BT-156)-NoticeResult is present]} #{field|name|BT-198(BT-156)-NoticeResult}: ${BT-198(BT-156)-NoticeResult} // Unpublished Access Date
+		0 {BT-1561-NoticeResult[BT-1561-NoticeResult != -1]} #{field|name|BT-1561-NoticeResult}: ${format-number(BT-1561-NoticeResult, '###,##0.##')} ${BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID} // Re-estimated value of the framework agreements within a group of lots
+		0 {BT-1561-NoticeResult[BT-1561-NoticeResult == -1]} #{field|name|BT-1561-NoticeResult}: #{auxiliary|text|unpublished} // Re-estimated value of the framework agreements within a group of lots (unpublished)
+			{ND-GroupReestimatedValueUnpublish} #{field|name|BT-197(BT-1561)-NoticeResult}: #{BT-197(BT-1561)-NoticeResult} // Unpublished Justification Code
+			{ND-GroupReestimatedValueUnpublish[BT-196(BT-1561)-NoticeResult is present]} #{field|name|BT-196(BT-1561)-NoticeResult}: ${BT-196(BT-1561)-NoticeResult} // Unpublished Justification Description
+			{ND-GroupReestimatedValueUnpublish[BT-198(BT-1561)-NoticeResult is present]} #{field|name|BT-198(BT-1561)-NoticeResult}: ${BT-198(BT-1561)-NoticeResult} // Unpublished Access Date
 	0 {ND-NoticeResultGroupFA[BT-556-NoticeResult == 'unpublished']} #{auxiliary|text|group-framework-value}: #{auxiliary|text|unpublished} // Value of the framework agreements in this group of lots (unpublished)
 		{ND-GroupMaximalValueIdentifierUnpublish} #{field|name|BT-197(BT-556)-NoticeResult}: #{BT-197(BT-556)-NoticeResult} // Unpublished Justification Code
 		{ND-GroupMaximalValueIdentifierUnpublish[BT-196(BT-556)-NoticeResult is present]} #{field|name|BT-196(BT-556)-NoticeResult}: ${BT-196(BT-556)-NoticeResult} // Unpublished Justification Description
@@ -240,8 +249,8 @@
 			{ND-GroupReestimatedValueUnpublish[BT-196(BT-1561)-NoticeResult is present]} #{field|name|BT-196(BT-1561)-NoticeResult}: ${BT-196(BT-1561)-NoticeResult} // Unpublished Justification Description
 			{ND-GroupReestimatedValueUnpublish[BT-198(BT-1561)-NoticeResult is present]} #{field|name|BT-198(BT-1561)-NoticeResult}: ${BT-198(BT-1561)-NoticeResult} // Unpublished Access Date
 	0 {ND-DirectAward} #{auxiliary|text|direct-award}: // Direct award
-		0 {ND-DirectAward[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
-		0 {ND-DirectAward[BT-136-Procedure == 'unpublished']} #{field|name|BT-136-Procedure}: #{auxiliary|text|unpublished} // Justification for direct award (unpublished)
+		0 {BT-136-Procedure[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
+		0 {BT-136-Procedure[BT-136-Procedure == 'unpublished']} #{field|name|BT-136-Procedure}: #{auxiliary|text|unpublished} // Justification for direct award (unpublished)
 			{ND-DirectAwardJustificationCodeUnpublish} #{field|name|BT-197(BT-136)-Procedure}: #{BT-197(BT-136)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationCodeUnpublish[BT-196(BT-136)-Procedure is present]} #{field|name|BT-196(BT-136)-Procedure}: ${BT-196(BT-136)-Procedure} // Unpublished Justification Description
 			{ND-DirectAwardJustificationCodeUnpublish[BT-198(BT-136)-Procedure is present]} #{field|name|BT-198(BT-136)-Procedure}: ${BT-198(BT-136)-Procedure} // Unpublished Access Date
@@ -250,7 +259,7 @@
 			{ND-DirectAwardJustificationTextUnpublish} #{field|name|BT-197(BT-135)-Procedure}: #{BT-197(BT-135)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationTextUnpublish[BT-196(BT-135)-Procedure is present]} #{field|name|BT-196(BT-135)-Procedure}: ${BT-196(BT-135)-Procedure} // Unpublished Justification Description
 			{ND-DirectAwardJustificationTextUnpublish[BT-198(BT-135)-Procedure is present]} #{field|name|BT-198(BT-135)-Procedure}: ${BT-198(BT-135)-Procedure} // Unpublished Access Date
-		0 {ND-DirectAward[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
+		0 {BT-1252-Procedure[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
 		0 {ND-DirectAward[BT-1252-Procedure == 'unpublished']} #{field|name|BT-1252-Procedure}: #{auxiliary|text|unpublished} // Identifier of the previous procedure that justifies direct award (unpublished)
 			{ND-DirectAwardJustificationPreviousUnpublish} #{field|name|BT-197(BT-1252)-Procedure}: #{BT-197(BT-1252)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationPreviousUnpublish[BT-196(BT-1252)-Procedure is present]} #{field|name|BT-196(BT-1252)-Procedure}: ${BT-196(BT-1252)-Procedure} // Unpublished Justification Description
@@ -269,9 +278,11 @@
 				{ND-ReestimatedValueUnpublish[BT-198(BT-660)-LotResult is present]} #{field|name|BT-198(BT-660)-LotResult}: ${BT-198(BT-660)-LotResult} // Unpublished Access Date
 		2 {ND-LotResult[BT-02-notice == 'veat' or BT-02-notice == 'can-modif' or ((BT-142-LotResult == 'selec-w' or BT-142-LotResult == 'unpublished') and OPT-320-LotResult is present and OPT-315-LotResult is present)]} #{auxiliary|text|winner-info} // 6.1.2. Winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]])>0]} #{auxiliary|text|winner}: // Winner
-				{OPT-320-LotResult} #{field|name|BT-500-Organization-Company}: ${for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa or OPT-170-Tenderer[OPT-210-Tenderer == $tpa] == TRUE]), text:$org in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($org, '
')} // Name of this winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Name of this winner (single organisation in Tendering Party)
 				0 {OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{auxiliary|text|winner-subcontractor}: // Subcontractors of the winner
-					{OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{field|name|BT-500-Business}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid]} // Subcontractor name
+					{OPT-320-LotResult[some text:$orgname1 in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $orgname1 != '']} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]], text:$orgname2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($orgname2, ', ')} // Subcontractor names
 				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]])>0]} #{auxiliary|text|tender}: // Tender
 				{OPT-320-LotResult} #{field|name|BT-3201-Tender}: ${for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender == $tender]} // Tender identifier
 				{OPT-320-LotResult} #{field|name|BT-13714-Tender}: ${for text:$tender in OPT-320-LotResult return BT-13714-Tender[OPT-321-Tender == $tender]} // Identifier of lot or group of lots
@@ -291,8 +302,9 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-773)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-730-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
-					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-730-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-730-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties (unpublished)
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$code2 in BT-197(BT-730)-Tender[OPT-321-Tender == $tender2] return $code2} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $desc != '']} #{field|name|BT-196(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc1 in BT-196(BT-730)-Tender[OPT-321-Tender == $tender2] return $desc1} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-553-Tender[BT-553-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-553-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-553-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} ${for text:$tender3 in OPT-320-LotResult return BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID} // Estimated value of the part of the contract that the contractor will subcontract to third parties
@@ -300,7 +312,8 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-553)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-731-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$spk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $spk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-731-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-731)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
@@ -319,7 +332,7 @@
 					{OPT-320-LotResult[some text:$title1 in (for text:$tender1 in OPT-320-LotResult return BT-721-Contract[BT-3202-Contract == $tender1]) satisfies $title1 != '']} #{field|name|BT-721-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$title2 in BT-721-Contract[BT-3202-Contract == $tender2] return $title2} // Contract title
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-1451-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z ]} #{field|name|BT-1451-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-1451-Contract[BT-3202-Contract == $tender2]} // Winning Decision date
 					0 {OPT-320-LotResult[some text:$contractid in (for text:$tender in OPT-320-LotResult return BT-3202-Contract[BT-3202-Contract[BT-5011-Contract is present or BT-722-Contract is present or BT-6110-Contract is present] == $tender]) satisfies $contractid != '']} #{auxiliary|text|eu-funds-used} // Information about European Union funds used to finance the contract
-						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Name
+						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$name in BT-722-Contract[BT-3202-Contract == $tender2] return $name} // Contract EU Funds Name
 						{OPT-320-LotResult[some text:$eufundid in (for text:$tender1 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender1]) satisfies $eufundid != '']} #{field|name|BT-5011-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Identifier
 						{OPT-320-LotResult[some text:$eufunddesc in (for text:$tender1 in OPT-320-LotResult return BT-6110-Contract[BT-3202-Contract == $tender1]) satisfies $eufunddesc != '']} #{field|name|BT-6110-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$details in BT-6110-Contract[BT-3202-Contract == $tender2] return $details} // Contract EU Funds Details
 					{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-300-Contract-Signatory[BT-3202-Contract == $tender1]) > 0]} #{auxiliary|text|organisation-signing-contract}: ${for text:$tender2 in OPT-320-LotResult, text:$orgid in OPT-300-Contract-Signatory[BT-3202-Contract == $tender2], text:$orgname in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return $orgname} // Organisation signing the contract
@@ -328,10 +341,10 @@
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
 		{BT-165-Organization-Company} #{field|name|BT-165-Organization-Company}: ${BT-165-Organization-Company} // Size of the economic operator
 		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -365,14 +378,12 @@
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'ted-esen') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'ted-esen')]} #{auxiliary|text|organisation-esender} // This org is an eSender
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-300-Contract-Signatory) or (OPT-201-Organization-TouchPoint == OPT-300-Contract-Signatory)]} #{auxiliary|text|organisation-signing-contract} // Contract Signatory organisation (SettledContract)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Financing) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Financing)]} #{auxiliary|text|organisation-financing} // Financing Organisation (LotResult)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Paying) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Paying)]} #{auxiliary|text|organisation-paying} // Paying Organisation (LotResult)
@@ -406,6 +417,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/26.efx b/view-templates/26.efx
index f7724e0f0..e9cff519a 100644
--- a/view-templates/26.efx
+++ b/view-templates/26.efx
@@ -39,11 +39,10 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
-					{BT-197(BT-09)-Procedure} #{field|name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
-					{ND-Root[BT-196(BT-09)-Procedure is present]} #{field|name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
-					{BT-198(BT-09)-Procedure} #{field|name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
+				{BT-197(BT-09)-Procedure} #{name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
+				{ND-Root[BT-196(BT-09)-Procedure is present]} #{name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
+				{BT-198(BT-09)-Procedure} #{name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
 4 {ND-Root[BT-137-LotsGroup is present]} #{auxiliary|text|group-of-lots} // 4. Group of lots
 	1 {ND-LotsGroup} #{field|name|BT-330-Procedure}: ${BT-137-LotsGroup} // 4.1 Group of lots
 		{BT-137-LotsGroup} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-137-LotsGroup return BT-1375-Procedure[BT-330-Procedure == $gloid]} // Lots included / Group Lot Identifier 
@@ -190,10 +189,8 @@
 		15 {ND-LotTenderingProcess[(BT-765-Lot is present) or (BT-113-Lot is present) or (BT-109-Lot is present) or (BT-111-Lot is present) or (BT-766-Lot is present) or (BT-119-LotResult == TRUE) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|techniques} // 5.1.15 Techniques
 			0 {ND-LotTenderingProcess[(BT-765-Lot is present) or (BT-113-Lot is present) or (BT-109-Lot is present) or (BT-111-Lot is present)]} #{auxiliary|text|framework-agreement}: // Information about framework agreement
 				{BT-765-Lot} #{BT-765-Lot} // Framework Agreement Type
-				{BT-113-Lot} #{field|name|BT-113-Lot}: ${BT-113-Lot} // Maximum number of participants
-				{BT-137-Lot[BT-109-Lot is present]} #{field|name|BT-109-Lot}: ${BT-109-Lot} // Justification for the duration of framework agreement
 				{BT-137-Lot[BT-111-Lot is present]} #{field|name|BT-111-Lot}: ${BT-111-Lot} // Framework Buyer Categories (Lot)
-			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system} // Dynamic purchasing system 
+			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system}: // Information about the dynamic purchasing system
 				{BT-766-Lot} #{BT-766-Lot} // Dynamic Purchasing System
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
 			{BT-137-Lot[OPT-301-Lot-Mediator is present]} #{auxiliary|text|organisation-mediation}: ${for text:$refid in OPT-301-Lot-Mediator, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Mediation organisation (Lot)
@@ -204,12 +201,12 @@
 			{BT-137-Lot[OPT-301-Lot-AddInfo is present]} #{auxiliary|text|organisation-providing-info-procedure}: ${for text:$refid in OPT-301-Lot-AddInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation providing additional information about the procurement procedure (Lot)
 			{BT-137-Lot[OPT-301-Lot-DocProvider is present]} #{auxiliary|text|organisation-providing-docs}: ${for text:$refid in OPT-301-Lot-DocProvider, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Documents provider organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-financing}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Financing Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-paying}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Paying Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$conid1 in OPT-315-LotResult[BT-13713-LotResult == $lotid1], text:$orgid1 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-signing-contract}: ${distinct-values(for text:$lotid2 in BT-137-Lot, text:$conid2 in OPT-315-LotResult[BT-13713-LotResult == $lotid2], text:$orgid2 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname)} // Contract Signatory (LotResult)
-6 {ND-Root[(BT-13713-LotResult is present)]} #{auxiliary|text|results} // 6. Results
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
+6 {ND-Root[(BT-3201-Tender is present)]} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} ${BT-161-NoticeResult/@currencyID} // Notice Value (Value of all contracts awarded in this procedure)
 	0 {ND-NoticeResult[BT-161-NoticeResult == -1]} #{field|name|BT-161-NoticeResult}: #{auxiliary|text|unpublished} // Notice Value (Value of all contracts awarded in this procedure) (unpublished)
 		{ND-NoticeValueUnpublish} #{field|name|BT-197(BT-161)-NoticeResult}: #{BT-197(BT-161)-NoticeResult} // Unpublished Justification Code
@@ -225,6 +222,18 @@
 		{ND-NoticeApproximateValueUnpublish} #{field|name|BT-197(BT-1118)-NoticeResult}: #{BT-197(BT-1118)-NoticeResult} // Unpublished Justification Code
 		{ND-NoticeApproximateValueUnpublish[BT-196(BT-1118)-NoticeResult is present]} #{field|name|BT-196(BT-1118)-NoticeResult}: ${BT-196(BT-1118)-NoticeResult} // Unpublished Justification Description
 		{ND-NoticeApproximateValueUnpublish[BT-198(BT-1118)-NoticeResult is present]} #{field|name|BT-198(BT-1118)-NoticeResult}: ${BT-198(BT-1118)-NoticeResult} // Unpublished Access Date
+	0 {ND-NoticeResultGroupFA[BT-556-NoticeResult != 'unpublished']} #{auxiliary|text|group-framework-value}: ${BT-556-NoticeResult} // Value of the framework agreements in this group of lots
+		0 {ND-NoticeResultGroupFA} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-556-NoticeResult return BT-1375-Procedure[BT-330-Procedure == $gloid] } // Lots included: LOT-0001, LOT-0003
+		0 {BT-156-NoticeResult[BT-156-NoticeResult != -1]} #{field|name|BT-156-NoticeResult}: ${format-number(BT-156-NoticeResult, '###,##0.##')} ${BT-156-NoticeResult/@currencyID} // Maximum value of the framework agreements in this group of lots
+		0 {BT-156-NoticeResult[BT-156-NoticeResult == -1]} #{field|name|BT-156-NoticeResult}:#{auxiliary|text|unpublished} // Maximum value of the framework agreements in this group of lots (unpublished)
+			{ND-GroupMaximumValueUnpublish} #{field|name|BT-197(BT-156)-NoticeResult}: #{BT-197(BT-156)-NoticeResult} // Unpublished Justification Code
+			{ND-GroupMaximumValueUnpublish[BT-196(BT-156)-NoticeResult is present]} #{field|name|BT-196(BT-156)-NoticeResult}: ${BT-196(BT-156)-NoticeResult} // Unpublished Justification Description
+			{ND-GroupMaximumValueUnpublish[BT-198(BT-156)-NoticeResult is present]} #{field|name|BT-198(BT-156)-NoticeResult}: ${BT-198(BT-156)-NoticeResult} // Unpublished Access Date
+		0 {BT-1561-NoticeResult[BT-1561-NoticeResult != -1]} #{field|name|BT-1561-NoticeResult}: ${format-number(BT-1561-NoticeResult, '###,##0.##')} ${BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID} // Re-estimated value of the framework agreements within a group of lots
+		0 {BT-1561-NoticeResult[BT-1561-NoticeResult == -1]} #{field|name|BT-1561-NoticeResult}: #{auxiliary|text|unpublished} // Re-estimated value of the framework agreements within a group of lots (unpublished)
+			{ND-GroupReestimatedValueUnpublish} #{field|name|BT-197(BT-1561)-NoticeResult}: #{BT-197(BT-1561)-NoticeResult} // Unpublished Justification Code
+			{ND-GroupReestimatedValueUnpublish[BT-196(BT-1561)-NoticeResult is present]} #{field|name|BT-196(BT-1561)-NoticeResult}: ${BT-196(BT-1561)-NoticeResult} // Unpublished Justification Description
+			{ND-GroupReestimatedValueUnpublish[BT-198(BT-1561)-NoticeResult is present]} #{field|name|BT-198(BT-1561)-NoticeResult}: ${BT-198(BT-1561)-NoticeResult} // Unpublished Access Date
 	0 {ND-NoticeResultGroupFA[BT-556-NoticeResult == 'unpublished']} #{auxiliary|text|group-framework-value}: #{auxiliary|text|unpublished} // Value of the framework agreements in this group of lots (unpublished)
 		{ND-GroupMaximalValueIdentifierUnpublish} #{field|name|BT-197(BT-556)-NoticeResult}: #{BT-197(BT-556)-NoticeResult} // Unpublished Justification Code
 		{ND-GroupMaximalValueIdentifierUnpublish[BT-196(BT-556)-NoticeResult is present]} #{field|name|BT-196(BT-556)-NoticeResult}: ${BT-196(BT-556)-NoticeResult} // Unpublished Justification Description
@@ -241,8 +250,8 @@
 			{ND-GroupReestimatedValueUnpublish[BT-196(BT-1561)-NoticeResult is present]} #{field|name|BT-196(BT-1561)-NoticeResult}: ${BT-196(BT-1561)-NoticeResult} // Unpublished Justification Description
 			{ND-GroupReestimatedValueUnpublish[BT-198(BT-1561)-NoticeResult is present]} #{field|name|BT-198(BT-1561)-NoticeResult}: ${BT-198(BT-1561)-NoticeResult} // Unpublished Access Date
 	0 {ND-DirectAward} #{auxiliary|text|direct-award}: // Direct award
-		0 {ND-DirectAward[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
-		0 {ND-DirectAward[BT-136-Procedure == 'unpublished']} #{field|name|BT-136-Procedure}: #{auxiliary|text|unpublished} // Justification for direct award (unpublished)
+		0 {BT-136-Procedure[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
+		0 {BT-136-Procedure[BT-136-Procedure == 'unpublished']} #{field|name|BT-136-Procedure}: #{auxiliary|text|unpublished} // Justification for direct award (unpublished)
 			{ND-DirectAwardJustificationCodeUnpublish} #{field|name|BT-197(BT-136)-Procedure}: #{BT-197(BT-136)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationCodeUnpublish[BT-196(BT-136)-Procedure is present]} #{field|name|BT-196(BT-136)-Procedure}: ${BT-196(BT-136)-Procedure} // Unpublished Justification Description
 			{ND-DirectAwardJustificationCodeUnpublish[BT-198(BT-136)-Procedure is present]} #{field|name|BT-198(BT-136)-Procedure}: ${BT-198(BT-136)-Procedure} // Unpublished Access Date
@@ -251,7 +260,7 @@
 			{ND-DirectAwardJustificationTextUnpublish} #{field|name|BT-197(BT-135)-Procedure}: #{BT-197(BT-135)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationTextUnpublish[BT-196(BT-135)-Procedure is present]} #{field|name|BT-196(BT-135)-Procedure}: ${BT-196(BT-135)-Procedure} // Unpublished Justification Description
 			{ND-DirectAwardJustificationTextUnpublish[BT-198(BT-135)-Procedure is present]} #{field|name|BT-198(BT-135)-Procedure}: ${BT-198(BT-135)-Procedure} // Unpublished Access Date
-		0 {ND-DirectAward[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
+		0 {BT-1252-Procedure[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
 		0 {ND-DirectAward[BT-1252-Procedure == 'unpublished']} #{field|name|BT-1252-Procedure}: #{auxiliary|text|unpublished} // Identifier of the previous procedure that justifies direct award (unpublished)
 			{ND-DirectAwardJustificationPreviousUnpublish} #{field|name|BT-197(BT-1252)-Procedure}: #{BT-197(BT-1252)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationPreviousUnpublish[BT-196(BT-1252)-Procedure is present]} #{field|name|BT-196(BT-1252)-Procedure}: ${BT-196(BT-1252)-Procedure} // Unpublished Justification Description
@@ -270,9 +279,11 @@
 				{ND-ReestimatedValueUnpublish[BT-198(BT-660)-LotResult is present]} #{field|name|BT-198(BT-660)-LotResult}: ${BT-198(BT-660)-LotResult} // Unpublished Access Date
 		2 {ND-LotResult[BT-02-notice == 'veat' or BT-02-notice == 'can-modif' or ((BT-142-LotResult == 'selec-w' or BT-142-LotResult == 'unpublished') and OPT-320-LotResult is present and OPT-315-LotResult is present)]} #{auxiliary|text|winner-info} // 6.1.2. Winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]])>0]} #{auxiliary|text|winner}: // Winner
-				{OPT-320-LotResult} #{field|name|BT-500-Organization-Company}: ${for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa or OPT-170-Tenderer[OPT-210-Tenderer == $tpa] == TRUE]), text:$org in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($org, '
')} // Name of this winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Name of this winner (single organisation in Tendering Party)
 				0 {OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{auxiliary|text|winner-subcontractor}: // Subcontractors of the winner
-					{OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{field|name|BT-500-Business}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid]} // Subcontractor name
+					{OPT-320-LotResult[some text:$orgname1 in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $orgname1 != '']} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]], text:$orgname2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($orgname2, ', ')} // Subcontractor names
 				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]])>0]} #{auxiliary|text|tender}: // Tender
 				{OPT-320-LotResult} #{field|name|BT-3201-Tender}: ${for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender == $tender]} // Tender identifier
 				{OPT-320-LotResult} #{field|name|BT-13714-Tender}: ${for text:$tender in OPT-320-LotResult return BT-13714-Tender[OPT-321-Tender == $tender]} // Identifier of lot or group of lots
@@ -292,8 +303,9 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-773)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-730-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
-					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-730-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-730-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties (unpublished)
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$code2 in BT-197(BT-730)-Tender[OPT-321-Tender == $tender2] return $code2} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $desc != '']} #{field|name|BT-196(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc1 in BT-196(BT-730)-Tender[OPT-321-Tender == $tender2] return $desc1} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-553-Tender[BT-553-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-553-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-553-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} ${for text:$tender3 in OPT-320-LotResult return BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID} // Estimated value of the part of the contract that the contractor will subcontract to third parties
@@ -301,7 +313,8 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-553)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-731-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$spk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $spk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-731-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-731)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
@@ -320,7 +333,7 @@
 					{OPT-320-LotResult[some text:$title1 in (for text:$tender1 in OPT-320-LotResult return BT-721-Contract[BT-3202-Contract == $tender1]) satisfies $title1 != '']} #{field|name|BT-721-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$title2 in BT-721-Contract[BT-3202-Contract == $tender2] return $title2} // Contract title
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-1451-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z ]} #{field|name|BT-1451-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-1451-Contract[BT-3202-Contract == $tender2]} // Winning Decision date
 					0 {OPT-320-LotResult[some text:$contractid in (for text:$tender in OPT-320-LotResult return BT-3202-Contract[BT-3202-Contract[BT-5011-Contract is present or BT-722-Contract is present or BT-6110-Contract is present] == $tender]) satisfies $contractid != '']} #{auxiliary|text|eu-funds-used} // Information about European Union funds used to finance the contract
-						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Name
+						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$name in BT-722-Contract[BT-3202-Contract == $tender2] return $name} // Contract EU Funds Name
 						{OPT-320-LotResult[some text:$eufundid in (for text:$tender1 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender1]) satisfies $eufundid != '']} #{field|name|BT-5011-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Identifier
 						{OPT-320-LotResult[some text:$eufunddesc in (for text:$tender1 in OPT-320-LotResult return BT-6110-Contract[BT-3202-Contract == $tender1]) satisfies $eufunddesc != '']} #{field|name|BT-6110-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$details in BT-6110-Contract[BT-3202-Contract == $tender2] return $details} // Contract EU Funds Details
 					{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-300-Contract-Signatory[BT-3202-Contract == $tender1]) > 0]} #{auxiliary|text|organisation-signing-contract}: ${for text:$tender2 in OPT-320-LotResult, text:$orgid in OPT-300-Contract-Signatory[BT-3202-Contract == $tender2], text:$orgname in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return $orgname} // Organisation signing the contract
@@ -329,10 +342,10 @@
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
 		{BT-165-Organization-Company} #{field|name|BT-165-Organization-Company}: ${BT-165-Organization-Company} // Size of the economic operator
 		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -366,14 +379,12 @@
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'ted-esen') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'ted-esen')]} #{auxiliary|text|organisation-esender} // This org is an eSender
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-300-Contract-Signatory) or (OPT-201-Organization-TouchPoint == OPT-300-Contract-Signatory)]} #{auxiliary|text|organisation-signing-contract} // Contract Signatory organisation (SettledContract)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Financing) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Financing)]} #{auxiliary|text|organisation-financing} // Financing Organisation (LotResult)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Paying) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Paying)]} #{auxiliary|text|organisation-paying} // Paying Organisation (LotResult)
@@ -407,6 +418,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/27.efx b/view-templates/27.efx
index 7aa2e3327..705d9557e 100644
--- a/view-templates/27.efx
+++ b/view-templates/27.efx
@@ -40,11 +40,10 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
-					{BT-197(BT-09)-Procedure} #{field|name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
-					{ND-Root[BT-196(BT-09)-Procedure is present]} #{field|name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
-					{BT-198(BT-09)-Procedure} #{field|name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
+				{BT-197(BT-09)-Procedure} #{name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
+				{ND-Root[BT-196(BT-09)-Procedure is present]} #{name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
+				{BT-198(BT-09)-Procedure} #{name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
 4 {ND-Root[BT-137-LotsGroup is present]} #{auxiliary|text|group-of-lots} // 4. Group of lots
 	1 {ND-LotsGroup} #{field|name|BT-330-Procedure}: ${BT-137-LotsGroup} // 4.1 Group of lots
 		{BT-137-LotsGroup} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-137-LotsGroup return BT-1375-Procedure[BT-330-Procedure == $gloid]} // Lots included / Group Lot Identifier 
@@ -190,10 +189,8 @@
 		15 {ND-LotTenderingProcess[(BT-765-Lot is present) or (BT-113-Lot is present) or (BT-109-Lot is present) or (BT-111-Lot is present) or (BT-766-Lot is present) or (BT-119-LotResult == TRUE) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|techniques} // 5.1.15 Techniques
 			0 {ND-LotTenderingProcess[(BT-765-Lot is present) or (BT-113-Lot is present) or (BT-109-Lot is present) or (BT-111-Lot is present)]} #{auxiliary|text|framework-agreement}: // Information about framework agreement
 				{BT-765-Lot} #{BT-765-Lot} // Framework Agreement Type
-				{BT-113-Lot} #{field|name|BT-113-Lot}: ${BT-113-Lot} // Maximum number of participants
-				{BT-137-Lot[BT-109-Lot is present]} #{field|name|BT-109-Lot}: ${BT-109-Lot} // Justification for the duration of framework agreement
 				{BT-137-Lot[BT-111-Lot is present]} #{field|name|BT-111-Lot}: ${BT-111-Lot} // Framework Buyer Categories (Lot)
-			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system} // Dynamic purchasing system 
+			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system}: // Information about the dynamic purchasing system
 				{BT-766-Lot} #{BT-766-Lot} // Dynamic Purchasing System
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
 			{BT-137-Lot[OPT-301-Lot-Mediator is present]} #{auxiliary|text|organisation-mediation}: ${for text:$refid in OPT-301-Lot-Mediator, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Mediation organisation (Lot)
@@ -204,12 +201,12 @@
 			{BT-137-Lot[OPT-301-Lot-AddInfo is present]} #{auxiliary|text|organisation-providing-info-procedure}: ${for text:$refid in OPT-301-Lot-AddInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation providing additional information about the procurement procedure (Lot)
 			{BT-137-Lot[OPT-301-Lot-DocProvider is present]} #{auxiliary|text|organisation-providing-docs}: ${for text:$refid in OPT-301-Lot-DocProvider, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Documents provider organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-financing}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Financing Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-paying}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Paying Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$conid1 in OPT-315-LotResult[BT-13713-LotResult == $lotid1], text:$orgid1 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-signing-contract}: ${distinct-values(for text:$lotid2 in BT-137-Lot, text:$conid2 in OPT-315-LotResult[BT-13713-LotResult == $lotid2], text:$orgid2 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname)} // Contract Signatory (LotResult)
-6 {ND-Root[(BT-13713-LotResult is present)]} #{auxiliary|text|results} // 6. Results
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
+6 {ND-Root[(BT-3201-Tender is present)]} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} ${BT-161-NoticeResult/@currencyID} // Notice Value (Value of all contracts awarded in this procedure)
 	0 {ND-NoticeResult[BT-161-NoticeResult == -1]} #{field|name|BT-161-NoticeResult}: #{auxiliary|text|unpublished} // Notice Value (Value of all contracts awarded in this procedure) (unpublished)
 		{ND-NoticeValueUnpublish} #{field|name|BT-197(BT-161)-NoticeResult}: #{BT-197(BT-161)-NoticeResult} // Unpublished Justification Code
@@ -225,6 +222,18 @@
 		{ND-NoticeApproximateValueUnpublish} #{field|name|BT-197(BT-1118)-NoticeResult}: #{BT-197(BT-1118)-NoticeResult} // Unpublished Justification Code
 		{ND-NoticeApproximateValueUnpublish[BT-196(BT-1118)-NoticeResult is present]} #{field|name|BT-196(BT-1118)-NoticeResult}: ${BT-196(BT-1118)-NoticeResult} // Unpublished Justification Description
 		{ND-NoticeApproximateValueUnpublish[BT-198(BT-1118)-NoticeResult is present]} #{field|name|BT-198(BT-1118)-NoticeResult}: ${BT-198(BT-1118)-NoticeResult} // Unpublished Access Date
+	0 {ND-NoticeResultGroupFA[BT-556-NoticeResult != 'unpublished']} #{auxiliary|text|group-framework-value}: ${BT-556-NoticeResult} // Value of the framework agreements in this group of lots
+		0 {ND-NoticeResultGroupFA} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-556-NoticeResult return BT-1375-Procedure[BT-330-Procedure == $gloid] } // Lots included: LOT-0001, LOT-0003
+		0 {BT-156-NoticeResult[BT-156-NoticeResult != -1]} #{field|name|BT-156-NoticeResult}: ${format-number(BT-156-NoticeResult, '###,##0.##')} ${BT-156-NoticeResult/@currencyID} // Maximum value of the framework agreements in this group of lots
+		0 {BT-156-NoticeResult[BT-156-NoticeResult == -1]} #{field|name|BT-156-NoticeResult}:#{auxiliary|text|unpublished} // Maximum value of the framework agreements in this group of lots (unpublished)
+			{ND-GroupMaximumValueUnpublish} #{field|name|BT-197(BT-156)-NoticeResult}: #{BT-197(BT-156)-NoticeResult} // Unpublished Justification Code
+			{ND-GroupMaximumValueUnpublish[BT-196(BT-156)-NoticeResult is present]} #{field|name|BT-196(BT-156)-NoticeResult}: ${BT-196(BT-156)-NoticeResult} // Unpublished Justification Description
+			{ND-GroupMaximumValueUnpublish[BT-198(BT-156)-NoticeResult is present]} #{field|name|BT-198(BT-156)-NoticeResult}: ${BT-198(BT-156)-NoticeResult} // Unpublished Access Date
+		0 {BT-1561-NoticeResult[BT-1561-NoticeResult != -1]} #{field|name|BT-1561-NoticeResult}: ${format-number(BT-1561-NoticeResult, '###,##0.##')} ${BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID} // Re-estimated value of the framework agreements within a group of lots
+		0 {BT-1561-NoticeResult[BT-1561-NoticeResult == -1]} #{field|name|BT-1561-NoticeResult}: #{auxiliary|text|unpublished} // Re-estimated value of the framework agreements within a group of lots (unpublished)
+			{ND-GroupReestimatedValueUnpublish} #{field|name|BT-197(BT-1561)-NoticeResult}: #{BT-197(BT-1561)-NoticeResult} // Unpublished Justification Code
+			{ND-GroupReestimatedValueUnpublish[BT-196(BT-1561)-NoticeResult is present]} #{field|name|BT-196(BT-1561)-NoticeResult}: ${BT-196(BT-1561)-NoticeResult} // Unpublished Justification Description
+			{ND-GroupReestimatedValueUnpublish[BT-198(BT-1561)-NoticeResult is present]} #{field|name|BT-198(BT-1561)-NoticeResult}: ${BT-198(BT-1561)-NoticeResult} // Unpublished Access Date
 	0 {ND-NoticeResultGroupFA[BT-556-NoticeResult == 'unpublished']} #{auxiliary|text|group-framework-value}: #{auxiliary|text|unpublished} // Value of the framework agreements in this group of lots (unpublished)
 		{ND-GroupMaximalValueIdentifierUnpublish} #{field|name|BT-197(BT-556)-NoticeResult}: #{BT-197(BT-556)-NoticeResult} // Unpublished Justification Code
 		{ND-GroupMaximalValueIdentifierUnpublish[BT-196(BT-556)-NoticeResult is present]} #{field|name|BT-196(BT-556)-NoticeResult}: ${BT-196(BT-556)-NoticeResult} // Unpublished Justification Description
@@ -241,8 +250,8 @@
 			{ND-GroupReestimatedValueUnpublish[BT-196(BT-1561)-NoticeResult is present]} #{field|name|BT-196(BT-1561)-NoticeResult}: ${BT-196(BT-1561)-NoticeResult} // Unpublished Justification Description
 			{ND-GroupReestimatedValueUnpublish[BT-198(BT-1561)-NoticeResult is present]} #{field|name|BT-198(BT-1561)-NoticeResult}: ${BT-198(BT-1561)-NoticeResult} // Unpublished Access Date
 	0 {ND-DirectAward} #{auxiliary|text|direct-award}: // Direct award
-		0 {ND-DirectAward[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
-		0 {ND-DirectAward[BT-136-Procedure == 'unpublished']} #{field|name|BT-136-Procedure}: #{auxiliary|text|unpublished} // Justification for direct award (unpublished)
+		0 {BT-136-Procedure[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
+		0 {BT-136-Procedure[BT-136-Procedure == 'unpublished']} #{field|name|BT-136-Procedure}: #{auxiliary|text|unpublished} // Justification for direct award (unpublished)
 			{ND-DirectAwardJustificationCodeUnpublish} #{field|name|BT-197(BT-136)-Procedure}: #{BT-197(BT-136)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationCodeUnpublish[BT-196(BT-136)-Procedure is present]} #{field|name|BT-196(BT-136)-Procedure}: ${BT-196(BT-136)-Procedure} // Unpublished Justification Description
 			{ND-DirectAwardJustificationCodeUnpublish[BT-198(BT-136)-Procedure is present]} #{field|name|BT-198(BT-136)-Procedure}: ${BT-198(BT-136)-Procedure} // Unpublished Access Date
@@ -251,7 +260,7 @@
 			{ND-DirectAwardJustificationTextUnpublish} #{field|name|BT-197(BT-135)-Procedure}: #{BT-197(BT-135)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationTextUnpublish[BT-196(BT-135)-Procedure is present]} #{field|name|BT-196(BT-135)-Procedure}: ${BT-196(BT-135)-Procedure} // Unpublished Justification Description
 			{ND-DirectAwardJustificationTextUnpublish[BT-198(BT-135)-Procedure is present]} #{field|name|BT-198(BT-135)-Procedure}: ${BT-198(BT-135)-Procedure} // Unpublished Access Date
-		0 {ND-DirectAward[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
+		0 {BT-1252-Procedure[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
 		0 {ND-DirectAward[BT-1252-Procedure == 'unpublished']} #{field|name|BT-1252-Procedure}: #{auxiliary|text|unpublished} // Identifier of the previous procedure that justifies direct award (unpublished)
 			{ND-DirectAwardJustificationPreviousUnpublish} #{field|name|BT-197(BT-1252)-Procedure}: #{BT-197(BT-1252)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationPreviousUnpublish[BT-196(BT-1252)-Procedure is present]} #{field|name|BT-196(BT-1252)-Procedure}: ${BT-196(BT-1252)-Procedure} // Unpublished Justification Description
@@ -270,9 +279,11 @@
 				{ND-ReestimatedValueUnpublish[BT-198(BT-660)-LotResult is present]} #{field|name|BT-198(BT-660)-LotResult}: ${BT-198(BT-660)-LotResult} // Unpublished Access Date
 		2 {ND-LotResult[BT-02-notice == 'veat' or BT-02-notice == 'can-modif' or ((BT-142-LotResult == 'selec-w' or BT-142-LotResult == 'unpublished') and OPT-320-LotResult is present and OPT-315-LotResult is present)]} #{auxiliary|text|winner-info} // 6.1.2. Winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]])>0]} #{auxiliary|text|winner}: // Winner
-				{OPT-320-LotResult} #{field|name|BT-500-Organization-Company}: ${for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa or OPT-170-Tenderer[OPT-210-Tenderer == $tpa] == TRUE]), text:$org in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($org, '
')} // Name of this winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Name of this winner (single organisation in Tendering Party)
 				0 {OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{auxiliary|text|winner-subcontractor}: // Subcontractors of the winner
-					{OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{field|name|BT-500-Business}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid]} // Subcontractor name
+					{OPT-320-LotResult[some text:$orgname1 in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $orgname1 != '']} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]], text:$orgname2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($orgname2, ', ')} // Subcontractor names
 				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]])>0]} #{auxiliary|text|tender}: // Tender
 				{OPT-320-LotResult} #{field|name|BT-3201-Tender}: ${for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender == $tender]} // Tender identifier
 				{OPT-320-LotResult} #{field|name|BT-13714-Tender}: ${for text:$tender in OPT-320-LotResult return BT-13714-Tender[OPT-321-Tender == $tender]} // Identifier of lot or group of lots
@@ -292,8 +303,9 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-773)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-730-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
-					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-730-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-730-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties (unpublished)
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$code2 in BT-197(BT-730)-Tender[OPT-321-Tender == $tender2] return $code2} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $desc != '']} #{field|name|BT-196(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc1 in BT-196(BT-730)-Tender[OPT-321-Tender == $tender2] return $desc1} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-553-Tender[BT-553-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-553-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-553-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} ${for text:$tender3 in OPT-320-LotResult return BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID} // Estimated value of the part of the contract that the contractor will subcontract to third parties
@@ -301,7 +313,8 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-553)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-731-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$spk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $spk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-731-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-731)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
@@ -320,7 +333,7 @@
 					{OPT-320-LotResult[some text:$title1 in (for text:$tender1 in OPT-320-LotResult return BT-721-Contract[BT-3202-Contract == $tender1]) satisfies $title1 != '']} #{field|name|BT-721-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$title2 in BT-721-Contract[BT-3202-Contract == $tender2] return $title2} // Contract title
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-1451-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z ]} #{field|name|BT-1451-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-1451-Contract[BT-3202-Contract == $tender2]} // Winning Decision date
 					0 {OPT-320-LotResult[some text:$contractid in (for text:$tender in OPT-320-LotResult return BT-3202-Contract[BT-3202-Contract[BT-5011-Contract is present or BT-722-Contract is present or BT-6110-Contract is present] == $tender]) satisfies $contractid != '']} #{auxiliary|text|eu-funds-used} // Information about European Union funds used to finance the contract
-						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Name
+						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$name in BT-722-Contract[BT-3202-Contract == $tender2] return $name} // Contract EU Funds Name
 						{OPT-320-LotResult[some text:$eufundid in (for text:$tender1 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender1]) satisfies $eufundid != '']} #{field|name|BT-5011-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Identifier
 						{OPT-320-LotResult[some text:$eufunddesc in (for text:$tender1 in OPT-320-LotResult return BT-6110-Contract[BT-3202-Contract == $tender1]) satisfies $eufunddesc != '']} #{field|name|BT-6110-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$details in BT-6110-Contract[BT-3202-Contract == $tender2] return $details} // Contract EU Funds Details
 					{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-300-Contract-Signatory[BT-3202-Contract == $tender1]) > 0]} #{auxiliary|text|organisation-signing-contract}: ${for text:$tender2 in OPT-320-LotResult, text:$orgid in OPT-300-Contract-Signatory[BT-3202-Contract == $tender2], text:$orgname in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return $orgname} // Organisation signing the contract
@@ -329,10 +342,10 @@
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
 		{BT-165-Organization-Company} #{field|name|BT-165-Organization-Company}: ${BT-165-Organization-Company} // Size of the economic operator
 		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -366,14 +379,12 @@
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'ted-esen') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'ted-esen')]} #{auxiliary|text|organisation-esender} // This org is an eSender
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-300-Contract-Signatory) or (OPT-201-Organization-TouchPoint == OPT-300-Contract-Signatory)]} #{auxiliary|text|organisation-signing-contract} // Contract Signatory organisation (SettledContract)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Financing) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Financing)]} #{auxiliary|text|organisation-financing} // Financing Organisation (LotResult)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Paying) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Paying)]} #{auxiliary|text|organisation-paying} // Paying Organisation (LotResult)
@@ -407,6 +418,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/28.efx b/view-templates/28.efx
index 79cb82fd5..fd2f85819 100644
--- a/view-templates/28.efx
+++ b/view-templates/28.efx
@@ -40,11 +40,10 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
-					{BT-197(BT-09)-Procedure} #{field|name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
-					{ND-Root[BT-196(BT-09)-Procedure is present]} #{field|name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
-					{BT-198(BT-09)-Procedure} #{field|name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
+				{BT-197(BT-09)-Procedure} #{name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
+				{ND-Root[BT-196(BT-09)-Procedure is present]} #{name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
+				{BT-198(BT-09)-Procedure} #{name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
 4 {ND-Root[BT-137-LotsGroup is present]} #{auxiliary|text|group-of-lots} // 4. Group of lots
 	1 {ND-LotsGroup} #{field|name|BT-330-Procedure}: ${BT-137-LotsGroup} // 4.1 Group of lots
 		{BT-137-LotsGroup} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-137-LotsGroup return BT-1375-Procedure[BT-330-Procedure == $gloid]} // Lots included / Group Lot Identifier 
@@ -195,20 +194,19 @@
 			{BT-137-Lot[OPT-301-Lot-AddInfo is present]} #{auxiliary|text|organisation-providing-info-procedure}: ${for text:$refid in OPT-301-Lot-AddInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation providing additional information about the procurement procedure (Lot)
 			{BT-137-Lot[OPT-301-Lot-DocProvider is present]} #{auxiliary|text|organisation-providing-docs}: ${for text:$refid in OPT-301-Lot-DocProvider, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Documents provider organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
-			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-financing}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Financing Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-paying}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Paying Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$conid1 in OPT-315-LotResult[BT-13713-LotResult == $lotid1], text:$orgid1 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-signing-contract}: ${distinct-values(for text:$lotid2 in BT-137-Lot, text:$conid2 in OPT-315-LotResult[BT-13713-LotResult == $lotid2], text:$orgid2 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname)} // Contract Signatory (LotResult)
-6 {ND-Root[(BT-13713-LotResult is present)]} #{auxiliary|text|results} // 6. Results
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
+6 {ND-Root[(BT-3201-Tender is present)]} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} ${BT-161-NoticeResult/@currencyID} // Notice Value (Value of all contracts awarded in this procedure)
 	0 {ND-NoticeResult[BT-161-NoticeResult == -1]} #{field|name|BT-161-NoticeResult}: #{auxiliary|text|unpublished} // Notice Value (Value of all contracts awarded in this procedure) (unpublished)
 		{ND-NoticeValueUnpublish} #{field|name|BT-197(BT-161)-NoticeResult}: #{BT-197(BT-161)-NoticeResult} // Unpublished Justification Code
 		{ND-NoticeValueUnpublish[BT-196(BT-161)-NoticeResult is present]} #{field|name|BT-196(BT-161)-NoticeResult}: ${BT-196(BT-161)-NoticeResult} // Unpublished Justification Description
 		{ND-NoticeValueUnpublish[BT-198(BT-161)-NoticeResult is present]} #{field|name|BT-198(BT-161)-NoticeResult}: ${BT-198(BT-161)-NoticeResult} // Unpublished Access Date
 	0 {ND-DirectAward} #{auxiliary|text|direct-award}: // Direct award
-		0 {ND-DirectAward[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
-		0 {ND-DirectAward[BT-136-Procedure == 'unpublished']} #{field|name|BT-136-Procedure}: #{auxiliary|text|unpublished} // Justification for direct award (unpublished)
+		0 {BT-136-Procedure[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
+		0 {BT-136-Procedure[BT-136-Procedure == 'unpublished']} #{field|name|BT-136-Procedure}: #{auxiliary|text|unpublished} // Justification for direct award (unpublished)
 			{ND-DirectAwardJustificationCodeUnpublish} #{field|name|BT-197(BT-136)-Procedure}: #{BT-197(BT-136)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationCodeUnpublish[BT-196(BT-136)-Procedure is present]} #{field|name|BT-196(BT-136)-Procedure}: ${BT-196(BT-136)-Procedure} // Unpublished Justification Description
 			{ND-DirectAwardJustificationCodeUnpublish[BT-198(BT-136)-Procedure is present]} #{field|name|BT-198(BT-136)-Procedure}: ${BT-198(BT-136)-Procedure} // Unpublished Access Date
@@ -217,17 +215,40 @@
 			{ND-DirectAwardJustificationTextUnpublish} #{field|name|BT-197(BT-135)-Procedure}: #{BT-197(BT-135)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationTextUnpublish[BT-196(BT-135)-Procedure is present]} #{field|name|BT-196(BT-135)-Procedure}: ${BT-196(BT-135)-Procedure} // Unpublished Justification Description
 			{ND-DirectAwardJustificationTextUnpublish[BT-198(BT-135)-Procedure is present]} #{field|name|BT-198(BT-135)-Procedure}: ${BT-198(BT-135)-Procedure} // Unpublished Access Date
-		0 {ND-DirectAward[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
+		0 {BT-1252-Procedure[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
 		0 {ND-DirectAward[BT-1252-Procedure == 'unpublished']} #{field|name|BT-1252-Procedure}: #{auxiliary|text|unpublished} // Identifier of the previous procedure that justifies direct award (unpublished)
 			{ND-DirectAwardJustificationPreviousUnpublish} #{field|name|BT-197(BT-1252)-Procedure}: #{BT-197(BT-1252)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationPreviousUnpublish[BT-196(BT-1252)-Procedure is present]} #{field|name|BT-196(BT-1252)-Procedure}: ${BT-196(BT-1252)-Procedure} // Unpublished Justification Description
 			{ND-DirectAwardJustificationPreviousUnpublish[BT-198(BT-1252)-Procedure is present]} #{field|name|BT-198(BT-1252)-Procedure}: ${BT-198(BT-1252)-Procedure} // Unpublished Access Date
 	1 {ND-LotResult} #{field|name|BT-13713-LotResult}: ${BT-13713-LotResult} // 6.1 Result Lot Identifier (LOT-XXXX)
+		0 {BT-142-LotResult[BT-142-LotResult != 'unpublished']} #{BT-142-LotResult} // A winner was chosen ?
+		0 {BT-142-LotResult[BT-142-LotResult == 'unpublished']} #{field|name|BT-142-LotResult} #{auxiliary|text|unpublished} // A winner was chosen ? (unpublished)
+			{ND-WinnerChosenUnpublish} #{field|name|BT-197(BT-142)-LotResult}: #{BT-197(BT-142)-LotResult} // Unpublished Justification Code
+			{ND-WinnerChosenUnpublish[BT-196(BT-142)-LotResult is present]} #{field|name|BT-196(BT-142)-LotResult}: ${BT-196(BT-142)-LotResult} // Unpublished Justification Description
+			{ND-WinnerChosenUnpublish[BT-198(BT-142)-LotResult is present]} #{field|name|BT-198(BT-142)-LotResult}: ${BT-198(BT-142)-LotResult} // Unpublished Access Date
+		0 {BT-144-LotResult[BT-144-LotResult != 'unpublished']} #{field|name|BT-144-LotResult}: #{BT-144-LotResult} // Not awarded reason
+		0 {BT-144-LotResult[BT-144-LotResult == 'unpublished']} #{field|name|BT-144-LotResult}: #{auxiliary|text|unpublished} // Not awarded reason (unpublished)
+			{BT-197(BT-144)-LotResult} #{field|name|BT-197(BT-144)-LotResult}: #{BT-197(BT-144)-LotResult} // Unpublished Justification Code
+			{BT-144-LotResult[BT-196(BT-144)-LotResult is present]} #{field|name|BT-196(BT-144)-LotResult}: ${BT-196(BT-144)-LotResult} // Unpublished Justification Description
+			{BT-198(BT-144)-LotResult[BT-198(BT-144)-LotResult is present]} #{field|name|BT-198(BT-144)-LotResult}: ${BT-198(BT-144)-LotResult} // Unpublished Access Date
+		0 {ND-LotResultFAValues} #{auxiliary|text|framework-agreement}: // Framework agreement
+			0 {BT-709-LotResult[BT-709-LotResult != -1]} #{field|name|BT-709-LotResult}: ${format-number(BT-709-LotResult, '###,##0.##')} ${BT-709-LotResult/@currencyID} // Framework Maximum Value
+			0 {BT-709-LotResult[BT-709-LotResult == -1]} #{field|name|BT-709-LotResult}: #{auxiliary|text|unpublished} // Framework Maximum Value (unpublished)
+				{ND-MaximalValueUnpublish} #{field|name|BT-197(BT-709)-LotResult}: #{BT-197(BT-709)-LotResult} // Unpublished Justification Code
+				{ND-MaximalValueUnpublish[BT-196(BT-709)-LotResult is present]} #{field|name|BT-196(BT-709)-LotResult}: ${BT-196(BT-709)-LotResult} // Unpublished Justification Description
+				{ND-MaximalValueUnpublish[BT-198(BT-709)-LotResult is present]} #{field|name|BT-198(BT-709)-LotResult}: ${BT-198(BT-709)-LotResult} // Unpublished Access Date
+			0 {BT-660-LotResult[BT-660-LotResult != -1]} #{field|name|BT-660-LotResult}: ${format-number(BT-660-LotResult, '###,##0.##')} ${BT-660-LotResult/@currencyID} // Framework Re-estimated Value
+			0 {BT-660-LotResult[BT-660-LotResult == -1]} #{field|name|BT-660-LotResult}: #{auxiliary|text|unpublished} // Framework Re-estimated Value (unpublished)
+				{ND-ReestimatedValueUnpublish} #{field|name|BT-197(BT-660)-LotResult}: #{BT-197(BT-660)-LotResult} // Unpublished Justification Code
+				{ND-ReestimatedValueUnpublish[BT-196(BT-660)-LotResult is present]} #{field|name|BT-196(BT-660)-LotResult}: ${BT-196(BT-660)-LotResult} // Unpublished Justification Description
+				{ND-ReestimatedValueUnpublish[BT-198(BT-660)-LotResult is present]} #{field|name|BT-198(BT-660)-LotResult}: ${BT-198(BT-660)-LotResult} // Unpublished Access Date
 		2 {ND-LotResult[BT-02-notice == 'veat' or BT-02-notice == 'can-modif' or ((BT-142-LotResult == 'selec-w' or BT-142-LotResult == 'unpublished') and OPT-320-LotResult is present and OPT-315-LotResult is present)]} #{auxiliary|text|winner-info} // 6.1.2. Winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]])>0]} #{auxiliary|text|winner}: // Winner
-				{OPT-320-LotResult} #{field|name|BT-500-Organization-Company}: ${for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa or OPT-170-Tenderer[OPT-210-Tenderer == $tpa] == TRUE]), text:$org in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($org, '
')} // Name of this winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Name of this winner (single organisation in Tendering Party)
 				0 {OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{auxiliary|text|winner-subcontractor}: // Subcontractors of the winner
-					{OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{field|name|BT-500-Business}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid]} // Subcontractor name
+					{OPT-320-LotResult[some text:$orgname1 in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $orgname1 != '']} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]], text:$orgname2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($orgname2, ', ')} // Subcontractor names
 				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]])>0]} #{auxiliary|text|tender}: // Tender
 				{OPT-320-LotResult} #{field|name|BT-3201-Tender}: ${for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender == $tender]} // Tender identifier
 				{OPT-320-LotResult} #{field|name|BT-13714-Tender}: ${for text:$tender in OPT-320-LotResult return BT-13714-Tender[OPT-321-Tender == $tender]} // Identifier of lot or group of lots
@@ -236,6 +257,12 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-720)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-720)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-720)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-720)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-720)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-720)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender in OPT-320-LotResult return BT-198(BT-720)-Tender[OPT-321-Tender == $tender]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-720)-Tender}: ${for text:$tender1 in OPT-320-LotResult return date:BT-198(BT-720)-Tender[OPT-321-Tender == $tender1]} // Unpublished Access Date // {OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-720)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-720)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-720)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
+				0 {OPT-320-LotResult[some indicator:$tranked in (for text:$tender in OPT-320-LotResult return BT-1711-Tender[OPT-321-Tender == $tender]) satisfies $tranked == TRUE]} #{field|name|BT-1711-Tender} // Tender Ranked
+				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-171-Tender[BT-171-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-171-Tender}: ${for text:$tender2 in OPT-320-LotResult return string(BT-171-Tender[OPT-321-Tender == $tender2])} // Tender Rank
+				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-171-Tender[BT-171-Tender[OPT-321-Tender == $tender1] == -1]) > 0]} #{field|name|BT-171-Tender}: #{auxiliary|text|unpublished} // Tender Rank (unpublished)
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-171)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-171)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
+					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-171)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$tenderref in (for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-160-Tender is present or BT-162-Tender is present or BT-163-Tender is present] == $tender1]) satisfies $tenderref != '']} #{auxiliary|text|concession-value} // Concession value (Tender)
 					0 {OPT-320-LotResult[some number:$revenue1 in (for text:$tender1 in OPT-320-LotResult return BT-162-Tender[OPT-321-Tender == $tender1]) satisfies $revenue1 != -1]} #{field|name|BT-162-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$revenue2 in BT-162-Tender[OPT-321-Tender == $tender2] return format-number($revenue2, '###,##0.##')} ${for text:$tender3 in OPT-320-LotResult return BT-162-Tender[OPT-321-Tender == $tender3]/@currencyID} // Concession Revenue User
 					0 {OPT-320-LotResult[some number:$revenue1 in (for text:$tender1 in OPT-320-LotResult return BT-162-Tender[OPT-321-Tender == $tender1]) satisfies $revenue1 == -1]} #{field|name|BT-162-Tender}: #{auxiliary|text|unpublished} // Concession Revenue User (unpublished)
@@ -252,13 +279,24 @@
 						{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-163)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-163)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-163)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 						{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-163)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-163)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-163)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 						{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-163)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-163)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-163)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
+				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender}  // TODO The tender is a variant  0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender}    #{code|name|${if (some indicator:$bool2 in (for text:$tender2 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender2]) satisfies $bool2 == TRUE) then 'indicator.true' else 'indicator.false' }}
+				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1]) satisfies $bool == FALSE) and (some text:$code in (for text:$tender2 in OPT-320-LotResult return BT-195(BT-193)-Tender[OPT-321-Tender == $tender2]) satisfies $code != '')]} #{field|name|BT-193-Tender}: #{auxiliary|text|unpublished} // The tender is a variant (unpublished)
+					0 {OPT-320-LotResult[(some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-193)-Tender[OPT-321-Tender == $tender1] ) satisfies $code != '')]} #{field|name|BT-197(BT-193)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-193)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+					0 {OPT-320-LotResult[(some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-193)-Tender[OPT-321-Tender == $tender1] ) satisfies $desc != '')]} #{field|name|BT-196(BT-193)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-196(BT-193)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Description
+					{OPT-320-LotResult[some date:$date in (for text:$tender in OPT-320-LotResult return BT-198(BT-193)-Tender[OPT-321-Tender == $tender]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-193)-Tender}: ${for text:$tender1 in OPT-320-LotResult return date:BT-198(BT-193)-Tender[OPT-321-Tender == $tender1]} // Unpublished Access Date
+				0 {OPT-320-LotResult[some text:$country in (for text:$tender1 in OPT-320-LotResult return BT-191-Tender[OPT-321-Tender == $tender1]) satisfies ($country != '' and $country != 'unpublished')]} #{field|name|BT-191-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-191-Tender[OPT-321-Tender == $tender2]} // Country Origin
+				0 {OPT-320-LotResult[some text:$country in (for text:$tender1 in OPT-320-LotResult return BT-191-Tender[OPT-321-Tender == $tender1]) satisfies $country == 'unpublished']} #{field|name|BT-191-Tender}:#{auxiliary|text|unpublished} // Country Origin (unpublished)
+					{OPT-320-LotResult[some text:$code in (for text:$tender in OPT-320-LotResult return BT-197(BT-191)-Tender[OPT-321-Tender == $tender]) satisfies $code !='']} #{field|name|BT-197(BT-191)-Tender}: ${for text:$tender1 in OPT-320-LotResult return BT-197(BT-191)-Tender[OPT-321-Tender == $tender1]} // Unpublished Justification Code
+					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-191)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-191)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-196(BT-191)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Description
+					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-191)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-191)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-191)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return BT-773-Tender[BT-773-Tender[OPT-321-Tender == $tender1] != 'unpublished'])>0]} #{field|name|BT-773-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-773-Tender[OPT-321-Tender == $tender2]} // Subcontracting
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return BT-773-Tender[BT-773-Tender[OPT-321-Tender == $tender1] == 'unpublished'])>0]} #{field|name|BT-773-Tender}: #{auxiliary|text|unpublished} // Subcontracting (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-773)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-730-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
-					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-730-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-730-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties (unpublished)
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$code2 in BT-197(BT-730)-Tender[OPT-321-Tender == $tender2] return $code2} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $desc != '']} #{field|name|BT-196(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc1 in BT-196(BT-730)-Tender[OPT-321-Tender == $tender2] return $desc1} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-553-Tender[BT-553-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-553-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-553-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} ${for text:$tender3 in OPT-320-LotResult return BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID} // Estimated value of the part of the contract that the contractor will subcontract to third parties
@@ -266,7 +304,8 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-553)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-731-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$spk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $spk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-731-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-731)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
@@ -284,20 +323,81 @@
 					{OPT-320-LotResult} #{field|name|BT-150-Contract}: ${for text:$tender in OPT-320-LotResult return BT-150-Contract[BT-3202-Contract == $tender]} // Contract identifier
 					{OPT-320-LotResult[some text:$title1 in (for text:$tender1 in OPT-320-LotResult return BT-721-Contract[BT-3202-Contract == $tender1]) satisfies $title1 != '']} #{field|name|BT-721-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$title2 in BT-721-Contract[BT-3202-Contract == $tender2] return $title2} // Contract title
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-1451-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z ]} #{field|name|BT-1451-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-1451-Contract[BT-3202-Contract == $tender2]} // Winning Decision date
+					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-145-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-145-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-145-Contract[BT-3202-Contract == $tender2]} // Contract Conclusion Date
+					{OPT-320-LotResult} #{field|name|BT-768-Contract}: #{code|name|${if (some indicator:$fa in (for text:$tender1 in OPT-320-LotResult return indicator:BT-768-Contract[BT-3202-Contract == $tender1]) satisfies $fa == TRUE) then 'indicator.true' else 'indicator.false'}} // Contract Framework Agreement indicator.true
+					{OPT-320-LotResult[some text:$url in (for text:$tender1 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender1]) satisfies $url != '']} #{field|name|BT-151-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender2]} // Contract URL
 					0 {OPT-320-LotResult[some text:$contractid in (for text:$tender in OPT-320-LotResult return BT-3202-Contract[BT-3202-Contract[BT-5011-Contract is present or BT-722-Contract is present or BT-6110-Contract is present] == $tender]) satisfies $contractid != '']} #{auxiliary|text|eu-funds-used} // Information about European Union funds used to finance the contract
-						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Name
+						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$name in BT-722-Contract[BT-3202-Contract == $tender2] return $name} // Contract EU Funds Name
 						{OPT-320-LotResult[some text:$eufundid in (for text:$tender1 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender1]) satisfies $eufundid != '']} #{field|name|BT-5011-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Identifier
 						{OPT-320-LotResult[some text:$eufunddesc in (for text:$tender1 in OPT-320-LotResult return BT-6110-Contract[BT-3202-Contract == $tender1]) satisfies $eufunddesc != '']} #{field|name|BT-6110-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$details in BT-6110-Contract[BT-3202-Contract == $tender2] return $details} // Contract EU Funds Details
 					{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-300-Contract-Signatory[BT-3202-Contract == $tender1]) > 0]} #{auxiliary|text|organisation-signing-contract}: ${for text:$tender2 in OPT-320-LotResult, text:$orgid in OPT-300-Contract-Signatory[BT-3202-Contract == $tender2], text:$orgname in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return $orgname} // Organisation signing the contract
+		3 {ND-LotResult[count(for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender[count(OPT-316-Contract[BT-3202-Contract == $tender]) == 0] == $tender])>0]} #{auxiliary|text|non-winning-tender}: // 6.1.3. Non-winning tenders
+			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender[count(OPT-316-Contract[BT-3202-Contract == $tender]) == 0] == $tender])>0]} #{auxiliary|text|organisation-tenderer}: // Non-winning tender
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of this non-winning tenderer (single organisation in Tendering Party)
+		4 {ND-LotResult[(BT-712(a)-LotResult is present) or (BT-636-LotResult is present) or (BT-760-LotResult is present) or (BT-710-LotResult is present) or (BT-710-LotResult is present) or (BT-735-LotResult is present)]} #{auxiliary|text|statistical-information} // 6.1.4. Statistical information
+			0 {ND-BuyerReviewComplainants} #{auxiliary|text|review-requests-summary}: // Summary of the review requests the buyer received
+				0 {BT-712(b)-LotResult[BT-712(b)-LotResult != -1]} #{field|name|BT-712(b)-LotResult}: ${BT-712(b)-LotResult} // Buyer Review Complainants
+				0 {BT-712(b)-LotResult[BT-712(b)-LotResult == -1]} #{field|name|BT-712(b)-LotResult}: #{auxiliary|text|unpublished} // Buyer Review Complainants (unpublished)
+					{BT-197(BT-712)-LotResult} #{field|name|BT-197(BT-712)-LotResult}: #{BT-197(BT-712)-LotResult} // Unpublished Justification Code
+					{BT-712(a)-LotResult[BT-196(BT-712)-LotResult is present]} #{field|name|BT-196(BT-712)-LotResult}: ${BT-196(BT-712)-LotResult} // Unpublished Justification Description
+					{BT-198(BT-712)-LotResult} #{field|name|BT-198(BT-712)-LotResult}: ${BT-198(BT-712)-LotResult} // Unpublished Access Date
+			0 {ND-ReviewRequestsStatistics[BT-636-LotResult != 'unpublished']} #{auxiliary|text|review-requests-irregularity-type}: #{BT-636-LotResult} // Type of alleged irregularity
+				0 {BT-635-LotResult[BT-635-LotResult != -1]} #{field|name|BT-635-LotResult}: ${BT-635-LotResult} // Buyer Review Requests Count
+				0 {BT-635-LotResult[BT-635-LotResult == -1]} #{field|name|BT-635-LotResult}: #{auxiliary|text|unpublished} // Buyer Review Requests Count (unpublished)
+					{BT-197(BT-635)-LotResult} #{field|name|BT-197(BT-635)-LotResult}: #{BT-197(BT-635)-LotResult} // Unpublished Justification Code
+					{BT-635-LotResult[BT-196(BT-635)-LotResult is present]} #{field|name|BT-196(BT-635)-LotResult}: ${BT-196(BT-635)-LotResult} // Unpublished Justification Description
+					{BT-198(BT-635)-LotResult} #{field|name|BT-198(BT-635)-LotResult}: ${BT-198(BT-635)-LotResult} // Unpublished Access Date
+			0 {ND-ReviewRequestsStatistics[BT-636-LotResult == 'unpublished']} #{auxiliary|text|review-requests-irregularity-type}: #{auxiliary|text|unpublished} // Type of alleged irregularity (unpublished)
+				{BT-197(BT-636)-LotResult} #{field|name|BT-197(BT-636)-LotResult}: #{BT-197(BT-636)-LotResult} // Unpublished Justification Code
+				{BT-636-LotResult[BT-196(BT-636)-LotResult is present]} #{field|name|BT-196(BT-636)-LotResult}: ${BT-196(BT-636)-LotResult} // Unpublished Justification Description
+				{BT-198(BT-636)-LotResult} #{field|name|BT-198(BT-636)-LotResult}: ${BT-198(BT-636)-LotResult} // Unpublished Access Date
+				0 {ND-ReviewRequestsStatistics[BT-635-LotResult != -1]} #{field|name|BT-635-LotResult}: ${BT-635-LotResult} // Buyer Review Requests Count
+				0 {ND-ReviewRequestsStatistics[BT-635-LotResult == -1]} #{field|name|BT-635-LotResult}: #{auxiliary|text|unpublished} // Buyer Review Requests Count
+					{BT-197(BT-635)-LotResult} #{field|name|BT-197(BT-635)-LotResult}: #{BT-197(BT-635)-LotResult} // Unpublished Justification Code
+					{BT-635-LotResult[BT-196(BT-635)-LotResult is present]} #{field|name|BT-196(BT-635)-LotResult}: ${BT-196(BT-635)-LotResult} // Unpublished Justification Description
+					{BT-198(BT-635)-LotResult} #{field|name|BT-198(BT-635)-LotResult}: ${BT-198(BT-635)-LotResult} // Unpublished Access Date
+			0 {OPT-322-LotResult[BT-760-LotResult is present]} #{auxiliary|text|received-submissions}: // Received tenders or requests to participate
+				0 {ND-ReceivedSubmissions[BT-760-LotResult != 'unpublished']} #{field|name|BT-760-LotResult}: #{BT-760-LotResult} // Received Submissions Type
+					0 {BT-759-LotResult[BT-759-LotResult != -1]} #{field|name|BT-759-LotResult}: ${BT-759-LotResult} // Received Submissions Count
+					0 {BT-759-LotResult[BT-759-LotResult == -1]} #{field|name|BT-759-LotResult}: #{auxiliary|text|unpublished} // Received Submissions Count (unpublished)
+						{BT-197(BT-759)-LotResult} #{field|name|BT-197(BT-759)-LotResult}: #{BT-197(BT-759)-LotResult} // Unpublished Justification Code
+						{BT-759-LotResult[BT-196(BT-759)-LotResult is present]} #{field|name|BT-196(BT-759)-LotResult}: ${BT-196(BT-759)-LotResult} // Unpublished Justification Description
+						{BT-198(BT-759)-LotResult} #{field|name|BT-198(BT-759)-LotResult}: ${BT-198(BT-759)-LotResult} // Unpublished Access Date
+				0 {ND-ReceivedSubmissions[BT-760-LotResult == 'unpublished']} #{field|name|BT-760-LotResult}: #{auxiliary|text|unpublished} // Received Submissions Type (unpublished)
+					{BT-197(BT-760)-LotResult} #{field|name|BT-197(BT-760)-LotResult}: #{BT-197(BT-760)-LotResult} // Unpublished Justification Code
+					{BT-760-LotResult[BT-196(BT-760)-LotResult is present]} #{field|name|BT-196(BT-760)-LotResult}: ${BT-196(BT-760)-LotResult} // Unpublished Justification Description
+					{BT-198(BT-760)-LotResult} #{field|name|BT-198(BT-760)-LotResult}: ${BT-198(BT-760)-LotResult} // Unpublished Access Date
+					0 {BT-759-LotResult[BT-759-LotResult != -1]} #{field|name|BT-759-LotResult}: ${BT-759-LotResult} // Received Submissions Count
+					0 {BT-759-LotResult[BT-759-LotResult == -1]} #{field|name|BT-759-LotResult}: #{auxiliary|text|unpublished} // Received Submissions Count
+						{BT-197(BT-759)-LotResult} #{field|name|BT-197(BT-759)-LotResult}: #{BT-197(BT-759)-LotResult} // Unpublished Justification Code
+						{BT-759-LotResult[BT-196(BT-759)-LotResult is present]} #{field|name|BT-196(BT-759)-LotResult}: ${BT-196(BT-759)-LotResult} // Unpublished Justification Description
+						{BT-198(BT-759)-LotResult} #{field|name|BT-198(BT-759)-LotResult}: ${BT-198(BT-759)-LotResult} // Unpublished Access Date
+			0 {OPT-322-LotResult[(BT-710-LotResult is present) or (BT-710-LotResult is present)]} #{auxiliary|text|range-tenders}: // Range of tenders
+				0 {BT-710-LotResult[BT-710-LotResult != -1]} #{field|name|BT-710-LotResult}: ${format-number(BT-710-LotResult, '###,##0.##')} ${BT-710-LotResult[BT-710-LotResult/@currencyID != 'unpublished']/@currencyID} // Tender Value Lowest
+				0 {BT-710-LotResult[BT-710-LotResult == -1]} #{field|name|BT-710-LotResult}: #{auxiliary|text|unpublished} // Tender Value Lowest (unpublished)
+					{BT-197(BT-710)-LotResult} #{field|name|BT-197(BT-710)-LotResult}: #{BT-197(BT-710)-LotResult} // Unpublished Justification Code
+					{BT-710-LotResult[BT-196(BT-710)-LotResult is present]} #{field|name|BT-196(BT-710)-LotResult}: ${BT-196(BT-710)-LotResult} // Unpublished Justification Description
+					{BT-198(BT-710)-LotResult} #{field|name|BT-198(BT-710)-LotResult}: ${BT-198(BT-710)-LotResult} // Unpublished Access Date
+				0 {BT-711-LotResult[BT-711-LotResult != -1]} #{field|name|BT-711-LotResult}: ${format-number(BT-711-LotResult, '###,##0.##')} ${BT-711-LotResult[BT-711-LotResult/@currencyID != 'unpublished']/@currencyID} // Tender Value highest
+				0 {BT-711-LotResult[BT-711-LotResult == -1]} #{field|name|BT-711-LotResult}: #{auxiliary|text|unpublished} // Tender Value highest (unpublished)
+					{BT-197(BT-711)-LotResult} #{field|name|BT-197(BT-711)-LotResult}: #{BT-197(BT-711)-LotResult} // Unpublished Justification Code
+					{BT-711-LotResult[BT-196(BT-711)-LotResult is present]} #{field|name|BT-196(BT-711)-LotResult}: ${BT-196(BT-711)-LotResult} // Unpublished Justification Description
+					{BT-198(BT-711)-LotResult} #{field|name|BT-198(BT-711)-LotResult}: ${BT-198(BT-711)-LotResult} // Unpublished Access Date
+			0 {ND-StrategicProcurementLotResult} #{auxiliary|text|statistics-strategic}: // Statistics about strategic procurement
+				0 {BT-735-LotResult} #{field|name|BT-735-LotResult}: #value // The type of contract of the procurement procedure within the scope of Clean Vehicles Directive 2009/33/EC.
+					0 {BT-723-LotResult} #{field|name|BT-723-LotResult}: #value // The category of vehicle falling within the scope of Directive 2009/33/EC.
+						{OPT-155-LotResult} #{OPT-155-LotResult}: ${format-number(OPT-156-LotResult, '###,##0')} // Vehicle category and number
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
 		{BT-165-Organization-Company} #{field|name|BT-165-Organization-Company}: ${BT-165-Organization-Company} // Size of the economic operator
 		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -325,20 +425,16 @@
 		0 {ND-Organization} #{auxiliary|text|roles}: // Roles of this organisation
 			0 {ND-Organization[count(for text:$orgid in OPT-200-Organization-Company return OPT-300-Procedure-Buyer[OPT-300-Procedure-Buyer == $orgid])>0]} #{auxiliary|text|buyer} // This org is a Buyer
 				{OPP-050-Organization[OPP-050-Organization == TRUE]} #{field|name|OPP-050-Organization} // Leader of the group
-				{OPP-052-Organization[OPP-052-Organization == TRUE]} #{field|name|OPP-052-Organization} // CPB Acquiring
-				{OPP-051-Organization[OPP-051-Organization == TRUE]} #{field|name|OPP-051-Organization} // CPB Awarding
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'serv-prov') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'serv-prov')]} #{auxiliary|text|organisation-providing-procurement-service} // This org is a Service Provider
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'ted-esen') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'ted-esen')]} #{auxiliary|text|organisation-esender} // This org is an eSender
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-300-Contract-Signatory) or (OPT-201-Organization-TouchPoint == OPT-300-Contract-Signatory)]} #{auxiliary|text|organisation-signing-contract} // Contract Signatory organisation (SettledContract)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Financing) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Financing)]} #{auxiliary|text|organisation-financing} // Financing Organisation (LotResult)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Paying) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Paying)]} #{auxiliary|text|organisation-paying} // Paying Organisation (LotResult)
@@ -372,6 +468,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/29.efx b/view-templates/29.efx
index 9ff2c7fb1..ef31ac8db 100644
--- a/view-templates/29.efx
+++ b/view-templates/29.efx
@@ -17,7 +17,7 @@
 			{BT-197(BT-105)-Procedure} #{field|name|BT-197(BT-105)-Procedure}: #{BT-197(BT-105)-Procedure} // Unpublished Justification Code
 			{BT-105-Procedure[BT-196(BT-105)-Procedure is present]} #{field|name|BT-196(BT-105)-Procedure}: ${BT-196(BT-105)-Procedure} // Unpublished Justification Description
 			{BT-105-Procedure[BT-198(BT-105)-Procedure is present]} #{field|name|BT-198(BT-105)-Procedure}: ${BT-198(BT-105)-Procedure} // Unpublished Access Date
-		0 {BT-106-Procedure[BT-106-Procedure != 'unpublished']} #{field|name|BT-106-Procedure}: ${if (BT-106-Procedure == 'true') then 'Yes' else 'No'} // The procedure is accelerated. (true/false)
+		0 {BT-106-Procedure[BT-106-Procedure != 'unpublished']} #{field|name|BT-106-Procedure}: #{code|name|${concat('indicator.',BT-106-Procedure)}} // The procedure is accelerated. (true/false)
 		0 {BT-106-Procedure[BT-106-Procedure == 'unpublished']} #{field|name|BT-106-Procedure}: #{auxiliary|text|unpublished} // The procedure is accelerated. (unpublished)
 			{BT-197(BT-106)-Procedure} #{field|name|BT-197(BT-106)-Procedure}: #{BT-197(BT-106)-Procedure} // Unpublished Justification Code
 			{BT-106-Procedure[BT-196(BT-106)-Procedure is present]} #{field|name|BT-196(BT-106)-Procedure}: ${BT-196(BT-106)-Procedure} // Unpublished Justification Description
@@ -58,11 +58,10 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
-					{BT-197(BT-09)-Procedure} #{field|name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
-					{ND-Root[BT-196(BT-09)-Procedure is present]} #{field|name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
-					{BT-198(BT-09)-Procedure} #{field|name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
+				{BT-197(BT-09)-Procedure} #{name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
+				{ND-Root[BT-196(BT-09)-Procedure is present]} #{name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
+				{BT-198(BT-09)-Procedure} #{name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
 4 {ND-Root[BT-137-LotsGroup is present]} #{auxiliary|text|group-of-lots} // 4. Group of lots
 	1 {ND-LotsGroup} #{field|name|BT-330-Procedure}: ${BT-137-LotsGroup} // 4.1 Group of lots
 		{BT-137-LotsGroup} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-137-LotsGroup return BT-1375-Procedure[BT-330-Procedure == $gloid]} // Lots included / Group Lot Identifier 
@@ -217,13 +216,10 @@
 		15 {ND-LotTenderingProcess[(BT-765-Lot is present) or (BT-113-Lot is present) or (BT-109-Lot is present) or (BT-111-Lot is present) or (BT-766-Lot is present) or (BT-119-LotResult == TRUE) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|techniques} // 5.1.15 Techniques
 			0 {ND-LotTenderingProcess[(BT-765-Lot is present) or (BT-113-Lot is present) or (BT-109-Lot is present) or (BT-111-Lot is present)]} #{auxiliary|text|framework-agreement}: // Information about framework agreement
 				{BT-765-Lot} #{BT-765-Lot} // Framework Agreement Type
-				{BT-113-Lot} #{field|name|BT-113-Lot}: ${BT-113-Lot} // Maximum number of participants
-				{BT-137-Lot[BT-109-Lot is present]} #{field|name|BT-109-Lot}: ${BT-109-Lot} // Justification for the duration of framework agreement
 				{BT-137-Lot[BT-111-Lot is present]} #{field|name|BT-111-Lot}: ${BT-111-Lot} // Framework Buyer Categories (Lot)
-			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system} // Dynamic purchasing system 
+			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system}: // Information about the dynamic purchasing system
 				{BT-766-Lot} #{BT-766-Lot} // Dynamic Purchasing System
 				{BT-137-Lot[some indicator:$dpst in (for text:$lotid in BT-137-Lot return BT-119-LotResult[BT-13713-LotResult == $lotid]) satisfies $dpst == TRUE]} #{field|name|BT-119-LotResult} // The dynamic purchasing system is terminated. (true/false)
-			0 {ND-AuctionTerms[(BT-767-Lot is present) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|electronic-auction}: // Electronic auction #{code|name|indicator.true}
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
 			{BT-137-Lot[OPT-301-Lot-Mediator is present]} #{auxiliary|text|organisation-mediation}: ${for text:$refid in OPT-301-Lot-Mediator, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Mediation organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewOrg is present]} #{auxiliary|text|organisation-review}: ${for text:$refid in OPT-301-Lot-ReviewOrg, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Review organisation (Lot)
@@ -233,12 +229,12 @@
 			{BT-137-Lot[OPT-301-Lot-AddInfo is present]} #{auxiliary|text|organisation-providing-info-procedure}: ${for text:$refid in OPT-301-Lot-AddInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation providing additional information about the procurement procedure (Lot)
 			{BT-137-Lot[OPT-301-Lot-DocProvider is present]} #{auxiliary|text|organisation-providing-docs}: ${for text:$refid in OPT-301-Lot-DocProvider, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Documents provider organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-financing}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Financing Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-paying}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Paying Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$conid1 in OPT-315-LotResult[BT-13713-LotResult == $lotid1], text:$orgid1 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-signing-contract}: ${distinct-values(for text:$lotid2 in BT-137-Lot, text:$conid2 in OPT-315-LotResult[BT-13713-LotResult == $lotid2], text:$orgid2 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname)} // Contract Signatory (LotResult)
-6 {ND-Root[(BT-13713-LotResult is present)]} #{auxiliary|text|results} // 6. Results
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
+6 {ND-Root[(BT-3201-Tender is present)]} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} ${BT-161-NoticeResult/@currencyID} // Notice Value (Value of all contracts awarded in this procedure)
 	0 {ND-NoticeResult[BT-161-NoticeResult == -1]} #{field|name|BT-161-NoticeResult}: #{auxiliary|text|unpublished} // Notice Value (Value of all contracts awarded in this procedure) (unpublished)
 		{ND-NoticeValueUnpublish} #{field|name|BT-197(BT-161)-NoticeResult}: #{BT-197(BT-161)-NoticeResult} // Unpublished Justification Code
@@ -254,6 +250,18 @@
 		{ND-NoticeApproximateValueUnpublish} #{field|name|BT-197(BT-1118)-NoticeResult}: #{BT-197(BT-1118)-NoticeResult} // Unpublished Justification Code
 		{ND-NoticeApproximateValueUnpublish[BT-196(BT-1118)-NoticeResult is present]} #{field|name|BT-196(BT-1118)-NoticeResult}: ${BT-196(BT-1118)-NoticeResult} // Unpublished Justification Description
 		{ND-NoticeApproximateValueUnpublish[BT-198(BT-1118)-NoticeResult is present]} #{field|name|BT-198(BT-1118)-NoticeResult}: ${BT-198(BT-1118)-NoticeResult} // Unpublished Access Date
+	0 {ND-NoticeResultGroupFA[BT-556-NoticeResult != 'unpublished']} #{auxiliary|text|group-framework-value}: ${BT-556-NoticeResult} // Value of the framework agreements in this group of lots
+		0 {ND-NoticeResultGroupFA} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-556-NoticeResult return BT-1375-Procedure[BT-330-Procedure == $gloid] } // Lots included: LOT-0001, LOT-0003
+		0 {BT-156-NoticeResult[BT-156-NoticeResult != -1]} #{field|name|BT-156-NoticeResult}: ${format-number(BT-156-NoticeResult, '###,##0.##')} ${BT-156-NoticeResult/@currencyID} // Maximum value of the framework agreements in this group of lots
+		0 {BT-156-NoticeResult[BT-156-NoticeResult == -1]} #{field|name|BT-156-NoticeResult}:#{auxiliary|text|unpublished} // Maximum value of the framework agreements in this group of lots (unpublished)
+			{ND-GroupMaximumValueUnpublish} #{field|name|BT-197(BT-156)-NoticeResult}: #{BT-197(BT-156)-NoticeResult} // Unpublished Justification Code
+			{ND-GroupMaximumValueUnpublish[BT-196(BT-156)-NoticeResult is present]} #{field|name|BT-196(BT-156)-NoticeResult}: ${BT-196(BT-156)-NoticeResult} // Unpublished Justification Description
+			{ND-GroupMaximumValueUnpublish[BT-198(BT-156)-NoticeResult is present]} #{field|name|BT-198(BT-156)-NoticeResult}: ${BT-198(BT-156)-NoticeResult} // Unpublished Access Date
+		0 {BT-1561-NoticeResult[BT-1561-NoticeResult != -1]} #{field|name|BT-1561-NoticeResult}: ${format-number(BT-1561-NoticeResult, '###,##0.##')} ${BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID} // Re-estimated value of the framework agreements within a group of lots
+		0 {BT-1561-NoticeResult[BT-1561-NoticeResult == -1]} #{field|name|BT-1561-NoticeResult}: #{auxiliary|text|unpublished} // Re-estimated value of the framework agreements within a group of lots (unpublished)
+			{ND-GroupReestimatedValueUnpublish} #{field|name|BT-197(BT-1561)-NoticeResult}: #{BT-197(BT-1561)-NoticeResult} // Unpublished Justification Code
+			{ND-GroupReestimatedValueUnpublish[BT-196(BT-1561)-NoticeResult is present]} #{field|name|BT-196(BT-1561)-NoticeResult}: ${BT-196(BT-1561)-NoticeResult} // Unpublished Justification Description
+			{ND-GroupReestimatedValueUnpublish[BT-198(BT-1561)-NoticeResult is present]} #{field|name|BT-198(BT-1561)-NoticeResult}: ${BT-198(BT-1561)-NoticeResult} // Unpublished Access Date
 	0 {ND-NoticeResultGroupFA[BT-556-NoticeResult == 'unpublished']} #{auxiliary|text|group-framework-value}: #{auxiliary|text|unpublished} // Value of the framework agreements in this group of lots (unpublished)
 		{ND-GroupMaximalValueIdentifierUnpublish} #{field|name|BT-197(BT-556)-NoticeResult}: #{BT-197(BT-556)-NoticeResult} // Unpublished Justification Code
 		{ND-GroupMaximalValueIdentifierUnpublish[BT-196(BT-556)-NoticeResult is present]} #{field|name|BT-196(BT-556)-NoticeResult}: ${BT-196(BT-556)-NoticeResult} // Unpublished Justification Description
@@ -270,8 +278,8 @@
 			{ND-GroupReestimatedValueUnpublish[BT-196(BT-1561)-NoticeResult is present]} #{field|name|BT-196(BT-1561)-NoticeResult}: ${BT-196(BT-1561)-NoticeResult} // Unpublished Justification Description
 			{ND-GroupReestimatedValueUnpublish[BT-198(BT-1561)-NoticeResult is present]} #{field|name|BT-198(BT-1561)-NoticeResult}: ${BT-198(BT-1561)-NoticeResult} // Unpublished Access Date
 	0 {ND-DirectAward} #{auxiliary|text|direct-award}: // Direct award
-		0 {ND-DirectAward[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
-		0 {ND-DirectAward[BT-136-Procedure == 'unpublished']} #{field|name|BT-136-Procedure}: #{auxiliary|text|unpublished} // Justification for direct award (unpublished)
+		0 {BT-136-Procedure[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
+		0 {BT-136-Procedure[BT-136-Procedure == 'unpublished']} #{field|name|BT-136-Procedure}: #{auxiliary|text|unpublished} // Justification for direct award (unpublished)
 			{ND-DirectAwardJustificationCodeUnpublish} #{field|name|BT-197(BT-136)-Procedure}: #{BT-197(BT-136)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationCodeUnpublish[BT-196(BT-136)-Procedure is present]} #{field|name|BT-196(BT-136)-Procedure}: ${BT-196(BT-136)-Procedure} // Unpublished Justification Description
 			{ND-DirectAwardJustificationCodeUnpublish[BT-198(BT-136)-Procedure is present]} #{field|name|BT-198(BT-136)-Procedure}: ${BT-198(BT-136)-Procedure} // Unpublished Access Date
@@ -280,7 +288,7 @@
 			{ND-DirectAwardJustificationTextUnpublish} #{field|name|BT-197(BT-135)-Procedure}: #{BT-197(BT-135)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationTextUnpublish[BT-196(BT-135)-Procedure is present]} #{field|name|BT-196(BT-135)-Procedure}: ${BT-196(BT-135)-Procedure} // Unpublished Justification Description
 			{ND-DirectAwardJustificationTextUnpublish[BT-198(BT-135)-Procedure is present]} #{field|name|BT-198(BT-135)-Procedure}: ${BT-198(BT-135)-Procedure} // Unpublished Access Date
-		0 {ND-DirectAward[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
+		0 {BT-1252-Procedure[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
 		0 {ND-DirectAward[BT-1252-Procedure == 'unpublished']} #{field|name|BT-1252-Procedure}: #{auxiliary|text|unpublished} // Identifier of the previous procedure that justifies direct award (unpublished)
 			{ND-DirectAwardJustificationPreviousUnpublish} #{field|name|BT-197(BT-1252)-Procedure}: #{BT-197(BT-1252)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationPreviousUnpublish[BT-196(BT-1252)-Procedure is present]} #{field|name|BT-196(BT-1252)-Procedure}: ${BT-196(BT-1252)-Procedure} // Unpublished Justification Description
@@ -309,9 +317,11 @@
 				{ND-ReestimatedValueUnpublish[BT-198(BT-660)-LotResult is present]} #{field|name|BT-198(BT-660)-LotResult}: ${BT-198(BT-660)-LotResult} // Unpublished Access Date
 		2 {ND-LotResult[BT-02-notice == 'veat' or BT-02-notice == 'can-modif' or ((BT-142-LotResult == 'selec-w' or BT-142-LotResult == 'unpublished') and OPT-320-LotResult is present and OPT-315-LotResult is present)]} #{auxiliary|text|winner-info} // 6.1.2. Winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]])>0]} #{auxiliary|text|winner}: // Winner
-				{OPT-320-LotResult} #{field|name|BT-500-Organization-Company}: ${for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa or OPT-170-Tenderer[OPT-210-Tenderer == $tpa] == TRUE]), text:$org in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($org, '
')} // Name of this winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Name of this winner (single organisation in Tendering Party)
 				0 {OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{auxiliary|text|winner-subcontractor}: // Subcontractors of the winner
-					{OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{field|name|BT-500-Business}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid]} // Subcontractor name
+					{OPT-320-LotResult[some text:$orgname1 in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $orgname1 != '']} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]], text:$orgname2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($orgname2, ', ')} // Subcontractor names
 				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]])>0]} #{auxiliary|text|tender}: // Tender
 				{OPT-320-LotResult} #{field|name|BT-3201-Tender}: ${for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender == $tender]} // Tender identifier
 				{OPT-320-LotResult} #{field|name|BT-13714-Tender}: ${for text:$tender in OPT-320-LotResult return BT-13714-Tender[OPT-321-Tender == $tender]} // Identifier of lot or group of lots
@@ -326,7 +336,7 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-171)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-171)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-171)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender} // The tender is a variant
+				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender}  // TODO The tender is a variant  0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender}    #{code|name|${if (some indicator:$bool2 in (for text:$tender2 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender2]) satisfies $bool2 == TRUE) then 'indicator.true' else 'indicator.false' }}
 				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1]) satisfies $bool == FALSE) and (some text:$code in (for text:$tender2 in OPT-320-LotResult return BT-195(BT-193)-Tender[OPT-321-Tender == $tender2]) satisfies $code != '')]} #{field|name|BT-193-Tender}: #{auxiliary|text|unpublished} // The tender is a variant (unpublished)
 					0 {OPT-320-LotResult[(some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-193)-Tender[OPT-321-Tender == $tender1] ) satisfies $code != '')]} #{field|name|BT-197(BT-193)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-193)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					0 {OPT-320-LotResult[(some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-193)-Tender[OPT-321-Tender == $tender1] ) satisfies $desc != '')]} #{field|name|BT-196(BT-193)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-196(BT-193)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Description
@@ -336,8 +346,9 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-773)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-730-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
-					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-730-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-730-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties (unpublished)
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$code2 in BT-197(BT-730)-Tender[OPT-321-Tender == $tender2] return $code2} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $desc != '']} #{field|name|BT-196(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc1 in BT-196(BT-730)-Tender[OPT-321-Tender == $tender2] return $desc1} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-553-Tender[BT-553-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-553-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-553-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} ${for text:$tender3 in OPT-320-LotResult return BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID} // Estimated value of the part of the contract that the contractor will subcontract to third parties
@@ -345,7 +356,8 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-553)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-731-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$spk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $spk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-731-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-731)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
@@ -364,16 +376,18 @@
 					{OPT-320-LotResult[some text:$title1 in (for text:$tender1 in OPT-320-LotResult return BT-721-Contract[BT-3202-Contract == $tender1]) satisfies $title1 != '']} #{field|name|BT-721-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$title2 in BT-721-Contract[BT-3202-Contract == $tender2] return $title2} // Contract title
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-1451-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z ]} #{field|name|BT-1451-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-1451-Contract[BT-3202-Contract == $tender2]} // Winning Decision date
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-145-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-145-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-145-Contract[BT-3202-Contract == $tender2]} // Contract Conclusion Date
-					{OPT-320-LotResult} #{field|name|BT-768-Contract}: ${some indicator:$fa in (for text:$tender1 in OPT-320-LotResult return indicator:BT-768-Contract[BT-3202-Contract == $tender1]) satisfies $fa == TRUE } // Contract Framework Agreement
+					{OPT-320-LotResult} #{field|name|BT-768-Contract}: #{code|name|${if (some indicator:$fa in (for text:$tender1 in OPT-320-LotResult return indicator:BT-768-Contract[BT-3202-Contract == $tender1]) satisfies $fa == TRUE) then 'indicator.true' else 'indicator.false'}} // Contract Framework Agreement indicator.true
 					{OPT-320-LotResult[some text:$url in (for text:$tender1 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender1]) satisfies $url != '']} #{field|name|BT-151-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender2]} // Contract URL
 					0 {OPT-320-LotResult[some text:$contractid in (for text:$tender in OPT-320-LotResult return BT-3202-Contract[BT-3202-Contract[BT-5011-Contract is present or BT-722-Contract is present or BT-6110-Contract is present] == $tender]) satisfies $contractid != '']} #{auxiliary|text|eu-funds-used} // Information about European Union funds used to finance the contract
-						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Name
+						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$name in BT-722-Contract[BT-3202-Contract == $tender2] return $name} // Contract EU Funds Name
 						{OPT-320-LotResult[some text:$eufundid in (for text:$tender1 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender1]) satisfies $eufundid != '']} #{field|name|BT-5011-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Identifier
 						{OPT-320-LotResult[some text:$eufunddesc in (for text:$tender1 in OPT-320-LotResult return BT-6110-Contract[BT-3202-Contract == $tender1]) satisfies $eufunddesc != '']} #{field|name|BT-6110-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$details in BT-6110-Contract[BT-3202-Contract == $tender2] return $details} // Contract EU Funds Details
 					{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-300-Contract-Signatory[BT-3202-Contract == $tender1]) > 0]} #{auxiliary|text|organisation-signing-contract}: ${for text:$tender2 in OPT-320-LotResult, text:$orgid in OPT-300-Contract-Signatory[BT-3202-Contract == $tender2], text:$orgname in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return $orgname} // Organisation signing the contract
 		3 {ND-LotResult[count(for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender[count(OPT-316-Contract[BT-3202-Contract == $tender]) == 0] == $tender])>0]} #{auxiliary|text|non-winning-tender}: // 6.1.3. Non-winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender[count(OPT-316-Contract[BT-3202-Contract == $tender]) == 0] == $tender])>0]} #{auxiliary|text|organisation-tenderer}: // Non-winning tender
-				{OPT-320-LotResult} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]]} // Name of this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of this non-winning tenderer (single organisation in Tendering Party)
 		4 {ND-LotResult[(BT-712(a)-LotResult is present) or (BT-636-LotResult is present) or (BT-760-LotResult is present) or (BT-710-LotResult is present) or (BT-710-LotResult is present) or (BT-735-LotResult is present)]} #{auxiliary|text|statistical-information} // 6.1.4. Statistical information
 			0 {ND-BuyerReviewComplainants} #{auxiliary|text|review-requests-summary}: // Summary of the review requests the buyer received
 				0 {BT-712(b)-LotResult[BT-712(b)-LotResult != -1]} #{field|name|BT-712(b)-LotResult}: ${BT-712(b)-LotResult} // Buyer Review Complainants
@@ -432,10 +446,10 @@
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
 		{BT-165-Organization-Company} #{field|name|BT-165-Organization-Company}: ${BT-165-Organization-Company} // Size of the economic operator
 		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -469,14 +483,12 @@
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'ted-esen') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'ted-esen')]} #{auxiliary|text|organisation-esender} // This org is an eSender
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-300-Contract-Signatory) or (OPT-201-Organization-TouchPoint == OPT-300-Contract-Signatory)]} #{auxiliary|text|organisation-signing-contract} // Contract Signatory organisation (SettledContract)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Financing) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Financing)]} #{auxiliary|text|organisation-financing} // Financing Organisation (LotResult)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Paying) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Paying)]} #{auxiliary|text|organisation-paying} // Paying Organisation (LotResult)
@@ -510,6 +522,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/3.efx b/view-templates/3.efx
index 19ff3fb4a..2dee01513 100644
--- a/view-templates/3.efx
+++ b/view-templates/3.efx
@@ -36,11 +36,10 @@
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -67,34 +66,8 @@
 			{BT-509-Organization-TouchPoint[OPT-200-Organization-Company == OPT-300-Procedure-Buyer] } #{field|name|BT-509-Organization-TouchPoint}: ${BT-509-Organization-TouchPoint} // Touchpoint eDelivery Gateway
 		0 {ND-Organization} #{auxiliary|text|roles}: // Roles of this organisation
 			0 {ND-Organization[count(for text:$orgid in OPT-200-Organization-Company return OPT-300-Procedure-Buyer[OPT-300-Procedure-Buyer == $orgid])>0]} #{auxiliary|text|buyer} // This org is a Buyer
-				{OPP-050-Organization[OPP-050-Organization == TRUE]} #{field|name|OPP-050-Organization} // Leader of the group
-				{OPP-052-Organization[OPP-052-Organization == TRUE]} #{field|name|OPP-052-Organization} // CPB Acquiring
-				{OPP-051-Organization[OPP-051-Organization == TRUE]} #{field|name|OPP-051-Organization} // CPB Awarding
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'serv-prov') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'serv-prov')]} #{auxiliary|text|organisation-providing-procurement-service} // This org is a Service Provider
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'ted-esen') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'ted-esen')]} #{auxiliary|text|organisation-esender} // This org is an eSender
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Part-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Part-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Part-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Part-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Part-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Part-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Part-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (PART)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -109,6 +82,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/30.efx b/view-templates/30.efx
index 76355725d..a5aea68dd 100644
--- a/view-templates/30.efx
+++ b/view-templates/30.efx
@@ -18,7 +18,7 @@
 			{BT-197(BT-105)-Procedure} #{field|name|BT-197(BT-105)-Procedure}: #{BT-197(BT-105)-Procedure} // Unpublished Justification Code
 			{BT-105-Procedure[BT-196(BT-105)-Procedure is present]} #{field|name|BT-196(BT-105)-Procedure}: ${BT-196(BT-105)-Procedure} // Unpublished Justification Description
 			{BT-105-Procedure[BT-198(BT-105)-Procedure is present]} #{field|name|BT-198(BT-105)-Procedure}: ${BT-198(BT-105)-Procedure} // Unpublished Access Date
-		0 {BT-106-Procedure[BT-106-Procedure != 'unpublished']} #{field|name|BT-106-Procedure}: ${if (BT-106-Procedure == 'true') then 'Yes' else 'No'} // The procedure is accelerated. (true/false)
+		0 {BT-106-Procedure[BT-106-Procedure != 'unpublished']} #{field|name|BT-106-Procedure}: #{code|name|${concat('indicator.',BT-106-Procedure)}} // The procedure is accelerated. (true/false)
 		0 {BT-106-Procedure[BT-106-Procedure == 'unpublished']} #{field|name|BT-106-Procedure}: #{auxiliary|text|unpublished} // The procedure is accelerated. (unpublished)
 			{BT-197(BT-106)-Procedure} #{field|name|BT-197(BT-106)-Procedure}: #{BT-197(BT-106)-Procedure} // Unpublished Justification Code
 			{BT-106-Procedure[BT-196(BT-106)-Procedure is present]} #{field|name|BT-196(BT-106)-Procedure}: ${BT-196(BT-106)-Procedure} // Unpublished Justification Description
@@ -59,11 +59,10 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
-					{BT-197(BT-09)-Procedure} #{field|name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
-					{ND-Root[BT-196(BT-09)-Procedure is present]} #{field|name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
-					{BT-198(BT-09)-Procedure} #{field|name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
+				{BT-197(BT-09)-Procedure} #{name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
+				{ND-Root[BT-196(BT-09)-Procedure is present]} #{name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
+				{BT-198(BT-09)-Procedure} #{name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
 4 {ND-Root[BT-137-LotsGroup is present]} #{auxiliary|text|group-of-lots} // 4. Group of lots
 	1 {ND-LotsGroup} #{field|name|BT-330-Procedure}: ${BT-137-LotsGroup} // 4.1 Group of lots
 		{BT-137-LotsGroup} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-137-LotsGroup return BT-1375-Procedure[BT-330-Procedure == $gloid]} // Lots included / Group Lot Identifier 
@@ -218,13 +217,10 @@
 		15 {ND-LotTenderingProcess[(BT-765-Lot is present) or (BT-113-Lot is present) or (BT-109-Lot is present) or (BT-111-Lot is present) or (BT-766-Lot is present) or (BT-119-LotResult == TRUE) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|techniques} // 5.1.15 Techniques
 			0 {ND-LotTenderingProcess[(BT-765-Lot is present) or (BT-113-Lot is present) or (BT-109-Lot is present) or (BT-111-Lot is present)]} #{auxiliary|text|framework-agreement}: // Information about framework agreement
 				{BT-765-Lot} #{BT-765-Lot} // Framework Agreement Type
-				{BT-113-Lot} #{field|name|BT-113-Lot}: ${BT-113-Lot} // Maximum number of participants
-				{BT-137-Lot[BT-109-Lot is present]} #{field|name|BT-109-Lot}: ${BT-109-Lot} // Justification for the duration of framework agreement
 				{BT-137-Lot[BT-111-Lot is present]} #{field|name|BT-111-Lot}: ${BT-111-Lot} // Framework Buyer Categories (Lot)
-			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system} // Dynamic purchasing system 
+			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system}: // Information about the dynamic purchasing system
 				{BT-766-Lot} #{BT-766-Lot} // Dynamic Purchasing System
 				{BT-137-Lot[some indicator:$dpst in (for text:$lotid in BT-137-Lot return BT-119-LotResult[BT-13713-LotResult == $lotid]) satisfies $dpst == TRUE]} #{field|name|BT-119-LotResult} // The dynamic purchasing system is terminated. (true/false)
-			0 {ND-AuctionTerms[(BT-767-Lot is present) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|electronic-auction}: // Electronic auction #{code|name|indicator.true}
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
 			{BT-137-Lot[OPT-301-Lot-Mediator is present]} #{auxiliary|text|organisation-mediation}: ${for text:$refid in OPT-301-Lot-Mediator, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Mediation organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewOrg is present]} #{auxiliary|text|organisation-review}: ${for text:$refid in OPT-301-Lot-ReviewOrg, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Review organisation (Lot)
@@ -234,12 +230,12 @@
 			{BT-137-Lot[OPT-301-Lot-AddInfo is present]} #{auxiliary|text|organisation-providing-info-procedure}: ${for text:$refid in OPT-301-Lot-AddInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation providing additional information about the procurement procedure (Lot)
 			{BT-137-Lot[OPT-301-Lot-DocProvider is present]} #{auxiliary|text|organisation-providing-docs}: ${for text:$refid in OPT-301-Lot-DocProvider, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Documents provider organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-financing}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Financing Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-paying}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Paying Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$conid1 in OPT-315-LotResult[BT-13713-LotResult == $lotid1], text:$orgid1 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-signing-contract}: ${distinct-values(for text:$lotid2 in BT-137-Lot, text:$conid2 in OPT-315-LotResult[BT-13713-LotResult == $lotid2], text:$orgid2 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname)} // Contract Signatory (LotResult)
-6 {ND-Root[(BT-13713-LotResult is present)]} #{auxiliary|text|results} // 6. Results
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
+6 {ND-Root[(BT-3201-Tender is present)]} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} ${BT-161-NoticeResult/@currencyID} // Notice Value (Value of all contracts awarded in this procedure)
 	0 {ND-NoticeResult[BT-161-NoticeResult == -1]} #{field|name|BT-161-NoticeResult}: #{auxiliary|text|unpublished} // Notice Value (Value of all contracts awarded in this procedure) (unpublished)
 		{ND-NoticeValueUnpublish} #{field|name|BT-197(BT-161)-NoticeResult}: #{BT-197(BT-161)-NoticeResult} // Unpublished Justification Code
@@ -255,6 +251,18 @@
 		{ND-NoticeApproximateValueUnpublish} #{field|name|BT-197(BT-1118)-NoticeResult}: #{BT-197(BT-1118)-NoticeResult} // Unpublished Justification Code
 		{ND-NoticeApproximateValueUnpublish[BT-196(BT-1118)-NoticeResult is present]} #{field|name|BT-196(BT-1118)-NoticeResult}: ${BT-196(BT-1118)-NoticeResult} // Unpublished Justification Description
 		{ND-NoticeApproximateValueUnpublish[BT-198(BT-1118)-NoticeResult is present]} #{field|name|BT-198(BT-1118)-NoticeResult}: ${BT-198(BT-1118)-NoticeResult} // Unpublished Access Date
+	0 {ND-NoticeResultGroupFA[BT-556-NoticeResult != 'unpublished']} #{auxiliary|text|group-framework-value}: ${BT-556-NoticeResult} // Value of the framework agreements in this group of lots
+		0 {ND-NoticeResultGroupFA} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-556-NoticeResult return BT-1375-Procedure[BT-330-Procedure == $gloid] } // Lots included: LOT-0001, LOT-0003
+		0 {BT-156-NoticeResult[BT-156-NoticeResult != -1]} #{field|name|BT-156-NoticeResult}: ${format-number(BT-156-NoticeResult, '###,##0.##')} ${BT-156-NoticeResult/@currencyID} // Maximum value of the framework agreements in this group of lots
+		0 {BT-156-NoticeResult[BT-156-NoticeResult == -1]} #{field|name|BT-156-NoticeResult}:#{auxiliary|text|unpublished} // Maximum value of the framework agreements in this group of lots (unpublished)
+			{ND-GroupMaximumValueUnpublish} #{field|name|BT-197(BT-156)-NoticeResult}: #{BT-197(BT-156)-NoticeResult} // Unpublished Justification Code
+			{ND-GroupMaximumValueUnpublish[BT-196(BT-156)-NoticeResult is present]} #{field|name|BT-196(BT-156)-NoticeResult}: ${BT-196(BT-156)-NoticeResult} // Unpublished Justification Description
+			{ND-GroupMaximumValueUnpublish[BT-198(BT-156)-NoticeResult is present]} #{field|name|BT-198(BT-156)-NoticeResult}: ${BT-198(BT-156)-NoticeResult} // Unpublished Access Date
+		0 {BT-1561-NoticeResult[BT-1561-NoticeResult != -1]} #{field|name|BT-1561-NoticeResult}: ${format-number(BT-1561-NoticeResult, '###,##0.##')} ${BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID} // Re-estimated value of the framework agreements within a group of lots
+		0 {BT-1561-NoticeResult[BT-1561-NoticeResult == -1]} #{field|name|BT-1561-NoticeResult}: #{auxiliary|text|unpublished} // Re-estimated value of the framework agreements within a group of lots (unpublished)
+			{ND-GroupReestimatedValueUnpublish} #{field|name|BT-197(BT-1561)-NoticeResult}: #{BT-197(BT-1561)-NoticeResult} // Unpublished Justification Code
+			{ND-GroupReestimatedValueUnpublish[BT-196(BT-1561)-NoticeResult is present]} #{field|name|BT-196(BT-1561)-NoticeResult}: ${BT-196(BT-1561)-NoticeResult} // Unpublished Justification Description
+			{ND-GroupReestimatedValueUnpublish[BT-198(BT-1561)-NoticeResult is present]} #{field|name|BT-198(BT-1561)-NoticeResult}: ${BT-198(BT-1561)-NoticeResult} // Unpublished Access Date
 	0 {ND-NoticeResultGroupFA[BT-556-NoticeResult == 'unpublished']} #{auxiliary|text|group-framework-value}: #{auxiliary|text|unpublished} // Value of the framework agreements in this group of lots (unpublished)
 		{ND-GroupMaximalValueIdentifierUnpublish} #{field|name|BT-197(BT-556)-NoticeResult}: #{BT-197(BT-556)-NoticeResult} // Unpublished Justification Code
 		{ND-GroupMaximalValueIdentifierUnpublish[BT-196(BT-556)-NoticeResult is present]} #{field|name|BT-196(BT-556)-NoticeResult}: ${BT-196(BT-556)-NoticeResult} // Unpublished Justification Description
@@ -271,8 +279,8 @@
 			{ND-GroupReestimatedValueUnpublish[BT-196(BT-1561)-NoticeResult is present]} #{field|name|BT-196(BT-1561)-NoticeResult}: ${BT-196(BT-1561)-NoticeResult} // Unpublished Justification Description
 			{ND-GroupReestimatedValueUnpublish[BT-198(BT-1561)-NoticeResult is present]} #{field|name|BT-198(BT-1561)-NoticeResult}: ${BT-198(BT-1561)-NoticeResult} // Unpublished Access Date
 	0 {ND-DirectAward} #{auxiliary|text|direct-award}: // Direct award
-		0 {ND-DirectAward[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
-		0 {ND-DirectAward[BT-136-Procedure == 'unpublished']} #{field|name|BT-136-Procedure}: #{auxiliary|text|unpublished} // Justification for direct award (unpublished)
+		0 {BT-136-Procedure[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
+		0 {BT-136-Procedure[BT-136-Procedure == 'unpublished']} #{field|name|BT-136-Procedure}: #{auxiliary|text|unpublished} // Justification for direct award (unpublished)
 			{ND-DirectAwardJustificationCodeUnpublish} #{field|name|BT-197(BT-136)-Procedure}: #{BT-197(BT-136)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationCodeUnpublish[BT-196(BT-136)-Procedure is present]} #{field|name|BT-196(BT-136)-Procedure}: ${BT-196(BT-136)-Procedure} // Unpublished Justification Description
 			{ND-DirectAwardJustificationCodeUnpublish[BT-198(BT-136)-Procedure is present]} #{field|name|BT-198(BT-136)-Procedure}: ${BT-198(BT-136)-Procedure} // Unpublished Access Date
@@ -281,7 +289,7 @@
 			{ND-DirectAwardJustificationTextUnpublish} #{field|name|BT-197(BT-135)-Procedure}: #{BT-197(BT-135)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationTextUnpublish[BT-196(BT-135)-Procedure is present]} #{field|name|BT-196(BT-135)-Procedure}: ${BT-196(BT-135)-Procedure} // Unpublished Justification Description
 			{ND-DirectAwardJustificationTextUnpublish[BT-198(BT-135)-Procedure is present]} #{field|name|BT-198(BT-135)-Procedure}: ${BT-198(BT-135)-Procedure} // Unpublished Access Date
-		0 {ND-DirectAward[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
+		0 {BT-1252-Procedure[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
 		0 {ND-DirectAward[BT-1252-Procedure == 'unpublished']} #{field|name|BT-1252-Procedure}: #{auxiliary|text|unpublished} // Identifier of the previous procedure that justifies direct award (unpublished)
 			{ND-DirectAwardJustificationPreviousUnpublish} #{field|name|BT-197(BT-1252)-Procedure}: #{BT-197(BT-1252)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationPreviousUnpublish[BT-196(BT-1252)-Procedure is present]} #{field|name|BT-196(BT-1252)-Procedure}: ${BT-196(BT-1252)-Procedure} // Unpublished Justification Description
@@ -310,9 +318,11 @@
 				{ND-ReestimatedValueUnpublish[BT-198(BT-660)-LotResult is present]} #{field|name|BT-198(BT-660)-LotResult}: ${BT-198(BT-660)-LotResult} // Unpublished Access Date
 		2 {ND-LotResult[BT-02-notice == 'veat' or BT-02-notice == 'can-modif' or ((BT-142-LotResult == 'selec-w' or BT-142-LotResult == 'unpublished') and OPT-320-LotResult is present and OPT-315-LotResult is present)]} #{auxiliary|text|winner-info} // 6.1.2. Winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]])>0]} #{auxiliary|text|winner}: // Winner
-				{OPT-320-LotResult} #{field|name|BT-500-Organization-Company}: ${for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa or OPT-170-Tenderer[OPT-210-Tenderer == $tpa] == TRUE]), text:$org in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($org, '
')} // Name of this winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Name of this winner (single organisation in Tendering Party)
 				0 {OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{auxiliary|text|winner-subcontractor}: // Subcontractors of the winner
-					{OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{field|name|BT-500-Business}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid]} // Subcontractor name
+					{OPT-320-LotResult[some text:$orgname1 in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $orgname1 != '']} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]], text:$orgname2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($orgname2, ', ')} // Subcontractor names
 				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]])>0]} #{auxiliary|text|tender}: // Tender
 				{OPT-320-LotResult} #{field|name|BT-3201-Tender}: ${for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender == $tender]} // Tender identifier
 				{OPT-320-LotResult} #{field|name|BT-13714-Tender}: ${for text:$tender in OPT-320-LotResult return BT-13714-Tender[OPT-321-Tender == $tender]} // Identifier of lot or group of lots
@@ -327,7 +337,7 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-171)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-171)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-171)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender} // The tender is a variant
+				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender}  // TODO The tender is a variant  0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender}    #{code|name|${if (some indicator:$bool2 in (for text:$tender2 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender2]) satisfies $bool2 == TRUE) then 'indicator.true' else 'indicator.false' }}
 				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1]) satisfies $bool == FALSE) and (some text:$code in (for text:$tender2 in OPT-320-LotResult return BT-195(BT-193)-Tender[OPT-321-Tender == $tender2]) satisfies $code != '')]} #{field|name|BT-193-Tender}: #{auxiliary|text|unpublished} // The tender is a variant (unpublished)
 					0 {OPT-320-LotResult[(some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-193)-Tender[OPT-321-Tender == $tender1] ) satisfies $code != '')]} #{field|name|BT-197(BT-193)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-193)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					0 {OPT-320-LotResult[(some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-193)-Tender[OPT-321-Tender == $tender1] ) satisfies $desc != '')]} #{field|name|BT-196(BT-193)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-196(BT-193)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Description
@@ -342,8 +352,9 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-773)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-730-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
-					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-730-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-730-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties (unpublished)
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$code2 in BT-197(BT-730)-Tender[OPT-321-Tender == $tender2] return $code2} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $desc != '']} #{field|name|BT-196(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc1 in BT-196(BT-730)-Tender[OPT-321-Tender == $tender2] return $desc1} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-553-Tender[BT-553-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-553-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-553-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} ${for text:$tender3 in OPT-320-LotResult return BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID} // Estimated value of the part of the contract that the contractor will subcontract to third parties
@@ -351,7 +362,8 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-553)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-731-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$spk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $spk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-731-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-731)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
@@ -370,16 +382,18 @@
 					{OPT-320-LotResult[some text:$title1 in (for text:$tender1 in OPT-320-LotResult return BT-721-Contract[BT-3202-Contract == $tender1]) satisfies $title1 != '']} #{field|name|BT-721-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$title2 in BT-721-Contract[BT-3202-Contract == $tender2] return $title2} // Contract title
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-1451-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z ]} #{field|name|BT-1451-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-1451-Contract[BT-3202-Contract == $tender2]} // Winning Decision date
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-145-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-145-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-145-Contract[BT-3202-Contract == $tender2]} // Contract Conclusion Date
-					{OPT-320-LotResult} #{field|name|BT-768-Contract}: ${some indicator:$fa in (for text:$tender1 in OPT-320-LotResult return indicator:BT-768-Contract[BT-3202-Contract == $tender1]) satisfies $fa == TRUE } // Contract Framework Agreement
+					{OPT-320-LotResult} #{field|name|BT-768-Contract}: #{code|name|${if (some indicator:$fa in (for text:$tender1 in OPT-320-LotResult return indicator:BT-768-Contract[BT-3202-Contract == $tender1]) satisfies $fa == TRUE) then 'indicator.true' else 'indicator.false'}} // Contract Framework Agreement indicator.true
 					{OPT-320-LotResult[some text:$url in (for text:$tender1 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender1]) satisfies $url != '']} #{field|name|BT-151-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender2]} // Contract URL
 					0 {OPT-320-LotResult[some text:$contractid in (for text:$tender in OPT-320-LotResult return BT-3202-Contract[BT-3202-Contract[BT-5011-Contract is present or BT-722-Contract is present or BT-6110-Contract is present] == $tender]) satisfies $contractid != '']} #{auxiliary|text|eu-funds-used} // Information about European Union funds used to finance the contract
-						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Name
+						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$name in BT-722-Contract[BT-3202-Contract == $tender2] return $name} // Contract EU Funds Name
 						{OPT-320-LotResult[some text:$eufundid in (for text:$tender1 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender1]) satisfies $eufundid != '']} #{field|name|BT-5011-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Identifier
 						{OPT-320-LotResult[some text:$eufunddesc in (for text:$tender1 in OPT-320-LotResult return BT-6110-Contract[BT-3202-Contract == $tender1]) satisfies $eufunddesc != '']} #{field|name|BT-6110-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$details in BT-6110-Contract[BT-3202-Contract == $tender2] return $details} // Contract EU Funds Details
 					{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-300-Contract-Signatory[BT-3202-Contract == $tender1]) > 0]} #{auxiliary|text|organisation-signing-contract}: ${for text:$tender2 in OPT-320-LotResult, text:$orgid in OPT-300-Contract-Signatory[BT-3202-Contract == $tender2], text:$orgname in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return $orgname} // Organisation signing the contract
 		3 {ND-LotResult[count(for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender[count(OPT-316-Contract[BT-3202-Contract == $tender]) == 0] == $tender])>0]} #{auxiliary|text|non-winning-tender}: // 6.1.3. Non-winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender[count(OPT-316-Contract[BT-3202-Contract == $tender]) == 0] == $tender])>0]} #{auxiliary|text|organisation-tenderer}: // Non-winning tender
-				{OPT-320-LotResult} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]]} // Name of this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of this non-winning tenderer (single organisation in Tendering Party)
 		4 {ND-LotResult[(BT-712(a)-LotResult is present) or (BT-636-LotResult is present) or (BT-760-LotResult is present) or (BT-710-LotResult is present) or (BT-710-LotResult is present) or (BT-735-LotResult is present)]} #{auxiliary|text|statistical-information} // 6.1.4. Statistical information
 			0 {ND-BuyerReviewComplainants} #{auxiliary|text|review-requests-summary}: // Summary of the review requests the buyer received
 				0 {BT-712(b)-LotResult[BT-712(b)-LotResult != -1]} #{field|name|BT-712(b)-LotResult}: ${BT-712(b)-LotResult} // Buyer Review Complainants
@@ -438,10 +452,10 @@
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
 		{BT-165-Organization-Company} #{field|name|BT-165-Organization-Company}: ${BT-165-Organization-Company} // Size of the economic operator
 		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -475,14 +489,12 @@
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'ted-esen') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'ted-esen')]} #{auxiliary|text|organisation-esender} // This org is an eSender
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-300-Contract-Signatory) or (OPT-201-Organization-TouchPoint == OPT-300-Contract-Signatory)]} #{auxiliary|text|organisation-signing-contract} // Contract Signatory organisation (SettledContract)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Financing) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Financing)]} #{auxiliary|text|organisation-financing} // Financing Organisation (LotResult)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Paying) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Paying)]} #{auxiliary|text|organisation-paying} // Paying Organisation (LotResult)
@@ -516,6 +528,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/31.efx b/view-templates/31.efx
index d77a81d38..e08ac640c 100644
--- a/view-templates/31.efx
+++ b/view-templates/31.efx
@@ -19,7 +19,7 @@
 			{BT-197(BT-105)-Procedure} #{field|name|BT-197(BT-105)-Procedure}: #{BT-197(BT-105)-Procedure} // Unpublished Justification Code
 			{BT-105-Procedure[BT-196(BT-105)-Procedure is present]} #{field|name|BT-196(BT-105)-Procedure}: ${BT-196(BT-105)-Procedure} // Unpublished Justification Description
 			{BT-105-Procedure[BT-198(BT-105)-Procedure is present]} #{field|name|BT-198(BT-105)-Procedure}: ${BT-198(BT-105)-Procedure} // Unpublished Access Date
-		0 {BT-106-Procedure[BT-106-Procedure != 'unpublished']} #{field|name|BT-106-Procedure}: ${if (BT-106-Procedure == 'true') then 'Yes' else 'No'} // The procedure is accelerated. (true/false)
+		0 {BT-106-Procedure[BT-106-Procedure != 'unpublished']} #{field|name|BT-106-Procedure}: #{code|name|${concat('indicator.',BT-106-Procedure)}} // The procedure is accelerated. (true/false)
 		0 {BT-106-Procedure[BT-106-Procedure == 'unpublished']} #{field|name|BT-106-Procedure}: #{auxiliary|text|unpublished} // The procedure is accelerated. (unpublished)
 			{BT-197(BT-106)-Procedure} #{field|name|BT-197(BT-106)-Procedure}: #{BT-197(BT-106)-Procedure} // Unpublished Justification Code
 			{BT-106-Procedure[BT-196(BT-106)-Procedure is present]} #{field|name|BT-196(BT-106)-Procedure}: ${BT-196(BT-106)-Procedure} // Unpublished Justification Description
@@ -59,11 +59,10 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
-					{BT-197(BT-09)-Procedure} #{field|name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
-					{ND-Root[BT-196(BT-09)-Procedure is present]} #{field|name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
-					{BT-198(BT-09)-Procedure} #{field|name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
+				{BT-197(BT-09)-Procedure} #{name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
+				{ND-Root[BT-196(BT-09)-Procedure is present]} #{name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
+				{BT-198(BT-09)-Procedure} #{name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
 4 {ND-Root[BT-137-LotsGroup is present]} #{auxiliary|text|group-of-lots} // 4. Group of lots
 	1 {ND-LotsGroup} #{field|name|BT-330-Procedure}: ${BT-137-LotsGroup} // 4.1 Group of lots
 		{BT-137-LotsGroup} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-137-LotsGroup return BT-1375-Procedure[BT-330-Procedure == $gloid]} // Lots included / Group Lot Identifier 
@@ -217,13 +216,10 @@
 		15 {ND-LotTenderingProcess[(BT-765-Lot is present) or (BT-113-Lot is present) or (BT-109-Lot is present) or (BT-111-Lot is present) or (BT-766-Lot is present) or (BT-119-LotResult == TRUE) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|techniques} // 5.1.15 Techniques
 			0 {ND-LotTenderingProcess[(BT-765-Lot is present) or (BT-113-Lot is present) or (BT-109-Lot is present) or (BT-111-Lot is present)]} #{auxiliary|text|framework-agreement}: // Information about framework agreement
 				{BT-765-Lot} #{BT-765-Lot} // Framework Agreement Type
-				{BT-113-Lot} #{field|name|BT-113-Lot}: ${BT-113-Lot} // Maximum number of participants
-				{BT-137-Lot[BT-109-Lot is present]} #{field|name|BT-109-Lot}: ${BT-109-Lot} // Justification for the duration of framework agreement
 				{BT-137-Lot[BT-111-Lot is present]} #{field|name|BT-111-Lot}: ${BT-111-Lot} // Framework Buyer Categories (Lot)
-			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system} // Dynamic purchasing system 
+			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system}: // Information about the dynamic purchasing system
 				{BT-766-Lot} #{BT-766-Lot} // Dynamic Purchasing System
 				{BT-137-Lot[some indicator:$dpst in (for text:$lotid in BT-137-Lot return BT-119-LotResult[BT-13713-LotResult == $lotid]) satisfies $dpst == TRUE]} #{field|name|BT-119-LotResult} // The dynamic purchasing system is terminated. (true/false)
-			0 {ND-AuctionTerms[(BT-767-Lot is present) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|electronic-auction}: // Electronic auction #{code|name|indicator.true}
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
 			{BT-137-Lot[OPT-301-Lot-Mediator is present]} #{auxiliary|text|organisation-mediation}: ${for text:$refid in OPT-301-Lot-Mediator, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Mediation organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewOrg is present]} #{auxiliary|text|organisation-review}: ${for text:$refid in OPT-301-Lot-ReviewOrg, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Review organisation (Lot)
@@ -233,12 +229,12 @@
 			{BT-137-Lot[OPT-301-Lot-AddInfo is present]} #{auxiliary|text|organisation-providing-info-procedure}: ${for text:$refid in OPT-301-Lot-AddInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation providing additional information about the procurement procedure (Lot)
 			{BT-137-Lot[OPT-301-Lot-DocProvider is present]} #{auxiliary|text|organisation-providing-docs}: ${for text:$refid in OPT-301-Lot-DocProvider, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Documents provider organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-financing}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Financing Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-paying}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Paying Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$conid1 in OPT-315-LotResult[BT-13713-LotResult == $lotid1], text:$orgid1 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-signing-contract}: ${distinct-values(for text:$lotid2 in BT-137-Lot, text:$conid2 in OPT-315-LotResult[BT-13713-LotResult == $lotid2], text:$orgid2 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname)} // Contract Signatory (LotResult)
-6 {ND-Root[(BT-13713-LotResult is present)]} #{auxiliary|text|results} // 6. Results
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
+6 {ND-Root[(BT-3201-Tender is present)]} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} ${BT-161-NoticeResult/@currencyID} // Notice Value (Value of all contracts awarded in this procedure)
 	0 {ND-NoticeResult[BT-161-NoticeResult == -1]} #{field|name|BT-161-NoticeResult}: #{auxiliary|text|unpublished} // Notice Value (Value of all contracts awarded in this procedure) (unpublished)
 		{ND-NoticeValueUnpublish} #{field|name|BT-197(BT-161)-NoticeResult}: #{BT-197(BT-161)-NoticeResult} // Unpublished Justification Code
@@ -254,6 +250,18 @@
 		{ND-NoticeApproximateValueUnpublish} #{field|name|BT-197(BT-1118)-NoticeResult}: #{BT-197(BT-1118)-NoticeResult} // Unpublished Justification Code
 		{ND-NoticeApproximateValueUnpublish[BT-196(BT-1118)-NoticeResult is present]} #{field|name|BT-196(BT-1118)-NoticeResult}: ${BT-196(BT-1118)-NoticeResult} // Unpublished Justification Description
 		{ND-NoticeApproximateValueUnpublish[BT-198(BT-1118)-NoticeResult is present]} #{field|name|BT-198(BT-1118)-NoticeResult}: ${BT-198(BT-1118)-NoticeResult} // Unpublished Access Date
+	0 {ND-NoticeResultGroupFA[BT-556-NoticeResult != 'unpublished']} #{auxiliary|text|group-framework-value}: ${BT-556-NoticeResult} // Value of the framework agreements in this group of lots
+		0 {ND-NoticeResultGroupFA} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-556-NoticeResult return BT-1375-Procedure[BT-330-Procedure == $gloid] } // Lots included: LOT-0001, LOT-0003
+		0 {BT-156-NoticeResult[BT-156-NoticeResult != -1]} #{field|name|BT-156-NoticeResult}: ${format-number(BT-156-NoticeResult, '###,##0.##')} ${BT-156-NoticeResult/@currencyID} // Maximum value of the framework agreements in this group of lots
+		0 {BT-156-NoticeResult[BT-156-NoticeResult == -1]} #{field|name|BT-156-NoticeResult}:#{auxiliary|text|unpublished} // Maximum value of the framework agreements in this group of lots (unpublished)
+			{ND-GroupMaximumValueUnpublish} #{field|name|BT-197(BT-156)-NoticeResult}: #{BT-197(BT-156)-NoticeResult} // Unpublished Justification Code
+			{ND-GroupMaximumValueUnpublish[BT-196(BT-156)-NoticeResult is present]} #{field|name|BT-196(BT-156)-NoticeResult}: ${BT-196(BT-156)-NoticeResult} // Unpublished Justification Description
+			{ND-GroupMaximumValueUnpublish[BT-198(BT-156)-NoticeResult is present]} #{field|name|BT-198(BT-156)-NoticeResult}: ${BT-198(BT-156)-NoticeResult} // Unpublished Access Date
+		0 {BT-1561-NoticeResult[BT-1561-NoticeResult != -1]} #{field|name|BT-1561-NoticeResult}: ${format-number(BT-1561-NoticeResult, '###,##0.##')} ${BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID} // Re-estimated value of the framework agreements within a group of lots
+		0 {BT-1561-NoticeResult[BT-1561-NoticeResult == -1]} #{field|name|BT-1561-NoticeResult}: #{auxiliary|text|unpublished} // Re-estimated value of the framework agreements within a group of lots (unpublished)
+			{ND-GroupReestimatedValueUnpublish} #{field|name|BT-197(BT-1561)-NoticeResult}: #{BT-197(BT-1561)-NoticeResult} // Unpublished Justification Code
+			{ND-GroupReestimatedValueUnpublish[BT-196(BT-1561)-NoticeResult is present]} #{field|name|BT-196(BT-1561)-NoticeResult}: ${BT-196(BT-1561)-NoticeResult} // Unpublished Justification Description
+			{ND-GroupReestimatedValueUnpublish[BT-198(BT-1561)-NoticeResult is present]} #{field|name|BT-198(BT-1561)-NoticeResult}: ${BT-198(BT-1561)-NoticeResult} // Unpublished Access Date
 	0 {ND-NoticeResultGroupFA[BT-556-NoticeResult == 'unpublished']} #{auxiliary|text|group-framework-value}: #{auxiliary|text|unpublished} // Value of the framework agreements in this group of lots (unpublished)
 		{ND-GroupMaximalValueIdentifierUnpublish} #{field|name|BT-197(BT-556)-NoticeResult}: #{BT-197(BT-556)-NoticeResult} // Unpublished Justification Code
 		{ND-GroupMaximalValueIdentifierUnpublish[BT-196(BT-556)-NoticeResult is present]} #{field|name|BT-196(BT-556)-NoticeResult}: ${BT-196(BT-556)-NoticeResult} // Unpublished Justification Description
@@ -270,8 +278,8 @@
 			{ND-GroupReestimatedValueUnpublish[BT-196(BT-1561)-NoticeResult is present]} #{field|name|BT-196(BT-1561)-NoticeResult}: ${BT-196(BT-1561)-NoticeResult} // Unpublished Justification Description
 			{ND-GroupReestimatedValueUnpublish[BT-198(BT-1561)-NoticeResult is present]} #{field|name|BT-198(BT-1561)-NoticeResult}: ${BT-198(BT-1561)-NoticeResult} // Unpublished Access Date
 	0 {ND-DirectAward} #{auxiliary|text|direct-award}: // Direct award
-		0 {ND-DirectAward[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
-		0 {ND-DirectAward[BT-136-Procedure == 'unpublished']} #{field|name|BT-136-Procedure}: #{auxiliary|text|unpublished} // Justification for direct award (unpublished)
+		0 {BT-136-Procedure[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
+		0 {BT-136-Procedure[BT-136-Procedure == 'unpublished']} #{field|name|BT-136-Procedure}: #{auxiliary|text|unpublished} // Justification for direct award (unpublished)
 			{ND-DirectAwardJustificationCodeUnpublish} #{field|name|BT-197(BT-136)-Procedure}: #{BT-197(BT-136)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationCodeUnpublish[BT-196(BT-136)-Procedure is present]} #{field|name|BT-196(BT-136)-Procedure}: ${BT-196(BT-136)-Procedure} // Unpublished Justification Description
 			{ND-DirectAwardJustificationCodeUnpublish[BT-198(BT-136)-Procedure is present]} #{field|name|BT-198(BT-136)-Procedure}: ${BT-198(BT-136)-Procedure} // Unpublished Access Date
@@ -280,7 +288,7 @@
 			{ND-DirectAwardJustificationTextUnpublish} #{field|name|BT-197(BT-135)-Procedure}: #{BT-197(BT-135)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationTextUnpublish[BT-196(BT-135)-Procedure is present]} #{field|name|BT-196(BT-135)-Procedure}: ${BT-196(BT-135)-Procedure} // Unpublished Justification Description
 			{ND-DirectAwardJustificationTextUnpublish[BT-198(BT-135)-Procedure is present]} #{field|name|BT-198(BT-135)-Procedure}: ${BT-198(BT-135)-Procedure} // Unpublished Access Date
-		0 {ND-DirectAward[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
+		0 {BT-1252-Procedure[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
 		0 {ND-DirectAward[BT-1252-Procedure == 'unpublished']} #{field|name|BT-1252-Procedure}: #{auxiliary|text|unpublished} // Identifier of the previous procedure that justifies direct award (unpublished)
 			{ND-DirectAwardJustificationPreviousUnpublish} #{field|name|BT-197(BT-1252)-Procedure}: #{BT-197(BT-1252)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationPreviousUnpublish[BT-196(BT-1252)-Procedure is present]} #{field|name|BT-196(BT-1252)-Procedure}: ${BT-196(BT-1252)-Procedure} // Unpublished Justification Description
@@ -309,9 +317,11 @@
 				{ND-ReestimatedValueUnpublish[BT-198(BT-660)-LotResult is present]} #{field|name|BT-198(BT-660)-LotResult}: ${BT-198(BT-660)-LotResult} // Unpublished Access Date
 		2 {ND-LotResult[BT-02-notice == 'veat' or BT-02-notice == 'can-modif' or ((BT-142-LotResult == 'selec-w' or BT-142-LotResult == 'unpublished') and OPT-320-LotResult is present and OPT-315-LotResult is present)]} #{auxiliary|text|winner-info} // 6.1.2. Winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]])>0]} #{auxiliary|text|winner}: // Winner
-				{OPT-320-LotResult} #{field|name|BT-500-Organization-Company}: ${for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa or OPT-170-Tenderer[OPT-210-Tenderer == $tpa] == TRUE]), text:$org in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($org, '
')} // Name of this winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Name of this winner (single organisation in Tendering Party)
 				0 {OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{auxiliary|text|winner-subcontractor}: // Subcontractors of the winner
-					{OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{field|name|BT-500-Business}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid]} // Subcontractor name
+					{OPT-320-LotResult[some text:$orgname1 in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $orgname1 != '']} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]], text:$orgname2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($orgname2, ', ')} // Subcontractor names
 				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]])>0]} #{auxiliary|text|tender}: // Tender
 				{OPT-320-LotResult} #{field|name|BT-3201-Tender}: ${for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender == $tender]} // Tender identifier
 				{OPT-320-LotResult} #{field|name|BT-13714-Tender}: ${for text:$tender in OPT-320-LotResult return BT-13714-Tender[OPT-321-Tender == $tender]} // Identifier of lot or group of lots
@@ -326,7 +336,7 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-171)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-171)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-171)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender} // The tender is a variant
+				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender}  // TODO The tender is a variant  0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender}    #{code|name|${if (some indicator:$bool2 in (for text:$tender2 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender2]) satisfies $bool2 == TRUE) then 'indicator.true' else 'indicator.false' }}
 				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1]) satisfies $bool == FALSE) and (some text:$code in (for text:$tender2 in OPT-320-LotResult return BT-195(BT-193)-Tender[OPT-321-Tender == $tender2]) satisfies $code != '')]} #{field|name|BT-193-Tender}: #{auxiliary|text|unpublished} // The tender is a variant (unpublished)
 					0 {OPT-320-LotResult[(some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-193)-Tender[OPT-321-Tender == $tender1] ) satisfies $code != '')]} #{field|name|BT-197(BT-193)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-193)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					0 {OPT-320-LotResult[(some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-193)-Tender[OPT-321-Tender == $tender1] ) satisfies $desc != '')]} #{field|name|BT-196(BT-193)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-196(BT-193)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Description
@@ -336,8 +346,9 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-773)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-730-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
-					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-730-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-730-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties (unpublished)
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$code2 in BT-197(BT-730)-Tender[OPT-321-Tender == $tender2] return $code2} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $desc != '']} #{field|name|BT-196(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc1 in BT-196(BT-730)-Tender[OPT-321-Tender == $tender2] return $desc1} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-553-Tender[BT-553-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-553-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-553-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} ${for text:$tender3 in OPT-320-LotResult return BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID} // Estimated value of the part of the contract that the contractor will subcontract to third parties
@@ -345,7 +356,8 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-553)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-731-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$spk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $spk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-731-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-731)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
@@ -364,16 +376,18 @@
 					{OPT-320-LotResult[some text:$title1 in (for text:$tender1 in OPT-320-LotResult return BT-721-Contract[BT-3202-Contract == $tender1]) satisfies $title1 != '']} #{field|name|BT-721-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$title2 in BT-721-Contract[BT-3202-Contract == $tender2] return $title2} // Contract title
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-1451-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z ]} #{field|name|BT-1451-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-1451-Contract[BT-3202-Contract == $tender2]} // Winning Decision date
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-145-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-145-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-145-Contract[BT-3202-Contract == $tender2]} // Contract Conclusion Date
-					{OPT-320-LotResult} #{field|name|BT-768-Contract}: ${some indicator:$fa in (for text:$tender1 in OPT-320-LotResult return indicator:BT-768-Contract[BT-3202-Contract == $tender1]) satisfies $fa == TRUE } // Contract Framework Agreement
+					{OPT-320-LotResult} #{field|name|BT-768-Contract}: #{code|name|${if (some indicator:$fa in (for text:$tender1 in OPT-320-LotResult return indicator:BT-768-Contract[BT-3202-Contract == $tender1]) satisfies $fa == TRUE) then 'indicator.true' else 'indicator.false'}} // Contract Framework Agreement indicator.true
 					{OPT-320-LotResult[some text:$url in (for text:$tender1 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender1]) satisfies $url != '']} #{field|name|BT-151-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender2]} // Contract URL
 					0 {OPT-320-LotResult[some text:$contractid in (for text:$tender in OPT-320-LotResult return BT-3202-Contract[BT-3202-Contract[BT-5011-Contract is present or BT-722-Contract is present or BT-6110-Contract is present] == $tender]) satisfies $contractid != '']} #{auxiliary|text|eu-funds-used} // Information about European Union funds used to finance the contract
-						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Name
+						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$name in BT-722-Contract[BT-3202-Contract == $tender2] return $name} // Contract EU Funds Name
 						{OPT-320-LotResult[some text:$eufundid in (for text:$tender1 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender1]) satisfies $eufundid != '']} #{field|name|BT-5011-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Identifier
 						{OPT-320-LotResult[some text:$eufunddesc in (for text:$tender1 in OPT-320-LotResult return BT-6110-Contract[BT-3202-Contract == $tender1]) satisfies $eufunddesc != '']} #{field|name|BT-6110-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$details in BT-6110-Contract[BT-3202-Contract == $tender2] return $details} // Contract EU Funds Details
 					{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-300-Contract-Signatory[BT-3202-Contract == $tender1]) > 0]} #{auxiliary|text|organisation-signing-contract}: ${for text:$tender2 in OPT-320-LotResult, text:$orgid in OPT-300-Contract-Signatory[BT-3202-Contract == $tender2], text:$orgname in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return $orgname} // Organisation signing the contract
 		3 {ND-LotResult[count(for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender[count(OPT-316-Contract[BT-3202-Contract == $tender]) == 0] == $tender])>0]} #{auxiliary|text|non-winning-tender}: // 6.1.3. Non-winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender[count(OPT-316-Contract[BT-3202-Contract == $tender]) == 0] == $tender])>0]} #{auxiliary|text|organisation-tenderer}: // Non-winning tender
-				{OPT-320-LotResult} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]]} // Name of this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of this non-winning tenderer (single organisation in Tendering Party)
 		4 {ND-LotResult[(BT-712(a)-LotResult is present) or (BT-636-LotResult is present) or (BT-760-LotResult is present) or (BT-710-LotResult is present) or (BT-710-LotResult is present) or (BT-735-LotResult is present)]} #{auxiliary|text|statistical-information} // 6.1.4. Statistical information
 			0 {ND-BuyerReviewComplainants} #{auxiliary|text|review-requests-summary}: // Summary of the review requests the buyer received
 				0 {BT-712(b)-LotResult[BT-712(b)-LotResult != -1]} #{field|name|BT-712(b)-LotResult}: ${BT-712(b)-LotResult} // Buyer Review Complainants
@@ -432,10 +446,10 @@
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
 		{BT-165-Organization-Company} #{field|name|BT-165-Organization-Company}: ${BT-165-Organization-Company} // Size of the economic operator
 		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -469,14 +483,12 @@
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'ted-esen') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'ted-esen')]} #{auxiliary|text|organisation-esender} // This org is an eSender
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-300-Contract-Signatory) or (OPT-201-Organization-TouchPoint == OPT-300-Contract-Signatory)]} #{auxiliary|text|organisation-signing-contract} // Contract Signatory organisation (SettledContract)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Financing) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Financing)]} #{auxiliary|text|organisation-financing} // Financing Organisation (LotResult)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Paying) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Paying)]} #{auxiliary|text|organisation-paying} // Paying Organisation (LotResult)
@@ -510,6 +522,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/32.efx b/view-templates/32.efx
index 0060cefda..08554899d 100644
--- a/view-templates/32.efx
+++ b/view-templates/32.efx
@@ -14,11 +14,6 @@
 		{BT-04-notice} #{field|name|BT-04-notice}: ${BT-04-notice} // Procedure identifier
 		{OPP-090-Procedure} #{field|name|OPP-090-Procedure}: ${OPP-090-Procedure} // Previous Notice
 		{BT-22-Procedure} #{field|name|BT-22-Procedure}: ${BT-22-Procedure} // Internal identifier
-		0 {BT-105-Procedure[BT-105-Procedure != 'unpublished']} #{field|name|BT-105-Procedure}: #{BT-105-Procedure} // Type of the procedure
-		0 {BT-105-Procedure[BT-105-Procedure == 'unpublished']} #{field|name|BT-105-Procedure}: #{auxiliary|text|unpublished} // Type of the procedure (unpublished)
-			{BT-197(BT-105)-Procedure} #{field|name|BT-197(BT-105)-Procedure}: #{BT-197(BT-105)-Procedure} // Unpublished Justification Code
-			{BT-105-Procedure[BT-196(BT-105)-Procedure is present]} #{field|name|BT-196(BT-105)-Procedure}: ${BT-196(BT-105)-Procedure} // Unpublished Justification Description
-			{BT-105-Procedure[BT-198(BT-105)-Procedure is present]} #{field|name|BT-198(BT-105)-Procedure}: ${BT-198(BT-105)-Procedure} // Unpublished Access Date
 		0 {ND-ProcedureProcurementScope[BT-88-Procedure != 'unpublished']} #{field|name|BT-88-Procedure}: ${BT-88-Procedure} // Procedure Features / Description of the procedure
 		0 {ND-ProcedureProcurementScope[BT-88-Procedure == 'unpublished']} #{field|name|BT-88-Procedure}: #{auxiliary|text|unpublished} // Procedure Features / Description of the procedure (unpublished)
 			{BT-197(BT-88)-Procedure} #{field|name|BT-197(BT-88)-Procedure}: #{BT-197(BT-88)-Procedure} // Unpublished Justification Code
@@ -41,7 +36,6 @@
 			{ND-ProcedurePlacePerformance[BT-728-Procedure is present]} #{field|name|BT-728-Procedure}: ${BT-728-Procedure} // Place Performance Additional information
 		3 {ND-ProcedureProcurementScope[(BT-27-Procedure is present) or (BT-271-Procedure is present)]} #{auxiliary|text|value} // 2.1.3 Value
 			{BT-27-Procedure} #{field|name|BT-27-Procedure}: ${format-number(BT-27-Procedure, '###,##0.##')} ${BT-27-Procedure/@currencyID} // Estimated value
-			{BT-271-Procedure} #{field|name|BT-271-Procedure}: ${format-number(BT-271-Procedure, '###,##0.##')} ${BT-271-Procedure/@currencyID} // Estimated Framework Maximum Value
 		4 {ND-ProcedureProcurementScope[BT-01-notice is present]} #{auxiliary|text|general-information} // 2.1.4 General information
 			{BT-634-Procedure[BT-634-Procedure == TRUE]} #{field|name|BT-634-Procedure} // Procurement Relaunch
 			{ND-ProcedureProcurementScope[BT-300-Procedure is present]} #{field|name|BT-300-Procedure}: ${BT-300-Procedure} // Additional information
@@ -49,11 +43,10 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
-					{BT-197(BT-09)-Procedure} #{field|name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
-					{ND-Root[BT-196(BT-09)-Procedure is present]} #{field|name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
-					{BT-198(BT-09)-Procedure} #{field|name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
+				{BT-197(BT-09)-Procedure} #{name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
+				{ND-Root[BT-196(BT-09)-Procedure is present]} #{name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
+				{BT-198(BT-09)-Procedure} #{name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
 4 {ND-Root[BT-137-LotsGroup is present]} #{auxiliary|text|group-of-lots} // 4. Group of lots
 	1 {ND-LotsGroup} #{field|name|BT-330-Procedure}: ${BT-137-LotsGroup} // 4.1 Group of lots
 		{BT-137-LotsGroup} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-137-LotsGroup return BT-1375-Procedure[BT-330-Procedure == $gloid]} // Lots included / Group Lot Identifier 
@@ -62,7 +55,6 @@
 		{BT-22-LotsGroup} #{field|name|BT-22-LotsGroup}: ${BT-22-LotsGroup} // Internal identifier of LotsGroup
 		1 {BT-137-LotsGroup[(BT-27-LotsGroup is present) or (BT-271-LotsGroup is present) or (BT-157-LotsGroup is present)]} #{auxiliary|text|value} // 4.1.1 Value
 			{BT-27-LotsGroup} #{field|name|BT-27-LotsGroup}: ${format-number(BT-27-LotsGroup, '###,##0.##')} ${BT-27-LotsGroup/@currencyID} // Estimated value
-			{BT-271-LotsGroup} #{field|name|BT-271-LotsGroup}: ${format-number(BT-271-LotsGroup, '###,##0.##')} ${BT-271-LotsGroup/@currencyID} // Framework Maximum Value
 		2 {ND-LotsGroupProcurementScope[BT-300-LotsGroup is present]} #{auxiliary|text|general-information} // 4.1.2 General information
 			{BT-137-LotsGroup[BT-300-LotsGroup is present]} #{field|name|BT-300-LotsGroup}: ${BT-300-LotsGroup} // Additional information
 		3 {ND-LotsGroupAwardCriteria} #{auxiliary|text|award-criteria} // 4.1.3 Award criteria
@@ -139,7 +131,6 @@
 			{ND-OptionsAndRenewals[BT-57-Lot is present]} #{field|name|BT-57-Lot}: ${BT-57-Lot} // Description
 		5 {ND-LotValueEstimate[(BT-27-Lot is present) or (BT-271-Lot is present) or (some text:$glo in (for text:$lotid in BT-137-Lot, text:$ldgloid in BT-330-Procedure[BT-1375-Procedure == $lotid], text:$gloid in BT-137-LotsGroup[BT-137-LotsGroup[BT-157-LotsGroup is present] == $ldgloid] return $gloid) satisfies $glo != '')]} #{auxiliary|text|value} // 5.1.5 Value
 			{BT-27-Lot} #{field|name|BT-27-Lot}: ${format-number(BT-27-Lot, '###,##0.##')} ${BT-27-Lot/@currencyID} // Estimated value
-			{BT-271-Lot} #{field|name|BT-271-Lot}: ${format-number(BT-271-Lot, '###,##0.##')} ${BT-271-Lot/@currencyID} // Framework Maximum Value
 		6 {BT-137-Lot[(BT-634-Lot == TRUE) or (BT-94-Lot == TRUE) or (BT-95-Lot is present) or (BT-71-Lot is present) or (BT-79-Lot is present) or (BT-60-Lot == 'eu-funds') or (BT-7220-Lot is present) or (BT-5010-Lot is present) or (BT-6140-Lot is present) or (BT-115-Lot == TRUE) or (BT-726-Lot == TRUE) or (BT-125(i)-Lot is present) or (BT-1251-Lot is present) or (BT-300-Lot is present)]} #{auxiliary|text|general-information} // 5.1.6 General information
 			{BT-634-Lot[BT-634-Lot == TRUE]} #{field|name|BT-634-Lot} // This cancelled or unsuccessful procedure or lot will be relaunched (only true allowed).
 			{BT-60-Lot} #value // EU Funds
@@ -155,6 +146,8 @@
 			{BT-805-Lot} #{field|name|BT-805-Lot}: #{BT-805-Lot} // Green Procurement Criteria
 			{BT-775-Lot} #{field|name|BT-775-Lot}: #{BT-775-Lot} // Social Procurement
 			{BT-776-Lot} #{field|name|BT-776-Lot}: #{BT-776-Lot} // Procurement of Innovation
+			0 {ND-StrategicProcurementLot[BT-717-Lot == 'true']} #{field|name|BT-717-Lot} // Clean Vehicles Directive
+				{BT-735-Lot} #{field|name|BT-735-Lot} #{BT-735-Lot} // CVD Contract Type
 		8 {ND-AccessibilityJustification} #{auxiliary|text|accessibility} // 5.1.8 Accessibility criteria
 			{BT-754-Lot} #{BT-754-Lot} // Accessibility 
 			{BT-137-Lot[BT-755-Lot is present]} #{field|name|BT-755-Lot}: ${BT-755-Lot} // Accessibility Justification
@@ -203,7 +196,6 @@
 		12 {BT-137-Lot[(BT-631-Lot is present) or (BT-130-Lot is present) or (BT-578-Lot == 'true') or (BT-732-Lot is present) or (BT-78-Lot is present) or (BT-42-Lot == TRUE) or (BT-46-Lot is present) or (BT-47-Lot is present) or (BT-644-Lot is present) or (BT-44-Lot is present) or (BT-41-Lot == TRUE) or (BT-45-Lot is present) or (BT-651-Lot is present) or (BT-17-Lot is present) or (BT-18-Lot is present) or (BT-19-Lot is present) or (BT-745-Lot is present) or (BT-97-Lot is present) or (BT-764-Lot is present) or (BT-744-Lot is present) or (BT-63-Lot is present) or (BT-769-Lot == 'allowed') or (BT-75-Lot is present) or (BT-630(d)-Lot is present) or (BT-1311(d)-Lot is present) or (BT-131(d)-Lot is present) or (BT-98-Lot is present) or ((BT-771-Lot is present) and (BT-772-Lot is present)) or (BT-132(d)-Lot is present) or (BT-133-Lot is present) or (BT-134-Lot is present) or (BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present) or (BT-99-Lot is present) or (OPP-020-Contract is present)]} #{auxiliary|text|procurement-terms} // 5.1.12 Procurement terms
 			{BT-137-Lot[BT-99-Lot is present]} #{field|name|BT-99-Lot}: ${BT-99-Lot} // Information about review deadlines
 		15 {ND-LotTenderingProcess[(BT-765-Lot is present) or (BT-113-Lot is present) or (BT-109-Lot is present) or (BT-111-Lot is present) or (BT-766-Lot is present) or (BT-119-LotResult == TRUE) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|techniques} // 5.1.15 Techniques
-			0 {ND-AuctionTerms[(BT-767-Lot is present) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|electronic-auction}: // Electronic auction #{code|name|indicator.true}
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
 			{BT-137-Lot[OPT-301-Lot-Mediator is present]} #{auxiliary|text|organisation-mediation}: ${for text:$refid in OPT-301-Lot-Mediator, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Mediation organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewOrg is present]} #{auxiliary|text|organisation-review}: ${for text:$refid in OPT-301-Lot-ReviewOrg, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Review organisation (Lot)
@@ -213,20 +205,20 @@
 			{BT-137-Lot[OPT-301-Lot-AddInfo is present]} #{auxiliary|text|organisation-providing-info-procedure}: ${for text:$refid in OPT-301-Lot-AddInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation providing additional information about the procurement procedure (Lot)
 			{BT-137-Lot[OPT-301-Lot-DocProvider is present]} #{auxiliary|text|organisation-providing-docs}: ${for text:$refid in OPT-301-Lot-DocProvider, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Documents provider organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-financing}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Financing Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-paying}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Paying Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$conid1 in OPT-315-LotResult[BT-13713-LotResult == $lotid1], text:$orgid1 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-signing-contract}: ${distinct-values(for text:$lotid2 in BT-137-Lot, text:$conid2 in OPT-315-LotResult[BT-13713-LotResult == $lotid2], text:$orgid2 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname)} // Contract Signatory (LotResult)
-6 {ND-Root[(BT-13713-LotResult is present)]} #{auxiliary|text|results} // 6. Results
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
+6 {ND-Root[(BT-3201-Tender is present)]} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} ${BT-161-NoticeResult/@currencyID} // Notice Value (Value of all contracts awarded in this procedure)
 	0 {ND-NoticeResult[BT-161-NoticeResult == -1]} #{field|name|BT-161-NoticeResult}: #{auxiliary|text|unpublished} // Notice Value (Value of all contracts awarded in this procedure) (unpublished)
 		{ND-NoticeValueUnpublish} #{field|name|BT-197(BT-161)-NoticeResult}: #{BT-197(BT-161)-NoticeResult} // Unpublished Justification Code
 		{ND-NoticeValueUnpublish[BT-196(BT-161)-NoticeResult is present]} #{field|name|BT-196(BT-161)-NoticeResult}: ${BT-196(BT-161)-NoticeResult} // Unpublished Justification Description
 		{ND-NoticeValueUnpublish[BT-198(BT-161)-NoticeResult is present]} #{field|name|BT-198(BT-161)-NoticeResult}: ${BT-198(BT-161)-NoticeResult} // Unpublished Access Date
 	0 {ND-DirectAward} #{auxiliary|text|direct-award}: // Direct award
-		0 {ND-DirectAward[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
-		0 {ND-DirectAward[BT-136-Procedure == 'unpublished']} #{field|name|BT-136-Procedure}: #{auxiliary|text|unpublished} // Justification for direct award (unpublished)
+		0 {BT-136-Procedure[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
+		0 {BT-136-Procedure[BT-136-Procedure == 'unpublished']} #{field|name|BT-136-Procedure}: #{auxiliary|text|unpublished} // Justification for direct award (unpublished)
 			{ND-DirectAwardJustificationCodeUnpublish} #{field|name|BT-197(BT-136)-Procedure}: #{BT-197(BT-136)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationCodeUnpublish[BT-196(BT-136)-Procedure is present]} #{field|name|BT-196(BT-136)-Procedure}: ${BT-196(BT-136)-Procedure} // Unpublished Justification Description
 			{ND-DirectAwardJustificationCodeUnpublish[BT-198(BT-136)-Procedure is present]} #{field|name|BT-198(BT-136)-Procedure}: ${BT-198(BT-136)-Procedure} // Unpublished Access Date
@@ -235,7 +227,7 @@
 			{ND-DirectAwardJustificationTextUnpublish} #{field|name|BT-197(BT-135)-Procedure}: #{BT-197(BT-135)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationTextUnpublish[BT-196(BT-135)-Procedure is present]} #{field|name|BT-196(BT-135)-Procedure}: ${BT-196(BT-135)-Procedure} // Unpublished Justification Description
 			{ND-DirectAwardJustificationTextUnpublish[BT-198(BT-135)-Procedure is present]} #{field|name|BT-198(BT-135)-Procedure}: ${BT-198(BT-135)-Procedure} // Unpublished Access Date
-		0 {ND-DirectAward[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
+		0 {BT-1252-Procedure[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
 		0 {ND-DirectAward[BT-1252-Procedure == 'unpublished']} #{field|name|BT-1252-Procedure}: #{auxiliary|text|unpublished} // Identifier of the previous procedure that justifies direct award (unpublished)
 			{ND-DirectAwardJustificationPreviousUnpublish} #{field|name|BT-197(BT-1252)-Procedure}: #{BT-197(BT-1252)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationPreviousUnpublish[BT-196(BT-1252)-Procedure is present]} #{field|name|BT-196(BT-1252)-Procedure}: ${BT-196(BT-1252)-Procedure} // Unpublished Justification Description
@@ -253,9 +245,11 @@
 			{BT-198(BT-144)-LotResult[BT-198(BT-144)-LotResult is present]} #{field|name|BT-198(BT-144)-LotResult}: ${BT-198(BT-144)-LotResult} // Unpublished Access Date
 		2 {ND-LotResult[BT-02-notice == 'veat' or BT-02-notice == 'can-modif' or ((BT-142-LotResult == 'selec-w' or BT-142-LotResult == 'unpublished') and OPT-320-LotResult is present and OPT-315-LotResult is present)]} #{auxiliary|text|winner-info} // 6.1.2. Winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]])>0]} #{auxiliary|text|winner}: // Winner
-				{OPT-320-LotResult} #{field|name|BT-500-Organization-Company}: ${for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa or OPT-170-Tenderer[OPT-210-Tenderer == $tpa] == TRUE]), text:$org in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($org, '
')} // Name of this winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Name of this winner (single organisation in Tendering Party)
 				0 {OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{auxiliary|text|winner-subcontractor}: // Subcontractors of the winner
-					{OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{field|name|BT-500-Business}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid]} // Subcontractor name
+					{OPT-320-LotResult[some text:$orgname1 in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $orgname1 != '']} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]], text:$orgname2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($orgname2, ', ')} // Subcontractor names
 				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]])>0]} #{auxiliary|text|tender}: // Tender
 				{OPT-320-LotResult} #{field|name|BT-3201-Tender}: ${for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender == $tender]} // Tender identifier
 				{OPT-320-LotResult} #{field|name|BT-13714-Tender}: ${for text:$tender in OPT-320-LotResult return BT-13714-Tender[OPT-321-Tender == $tender]} // Identifier of lot or group of lots
@@ -280,7 +274,7 @@
 						{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-163)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-163)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-163)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 						{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-163)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-163)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-163)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 						{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-163)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-163)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-163)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender} // The tender is a variant
+				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender}  // TODO The tender is a variant  0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender}    #{code|name|${if (some indicator:$bool2 in (for text:$tender2 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender2]) satisfies $bool2 == TRUE) then 'indicator.true' else 'indicator.false' }}
 				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1]) satisfies $bool == FALSE) and (some text:$code in (for text:$tender2 in OPT-320-LotResult return BT-195(BT-193)-Tender[OPT-321-Tender == $tender2]) satisfies $code != '')]} #{field|name|BT-193-Tender}: #{auxiliary|text|unpublished} // The tender is a variant (unpublished)
 					0 {OPT-320-LotResult[(some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-193)-Tender[OPT-321-Tender == $tender1] ) satisfies $code != '')]} #{field|name|BT-197(BT-193)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-193)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					0 {OPT-320-LotResult[(some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-193)-Tender[OPT-321-Tender == $tender1] ) satisfies $desc != '')]} #{field|name|BT-196(BT-193)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-196(BT-193)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Description
@@ -290,8 +284,9 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-773)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-730-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
-					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-730-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-730-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties (unpublished)
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$code2 in BT-197(BT-730)-Tender[OPT-321-Tender == $tender2] return $code2} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $desc != '']} #{field|name|BT-196(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc1 in BT-196(BT-730)-Tender[OPT-321-Tender == $tender2] return $desc1} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-553-Tender[BT-553-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-553-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-553-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} ${for text:$tender3 in OPT-320-LotResult return BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID} // Estimated value of the part of the contract that the contractor will subcontract to third parties
@@ -299,7 +294,8 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-553)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-731-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$spk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $spk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-731-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-731)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
@@ -318,16 +314,18 @@
 					{OPT-320-LotResult[some text:$title1 in (for text:$tender1 in OPT-320-LotResult return BT-721-Contract[BT-3202-Contract == $tender1]) satisfies $title1 != '']} #{field|name|BT-721-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$title2 in BT-721-Contract[BT-3202-Contract == $tender2] return $title2} // Contract title
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-1451-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z ]} #{field|name|BT-1451-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-1451-Contract[BT-3202-Contract == $tender2]} // Winning Decision date
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-145-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-145-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-145-Contract[BT-3202-Contract == $tender2]} // Contract Conclusion Date
-					{OPT-320-LotResult} #{field|name|BT-768-Contract}: ${some indicator:$fa in (for text:$tender1 in OPT-320-LotResult return indicator:BT-768-Contract[BT-3202-Contract == $tender1]) satisfies $fa == TRUE } // Contract Framework Agreement
+					{OPT-320-LotResult} #{field|name|BT-768-Contract}: #{code|name|${if (some indicator:$fa in (for text:$tender1 in OPT-320-LotResult return indicator:BT-768-Contract[BT-3202-Contract == $tender1]) satisfies $fa == TRUE) then 'indicator.true' else 'indicator.false'}} // Contract Framework Agreement indicator.true
 					{OPT-320-LotResult[some text:$url in (for text:$tender1 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender1]) satisfies $url != '']} #{field|name|BT-151-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender2]} // Contract URL
 					0 {OPT-320-LotResult[some text:$contractid in (for text:$tender in OPT-320-LotResult return BT-3202-Contract[BT-3202-Contract[BT-5011-Contract is present or BT-722-Contract is present or BT-6110-Contract is present] == $tender]) satisfies $contractid != '']} #{auxiliary|text|eu-funds-used} // Information about European Union funds used to finance the contract
-						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Name
+						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$name in BT-722-Contract[BT-3202-Contract == $tender2] return $name} // Contract EU Funds Name
 						{OPT-320-LotResult[some text:$eufundid in (for text:$tender1 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender1]) satisfies $eufundid != '']} #{field|name|BT-5011-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Identifier
 						{OPT-320-LotResult[some text:$eufunddesc in (for text:$tender1 in OPT-320-LotResult return BT-6110-Contract[BT-3202-Contract == $tender1]) satisfies $eufunddesc != '']} #{field|name|BT-6110-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$details in BT-6110-Contract[BT-3202-Contract == $tender2] return $details} // Contract EU Funds Details
 					{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-300-Contract-Signatory[BT-3202-Contract == $tender1]) > 0]} #{auxiliary|text|organisation-signing-contract}: ${for text:$tender2 in OPT-320-LotResult, text:$orgid in OPT-300-Contract-Signatory[BT-3202-Contract == $tender2], text:$orgname in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return $orgname} // Organisation signing the contract
 		3 {ND-LotResult[count(for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender[count(OPT-316-Contract[BT-3202-Contract == $tender]) == 0] == $tender])>0]} #{auxiliary|text|non-winning-tender}: // 6.1.3. Non-winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender[count(OPT-316-Contract[BT-3202-Contract == $tender]) == 0] == $tender])>0]} #{auxiliary|text|organisation-tenderer}: // Non-winning tender
-				{OPT-320-LotResult} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]]} // Name of this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of this non-winning tenderer (single organisation in Tendering Party)
 		4 {ND-LotResult[(BT-712(a)-LotResult is present) or (BT-636-LotResult is present) or (BT-760-LotResult is present) or (BT-710-LotResult is present) or (BT-710-LotResult is present) or (BT-735-LotResult is present)]} #{auxiliary|text|statistical-information} // 6.1.4. Statistical information
 			0 {ND-BuyerReviewComplainants} #{auxiliary|text|review-requests-summary}: // Summary of the review requests the buyer received
 				0 {BT-712(b)-LotResult[BT-712(b)-LotResult != -1]} #{field|name|BT-712(b)-LotResult}: ${BT-712(b)-LotResult} // Buyer Review Complainants
@@ -366,15 +364,19 @@
 						{BT-197(BT-759)-LotResult} #{field|name|BT-197(BT-759)-LotResult}: #{BT-197(BT-759)-LotResult} // Unpublished Justification Code
 						{BT-759-LotResult[BT-196(BT-759)-LotResult is present]} #{field|name|BT-196(BT-759)-LotResult}: ${BT-196(BT-759)-LotResult} // Unpublished Justification Description
 						{BT-198(BT-759)-LotResult} #{field|name|BT-198(BT-759)-LotResult}: ${BT-198(BT-759)-LotResult} // Unpublished Access Date
+			0 {ND-StrategicProcurementLotResult} #{auxiliary|text|statistics-strategic}: // Statistics about strategic procurement
+				0 {BT-735-LotResult} #{field|name|BT-735-LotResult}: #value // The type of contract of the procurement procedure within the scope of Clean Vehicles Directive 2009/33/EC.
+					0 {BT-723-LotResult} #{field|name|BT-723-LotResult}: #value // The category of vehicle falling within the scope of Directive 2009/33/EC.
+						{OPT-155-LotResult} #{OPT-155-LotResult}: ${format-number(OPT-156-LotResult, '###,##0')} // Vehicle category and number
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
 		{BT-165-Organization-Company} #{field|name|BT-165-Organization-Company}: ${BT-165-Organization-Company} // Size of the economic operator
 		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -402,20 +404,16 @@
 		0 {ND-Organization} #{auxiliary|text|roles}: // Roles of this organisation
 			0 {ND-Organization[count(for text:$orgid in OPT-200-Organization-Company return OPT-300-Procedure-Buyer[OPT-300-Procedure-Buyer == $orgid])>0]} #{auxiliary|text|buyer} // This org is a Buyer
 				{OPP-050-Organization[OPP-050-Organization == TRUE]} #{field|name|OPP-050-Organization} // Leader of the group
-				{OPP-052-Organization[OPP-052-Organization == TRUE]} #{field|name|OPP-052-Organization} // CPB Acquiring
-				{OPP-051-Organization[OPP-051-Organization == TRUE]} #{field|name|OPP-051-Organization} // CPB Awarding
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'serv-prov') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'serv-prov')]} #{auxiliary|text|organisation-providing-procurement-service} // This org is a Service Provider
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'ted-esen') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'ted-esen')]} #{auxiliary|text|organisation-esender} // This org is an eSender
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-300-Contract-Signatory) or (OPT-201-Organization-TouchPoint == OPT-300-Contract-Signatory)]} #{auxiliary|text|organisation-signing-contract} // Contract Signatory organisation (SettledContract)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Financing) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Financing)]} #{auxiliary|text|organisation-financing} // Financing Organisation (LotResult)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Paying) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Paying)]} #{auxiliary|text|organisation-paying} // Paying Organisation (LotResult)
@@ -449,6 +447,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/33.efx b/view-templates/33.efx
index 2fbdfa676..cd80100c9 100644
--- a/view-templates/33.efx
+++ b/view-templates/33.efx
@@ -48,11 +48,10 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
-					{BT-197(BT-09)-Procedure} #{field|name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
-					{ND-Root[BT-196(BT-09)-Procedure is present]} #{field|name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
-					{BT-198(BT-09)-Procedure} #{field|name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
+				{BT-197(BT-09)-Procedure} #{name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
+				{ND-Root[BT-196(BT-09)-Procedure is present]} #{name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
+				{BT-198(BT-09)-Procedure} #{name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
 4 {ND-Root[BT-137-LotsGroup is present]} #{auxiliary|text|group-of-lots} // 4. Group of lots
 	1 {ND-LotsGroup} #{field|name|BT-330-Procedure}: ${BT-137-LotsGroup} // 4.1 Group of lots
 		{BT-137-LotsGroup} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-137-LotsGroup return BT-1375-Procedure[BT-330-Procedure == $gloid]} // Lots included / Group Lot Identifier 
@@ -154,6 +153,8 @@
 			{BT-805-Lot} #{field|name|BT-805-Lot}: #{BT-805-Lot} // Green Procurement Criteria
 			{BT-775-Lot} #{field|name|BT-775-Lot}: #{BT-775-Lot} // Social Procurement
 			{BT-776-Lot} #{field|name|BT-776-Lot}: #{BT-776-Lot} // Procurement of Innovation
+			0 {ND-StrategicProcurementLot[BT-717-Lot == 'true']} #{field|name|BT-717-Lot} // Clean Vehicles Directive
+				{BT-735-Lot} #{field|name|BT-735-Lot} #{BT-735-Lot} // CVD Contract Type
 		8 {ND-AccessibilityJustification} #{auxiliary|text|accessibility} // 5.1.8 Accessibility criteria
 			{BT-754-Lot} #{BT-754-Lot} // Accessibility 
 			{BT-137-Lot[BT-755-Lot is present]} #{field|name|BT-755-Lot}: ${BT-755-Lot} // Accessibility Justification
@@ -204,13 +205,10 @@
 		15 {ND-LotTenderingProcess[(BT-765-Lot is present) or (BT-113-Lot is present) or (BT-109-Lot is present) or (BT-111-Lot is present) or (BT-766-Lot is present) or (BT-119-LotResult == TRUE) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|techniques} // 5.1.15 Techniques
 			0 {ND-LotTenderingProcess[(BT-765-Lot is present) or (BT-113-Lot is present) or (BT-109-Lot is present) or (BT-111-Lot is present)]} #{auxiliary|text|framework-agreement}: // Information about framework agreement
 				{BT-765-Lot} #{BT-765-Lot} // Framework Agreement Type
-				{BT-113-Lot} #{field|name|BT-113-Lot}: ${BT-113-Lot} // Maximum number of participants
-				{BT-137-Lot[BT-109-Lot is present]} #{field|name|BT-109-Lot}: ${BT-109-Lot} // Justification for the duration of framework agreement
 				{BT-137-Lot[BT-111-Lot is present]} #{field|name|BT-111-Lot}: ${BT-111-Lot} // Framework Buyer Categories (Lot)
-			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system} // Dynamic purchasing system 
+			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system}: // Information about the dynamic purchasing system
 				{BT-766-Lot} #{BT-766-Lot} // Dynamic Purchasing System
 				{BT-137-Lot[some indicator:$dpst in (for text:$lotid in BT-137-Lot return BT-119-LotResult[BT-13713-LotResult == $lotid]) satisfies $dpst == TRUE]} #{field|name|BT-119-LotResult} // The dynamic purchasing system is terminated. (true/false)
-			0 {ND-AuctionTerms[(BT-767-Lot is present) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|electronic-auction}: // Electronic auction #{code|name|indicator.true}
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
 			{BT-137-Lot[OPT-301-Lot-Mediator is present]} #{auxiliary|text|organisation-mediation}: ${for text:$refid in OPT-301-Lot-Mediator, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Mediation organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewOrg is present]} #{auxiliary|text|organisation-review}: ${for text:$refid in OPT-301-Lot-ReviewOrg, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Review organisation (Lot)
@@ -220,12 +218,12 @@
 			{BT-137-Lot[OPT-301-Lot-AddInfo is present]} #{auxiliary|text|organisation-providing-info-procedure}: ${for text:$refid in OPT-301-Lot-AddInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation providing additional information about the procurement procedure (Lot)
 			{BT-137-Lot[OPT-301-Lot-DocProvider is present]} #{auxiliary|text|organisation-providing-docs}: ${for text:$refid in OPT-301-Lot-DocProvider, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Documents provider organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-financing}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Financing Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-paying}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Paying Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$conid1 in OPT-315-LotResult[BT-13713-LotResult == $lotid1], text:$orgid1 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-signing-contract}: ${distinct-values(for text:$lotid2 in BT-137-Lot, text:$conid2 in OPT-315-LotResult[BT-13713-LotResult == $lotid2], text:$orgid2 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname)} // Contract Signatory (LotResult)
-6 {ND-Root[(BT-13713-LotResult is present)]} #{auxiliary|text|results} // 6. Results
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
+6 {ND-Root[(BT-3201-Tender is present)]} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} ${BT-161-NoticeResult/@currencyID} // Notice Value (Value of all contracts awarded in this procedure)
 	0 {ND-NoticeResult[BT-161-NoticeResult == -1]} #{field|name|BT-161-NoticeResult}: #{auxiliary|text|unpublished} // Notice Value (Value of all contracts awarded in this procedure) (unpublished)
 		{ND-NoticeValueUnpublish} #{field|name|BT-197(BT-161)-NoticeResult}: #{BT-197(BT-161)-NoticeResult} // Unpublished Justification Code
@@ -241,6 +239,18 @@
 		{ND-NoticeApproximateValueUnpublish} #{field|name|BT-197(BT-1118)-NoticeResult}: #{BT-197(BT-1118)-NoticeResult} // Unpublished Justification Code
 		{ND-NoticeApproximateValueUnpublish[BT-196(BT-1118)-NoticeResult is present]} #{field|name|BT-196(BT-1118)-NoticeResult}: ${BT-196(BT-1118)-NoticeResult} // Unpublished Justification Description
 		{ND-NoticeApproximateValueUnpublish[BT-198(BT-1118)-NoticeResult is present]} #{field|name|BT-198(BT-1118)-NoticeResult}: ${BT-198(BT-1118)-NoticeResult} // Unpublished Access Date
+	0 {ND-NoticeResultGroupFA[BT-556-NoticeResult != 'unpublished']} #{auxiliary|text|group-framework-value}: ${BT-556-NoticeResult} // Value of the framework agreements in this group of lots
+		0 {ND-NoticeResultGroupFA} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-556-NoticeResult return BT-1375-Procedure[BT-330-Procedure == $gloid] } // Lots included: LOT-0001, LOT-0003
+		0 {BT-156-NoticeResult[BT-156-NoticeResult != -1]} #{field|name|BT-156-NoticeResult}: ${format-number(BT-156-NoticeResult, '###,##0.##')} ${BT-156-NoticeResult/@currencyID} // Maximum value of the framework agreements in this group of lots
+		0 {BT-156-NoticeResult[BT-156-NoticeResult == -1]} #{field|name|BT-156-NoticeResult}:#{auxiliary|text|unpublished} // Maximum value of the framework agreements in this group of lots (unpublished)
+			{ND-GroupMaximumValueUnpublish} #{field|name|BT-197(BT-156)-NoticeResult}: #{BT-197(BT-156)-NoticeResult} // Unpublished Justification Code
+			{ND-GroupMaximumValueUnpublish[BT-196(BT-156)-NoticeResult is present]} #{field|name|BT-196(BT-156)-NoticeResult}: ${BT-196(BT-156)-NoticeResult} // Unpublished Justification Description
+			{ND-GroupMaximumValueUnpublish[BT-198(BT-156)-NoticeResult is present]} #{field|name|BT-198(BT-156)-NoticeResult}: ${BT-198(BT-156)-NoticeResult} // Unpublished Access Date
+		0 {BT-1561-NoticeResult[BT-1561-NoticeResult != -1]} #{field|name|BT-1561-NoticeResult}: ${format-number(BT-1561-NoticeResult, '###,##0.##')} ${BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID} // Re-estimated value of the framework agreements within a group of lots
+		0 {BT-1561-NoticeResult[BT-1561-NoticeResult == -1]} #{field|name|BT-1561-NoticeResult}: #{auxiliary|text|unpublished} // Re-estimated value of the framework agreements within a group of lots (unpublished)
+			{ND-GroupReestimatedValueUnpublish} #{field|name|BT-197(BT-1561)-NoticeResult}: #{BT-197(BT-1561)-NoticeResult} // Unpublished Justification Code
+			{ND-GroupReestimatedValueUnpublish[BT-196(BT-1561)-NoticeResult is present]} #{field|name|BT-196(BT-1561)-NoticeResult}: ${BT-196(BT-1561)-NoticeResult} // Unpublished Justification Description
+			{ND-GroupReestimatedValueUnpublish[BT-198(BT-1561)-NoticeResult is present]} #{field|name|BT-198(BT-1561)-NoticeResult}: ${BT-198(BT-1561)-NoticeResult} // Unpublished Access Date
 	0 {ND-NoticeResultGroupFA[BT-556-NoticeResult == 'unpublished']} #{auxiliary|text|group-framework-value}: #{auxiliary|text|unpublished} // Value of the framework agreements in this group of lots (unpublished)
 		{ND-GroupMaximalValueIdentifierUnpublish} #{field|name|BT-197(BT-556)-NoticeResult}: #{BT-197(BT-556)-NoticeResult} // Unpublished Justification Code
 		{ND-GroupMaximalValueIdentifierUnpublish[BT-196(BT-556)-NoticeResult is present]} #{field|name|BT-196(BT-556)-NoticeResult}: ${BT-196(BT-556)-NoticeResult} // Unpublished Justification Description
@@ -257,8 +267,8 @@
 			{ND-GroupReestimatedValueUnpublish[BT-196(BT-1561)-NoticeResult is present]} #{field|name|BT-196(BT-1561)-NoticeResult}: ${BT-196(BT-1561)-NoticeResult} // Unpublished Justification Description
 			{ND-GroupReestimatedValueUnpublish[BT-198(BT-1561)-NoticeResult is present]} #{field|name|BT-198(BT-1561)-NoticeResult}: ${BT-198(BT-1561)-NoticeResult} // Unpublished Access Date
 	0 {ND-DirectAward} #{auxiliary|text|direct-award}: // Direct award
-		0 {ND-DirectAward[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
-		0 {ND-DirectAward[BT-136-Procedure == 'unpublished']} #{field|name|BT-136-Procedure}: #{auxiliary|text|unpublished} // Justification for direct award (unpublished)
+		0 {BT-136-Procedure[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
+		0 {BT-136-Procedure[BT-136-Procedure == 'unpublished']} #{field|name|BT-136-Procedure}: #{auxiliary|text|unpublished} // Justification for direct award (unpublished)
 			{ND-DirectAwardJustificationCodeUnpublish} #{field|name|BT-197(BT-136)-Procedure}: #{BT-197(BT-136)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationCodeUnpublish[BT-196(BT-136)-Procedure is present]} #{field|name|BT-196(BT-136)-Procedure}: ${BT-196(BT-136)-Procedure} // Unpublished Justification Description
 			{ND-DirectAwardJustificationCodeUnpublish[BT-198(BT-136)-Procedure is present]} #{field|name|BT-198(BT-136)-Procedure}: ${BT-198(BT-136)-Procedure} // Unpublished Access Date
@@ -267,7 +277,7 @@
 			{ND-DirectAwardJustificationTextUnpublish} #{field|name|BT-197(BT-135)-Procedure}: #{BT-197(BT-135)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationTextUnpublish[BT-196(BT-135)-Procedure is present]} #{field|name|BT-196(BT-135)-Procedure}: ${BT-196(BT-135)-Procedure} // Unpublished Justification Description
 			{ND-DirectAwardJustificationTextUnpublish[BT-198(BT-135)-Procedure is present]} #{field|name|BT-198(BT-135)-Procedure}: ${BT-198(BT-135)-Procedure} // Unpublished Access Date
-		0 {ND-DirectAward[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
+		0 {BT-1252-Procedure[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
 		0 {ND-DirectAward[BT-1252-Procedure == 'unpublished']} #{field|name|BT-1252-Procedure}: #{auxiliary|text|unpublished} // Identifier of the previous procedure that justifies direct award (unpublished)
 			{ND-DirectAwardJustificationPreviousUnpublish} #{field|name|BT-197(BT-1252)-Procedure}: #{BT-197(BT-1252)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationPreviousUnpublish[BT-196(BT-1252)-Procedure is present]} #{field|name|BT-196(BT-1252)-Procedure}: ${BT-196(BT-1252)-Procedure} // Unpublished Justification Description
@@ -296,9 +306,11 @@
 				{ND-ReestimatedValueUnpublish[BT-198(BT-660)-LotResult is present]} #{field|name|BT-198(BT-660)-LotResult}: ${BT-198(BT-660)-LotResult} // Unpublished Access Date
 		2 {ND-LotResult[BT-02-notice == 'veat' or BT-02-notice == 'can-modif' or ((BT-142-LotResult == 'selec-w' or BT-142-LotResult == 'unpublished') and OPT-320-LotResult is present and OPT-315-LotResult is present)]} #{auxiliary|text|winner-info} // 6.1.2. Winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]])>0]} #{auxiliary|text|winner}: // Winner
-				{OPT-320-LotResult} #{field|name|BT-500-Organization-Company}: ${for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa or OPT-170-Tenderer[OPT-210-Tenderer == $tpa] == TRUE]), text:$org in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($org, '
')} // Name of this winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Name of this winner (single organisation in Tendering Party)
 				0 {OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{auxiliary|text|winner-subcontractor}: // Subcontractors of the winner
-					{OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{field|name|BT-500-Business}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid]} // Subcontractor name
+					{OPT-320-LotResult[some text:$orgname1 in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $orgname1 != '']} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]], text:$orgname2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($orgname2, ', ')} // Subcontractor names
 				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]])>0]} #{auxiliary|text|tender}: // Tender
 				{OPT-320-LotResult} #{field|name|BT-3201-Tender}: ${for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender == $tender]} // Tender identifier
 				{OPT-320-LotResult} #{field|name|BT-13714-Tender}: ${for text:$tender in OPT-320-LotResult return BT-13714-Tender[OPT-321-Tender == $tender]} // Identifier of lot or group of lots
@@ -313,7 +325,7 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-171)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-171)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-171)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender} // The tender is a variant
+				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender}  // TODO The tender is a variant  0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender}    #{code|name|${if (some indicator:$bool2 in (for text:$tender2 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender2]) satisfies $bool2 == TRUE) then 'indicator.true' else 'indicator.false' }}
 				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1]) satisfies $bool == FALSE) and (some text:$code in (for text:$tender2 in OPT-320-LotResult return BT-195(BT-193)-Tender[OPT-321-Tender == $tender2]) satisfies $code != '')]} #{field|name|BT-193-Tender}: #{auxiliary|text|unpublished} // The tender is a variant (unpublished)
 					0 {OPT-320-LotResult[(some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-193)-Tender[OPT-321-Tender == $tender1] ) satisfies $code != '')]} #{field|name|BT-197(BT-193)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-193)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					0 {OPT-320-LotResult[(some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-193)-Tender[OPT-321-Tender == $tender1] ) satisfies $desc != '')]} #{field|name|BT-196(BT-193)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-196(BT-193)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Description
@@ -323,8 +335,9 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-773)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-730-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
-					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-730-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-730-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties (unpublished)
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$code2 in BT-197(BT-730)-Tender[OPT-321-Tender == $tender2] return $code2} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $desc != '']} #{field|name|BT-196(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc1 in BT-196(BT-730)-Tender[OPT-321-Tender == $tender2] return $desc1} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-553-Tender[BT-553-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-553-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-553-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} ${for text:$tender3 in OPT-320-LotResult return BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID} // Estimated value of the part of the contract that the contractor will subcontract to third parties
@@ -332,7 +345,8 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-553)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-731-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$spk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $spk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-731-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-731)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
@@ -351,16 +365,18 @@
 					{OPT-320-LotResult[some text:$title1 in (for text:$tender1 in OPT-320-LotResult return BT-721-Contract[BT-3202-Contract == $tender1]) satisfies $title1 != '']} #{field|name|BT-721-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$title2 in BT-721-Contract[BT-3202-Contract == $tender2] return $title2} // Contract title
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-1451-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z ]} #{field|name|BT-1451-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-1451-Contract[BT-3202-Contract == $tender2]} // Winning Decision date
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-145-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-145-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-145-Contract[BT-3202-Contract == $tender2]} // Contract Conclusion Date
-					{OPT-320-LotResult} #{field|name|BT-768-Contract}: ${some indicator:$fa in (for text:$tender1 in OPT-320-LotResult return indicator:BT-768-Contract[BT-3202-Contract == $tender1]) satisfies $fa == TRUE } // Contract Framework Agreement
+					{OPT-320-LotResult} #{field|name|BT-768-Contract}: #{code|name|${if (some indicator:$fa in (for text:$tender1 in OPT-320-LotResult return indicator:BT-768-Contract[BT-3202-Contract == $tender1]) satisfies $fa == TRUE) then 'indicator.true' else 'indicator.false'}} // Contract Framework Agreement indicator.true
 					{OPT-320-LotResult[some text:$url in (for text:$tender1 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender1]) satisfies $url != '']} #{field|name|BT-151-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender2]} // Contract URL
 					0 {OPT-320-LotResult[some text:$contractid in (for text:$tender in OPT-320-LotResult return BT-3202-Contract[BT-3202-Contract[BT-5011-Contract is present or BT-722-Contract is present or BT-6110-Contract is present] == $tender]) satisfies $contractid != '']} #{auxiliary|text|eu-funds-used} // Information about European Union funds used to finance the contract
-						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Name
+						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$name in BT-722-Contract[BT-3202-Contract == $tender2] return $name} // Contract EU Funds Name
 						{OPT-320-LotResult[some text:$eufundid in (for text:$tender1 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender1]) satisfies $eufundid != '']} #{field|name|BT-5011-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Identifier
 						{OPT-320-LotResult[some text:$eufunddesc in (for text:$tender1 in OPT-320-LotResult return BT-6110-Contract[BT-3202-Contract == $tender1]) satisfies $eufunddesc != '']} #{field|name|BT-6110-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$details in BT-6110-Contract[BT-3202-Contract == $tender2] return $details} // Contract EU Funds Details
 					{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-300-Contract-Signatory[BT-3202-Contract == $tender1]) > 0]} #{auxiliary|text|organisation-signing-contract}: ${for text:$tender2 in OPT-320-LotResult, text:$orgid in OPT-300-Contract-Signatory[BT-3202-Contract == $tender2], text:$orgname in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return $orgname} // Organisation signing the contract
 		3 {ND-LotResult[count(for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender[count(OPT-316-Contract[BT-3202-Contract == $tender]) == 0] == $tender])>0]} #{auxiliary|text|non-winning-tender}: // 6.1.3. Non-winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender[count(OPT-316-Contract[BT-3202-Contract == $tender]) == 0] == $tender])>0]} #{auxiliary|text|organisation-tenderer}: // Non-winning tender
-				{OPT-320-LotResult} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]]} // Name of this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of this non-winning tenderer (single organisation in Tendering Party)
 		4 {ND-LotResult[(BT-712(a)-LotResult is present) or (BT-636-LotResult is present) or (BT-760-LotResult is present) or (BT-710-LotResult is present) or (BT-710-LotResult is present) or (BT-735-LotResult is present)]} #{auxiliary|text|statistical-information} // 6.1.4. Statistical information
 			0 {ND-BuyerReviewComplainants} #{auxiliary|text|review-requests-summary}: // Summary of the review requests the buyer received
 				0 {BT-712(b)-LotResult[BT-712(b)-LotResult != -1]} #{field|name|BT-712(b)-LotResult}: ${BT-712(b)-LotResult} // Buyer Review Complainants
@@ -399,15 +415,19 @@
 						{BT-197(BT-759)-LotResult} #{field|name|BT-197(BT-759)-LotResult}: #{BT-197(BT-759)-LotResult} // Unpublished Justification Code
 						{BT-759-LotResult[BT-196(BT-759)-LotResult is present]} #{field|name|BT-196(BT-759)-LotResult}: ${BT-196(BT-759)-LotResult} // Unpublished Justification Description
 						{BT-198(BT-759)-LotResult} #{field|name|BT-198(BT-759)-LotResult}: ${BT-198(BT-759)-LotResult} // Unpublished Access Date
+			0 {ND-StrategicProcurementLotResult} #{auxiliary|text|statistics-strategic}: // Statistics about strategic procurement
+				0 {BT-735-LotResult} #{field|name|BT-735-LotResult}: #value // The type of contract of the procurement procedure within the scope of Clean Vehicles Directive 2009/33/EC.
+					0 {BT-723-LotResult} #{field|name|BT-723-LotResult}: #value // The category of vehicle falling within the scope of Directive 2009/33/EC.
+						{OPT-155-LotResult} #{OPT-155-LotResult}: ${format-number(OPT-156-LotResult, '###,##0')} // Vehicle category and number
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
 		{BT-165-Organization-Company} #{field|name|BT-165-Organization-Company}: ${BT-165-Organization-Company} // Size of the economic operator
 		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -441,14 +461,12 @@
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'ted-esen') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'ted-esen')]} #{auxiliary|text|organisation-esender} // This org is an eSender
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-300-Contract-Signatory) or (OPT-201-Organization-TouchPoint == OPT-300-Contract-Signatory)]} #{auxiliary|text|organisation-signing-contract} // Contract Signatory organisation (SettledContract)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Financing) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Financing)]} #{auxiliary|text|organisation-financing} // Financing Organisation (LotResult)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Paying) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Paying)]} #{auxiliary|text|organisation-paying} // Paying Organisation (LotResult)
@@ -482,6 +500,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/34.efx b/view-templates/34.efx
index be624ac5e..a4a3dd071 100644
--- a/view-templates/34.efx
+++ b/view-templates/34.efx
@@ -49,11 +49,10 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
-					{BT-197(BT-09)-Procedure} #{field|name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
-					{ND-Root[BT-196(BT-09)-Procedure is present]} #{field|name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
-					{BT-198(BT-09)-Procedure} #{field|name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
+				{BT-197(BT-09)-Procedure} #{name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
+				{ND-Root[BT-196(BT-09)-Procedure is present]} #{name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
+				{BT-198(BT-09)-Procedure} #{name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
 4 {ND-Root[BT-137-LotsGroup is present]} #{auxiliary|text|group-of-lots} // 4. Group of lots
 	1 {ND-LotsGroup} #{field|name|BT-330-Procedure}: ${BT-137-LotsGroup} // 4.1 Group of lots
 		{BT-137-LotsGroup} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-137-LotsGroup return BT-1375-Procedure[BT-330-Procedure == $gloid]} // Lots included / Group Lot Identifier 
@@ -155,6 +154,8 @@
 			{BT-805-Lot} #{field|name|BT-805-Lot}: #{BT-805-Lot} // Green Procurement Criteria
 			{BT-775-Lot} #{field|name|BT-775-Lot}: #{BT-775-Lot} // Social Procurement
 			{BT-776-Lot} #{field|name|BT-776-Lot}: #{BT-776-Lot} // Procurement of Innovation
+			0 {ND-StrategicProcurementLot[BT-717-Lot == 'true']} #{field|name|BT-717-Lot} // Clean Vehicles Directive
+				{BT-735-Lot} #{field|name|BT-735-Lot} #{BT-735-Lot} // CVD Contract Type
 		8 {ND-AccessibilityJustification} #{auxiliary|text|accessibility} // 5.1.8 Accessibility criteria
 			{BT-754-Lot} #{BT-754-Lot} // Accessibility 
 			{BT-137-Lot[BT-755-Lot is present]} #{field|name|BT-755-Lot}: ${BT-755-Lot} // Accessibility Justification
@@ -205,13 +206,10 @@
 		15 {ND-LotTenderingProcess[(BT-765-Lot is present) or (BT-113-Lot is present) or (BT-109-Lot is present) or (BT-111-Lot is present) or (BT-766-Lot is present) or (BT-119-LotResult == TRUE) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|techniques} // 5.1.15 Techniques
 			0 {ND-LotTenderingProcess[(BT-765-Lot is present) or (BT-113-Lot is present) or (BT-109-Lot is present) or (BT-111-Lot is present)]} #{auxiliary|text|framework-agreement}: // Information about framework agreement
 				{BT-765-Lot} #{BT-765-Lot} // Framework Agreement Type
-				{BT-113-Lot} #{field|name|BT-113-Lot}: ${BT-113-Lot} // Maximum number of participants
-				{BT-137-Lot[BT-109-Lot is present]} #{field|name|BT-109-Lot}: ${BT-109-Lot} // Justification for the duration of framework agreement
 				{BT-137-Lot[BT-111-Lot is present]} #{field|name|BT-111-Lot}: ${BT-111-Lot} // Framework Buyer Categories (Lot)
-			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system} // Dynamic purchasing system 
+			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system}: // Information about the dynamic purchasing system
 				{BT-766-Lot} #{BT-766-Lot} // Dynamic Purchasing System
 				{BT-137-Lot[some indicator:$dpst in (for text:$lotid in BT-137-Lot return BT-119-LotResult[BT-13713-LotResult == $lotid]) satisfies $dpst == TRUE]} #{field|name|BT-119-LotResult} // The dynamic purchasing system is terminated. (true/false)
-			0 {ND-AuctionTerms[(BT-767-Lot is present) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|electronic-auction}: // Electronic auction #{code|name|indicator.true}
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
 			{BT-137-Lot[OPT-301-Lot-Mediator is present]} #{auxiliary|text|organisation-mediation}: ${for text:$refid in OPT-301-Lot-Mediator, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Mediation organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewOrg is present]} #{auxiliary|text|organisation-review}: ${for text:$refid in OPT-301-Lot-ReviewOrg, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Review organisation (Lot)
@@ -221,12 +219,12 @@
 			{BT-137-Lot[OPT-301-Lot-AddInfo is present]} #{auxiliary|text|organisation-providing-info-procedure}: ${for text:$refid in OPT-301-Lot-AddInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation providing additional information about the procurement procedure (Lot)
 			{BT-137-Lot[OPT-301-Lot-DocProvider is present]} #{auxiliary|text|organisation-providing-docs}: ${for text:$refid in OPT-301-Lot-DocProvider, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Documents provider organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-financing}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Financing Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-paying}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Paying Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$conid1 in OPT-315-LotResult[BT-13713-LotResult == $lotid1], text:$orgid1 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-signing-contract}: ${distinct-values(for text:$lotid2 in BT-137-Lot, text:$conid2 in OPT-315-LotResult[BT-13713-LotResult == $lotid2], text:$orgid2 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname)} // Contract Signatory (LotResult)
-6 {ND-Root[(BT-13713-LotResult is present)]} #{auxiliary|text|results} // 6. Results
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
+6 {ND-Root[(BT-3201-Tender is present)]} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} ${BT-161-NoticeResult/@currencyID} // Notice Value (Value of all contracts awarded in this procedure)
 	0 {ND-NoticeResult[BT-161-NoticeResult == -1]} #{field|name|BT-161-NoticeResult}: #{auxiliary|text|unpublished} // Notice Value (Value of all contracts awarded in this procedure) (unpublished)
 		{ND-NoticeValueUnpublish} #{field|name|BT-197(BT-161)-NoticeResult}: #{BT-197(BT-161)-NoticeResult} // Unpublished Justification Code
@@ -242,6 +240,18 @@
 		{ND-NoticeApproximateValueUnpublish} #{field|name|BT-197(BT-1118)-NoticeResult}: #{BT-197(BT-1118)-NoticeResult} // Unpublished Justification Code
 		{ND-NoticeApproximateValueUnpublish[BT-196(BT-1118)-NoticeResult is present]} #{field|name|BT-196(BT-1118)-NoticeResult}: ${BT-196(BT-1118)-NoticeResult} // Unpublished Justification Description
 		{ND-NoticeApproximateValueUnpublish[BT-198(BT-1118)-NoticeResult is present]} #{field|name|BT-198(BT-1118)-NoticeResult}: ${BT-198(BT-1118)-NoticeResult} // Unpublished Access Date
+	0 {ND-NoticeResultGroupFA[BT-556-NoticeResult != 'unpublished']} #{auxiliary|text|group-framework-value}: ${BT-556-NoticeResult} // Value of the framework agreements in this group of lots
+		0 {ND-NoticeResultGroupFA} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-556-NoticeResult return BT-1375-Procedure[BT-330-Procedure == $gloid] } // Lots included: LOT-0001, LOT-0003
+		0 {BT-156-NoticeResult[BT-156-NoticeResult != -1]} #{field|name|BT-156-NoticeResult}: ${format-number(BT-156-NoticeResult, '###,##0.##')} ${BT-156-NoticeResult/@currencyID} // Maximum value of the framework agreements in this group of lots
+		0 {BT-156-NoticeResult[BT-156-NoticeResult == -1]} #{field|name|BT-156-NoticeResult}:#{auxiliary|text|unpublished} // Maximum value of the framework agreements in this group of lots (unpublished)
+			{ND-GroupMaximumValueUnpublish} #{field|name|BT-197(BT-156)-NoticeResult}: #{BT-197(BT-156)-NoticeResult} // Unpublished Justification Code
+			{ND-GroupMaximumValueUnpublish[BT-196(BT-156)-NoticeResult is present]} #{field|name|BT-196(BT-156)-NoticeResult}: ${BT-196(BT-156)-NoticeResult} // Unpublished Justification Description
+			{ND-GroupMaximumValueUnpublish[BT-198(BT-156)-NoticeResult is present]} #{field|name|BT-198(BT-156)-NoticeResult}: ${BT-198(BT-156)-NoticeResult} // Unpublished Access Date
+		0 {BT-1561-NoticeResult[BT-1561-NoticeResult != -1]} #{field|name|BT-1561-NoticeResult}: ${format-number(BT-1561-NoticeResult, '###,##0.##')} ${BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID} // Re-estimated value of the framework agreements within a group of lots
+		0 {BT-1561-NoticeResult[BT-1561-NoticeResult == -1]} #{field|name|BT-1561-NoticeResult}: #{auxiliary|text|unpublished} // Re-estimated value of the framework agreements within a group of lots (unpublished)
+			{ND-GroupReestimatedValueUnpublish} #{field|name|BT-197(BT-1561)-NoticeResult}: #{BT-197(BT-1561)-NoticeResult} // Unpublished Justification Code
+			{ND-GroupReestimatedValueUnpublish[BT-196(BT-1561)-NoticeResult is present]} #{field|name|BT-196(BT-1561)-NoticeResult}: ${BT-196(BT-1561)-NoticeResult} // Unpublished Justification Description
+			{ND-GroupReestimatedValueUnpublish[BT-198(BT-1561)-NoticeResult is present]} #{field|name|BT-198(BT-1561)-NoticeResult}: ${BT-198(BT-1561)-NoticeResult} // Unpublished Access Date
 	0 {ND-NoticeResultGroupFA[BT-556-NoticeResult == 'unpublished']} #{auxiliary|text|group-framework-value}: #{auxiliary|text|unpublished} // Value of the framework agreements in this group of lots (unpublished)
 		{ND-GroupMaximalValueIdentifierUnpublish} #{field|name|BT-197(BT-556)-NoticeResult}: #{BT-197(BT-556)-NoticeResult} // Unpublished Justification Code
 		{ND-GroupMaximalValueIdentifierUnpublish[BT-196(BT-556)-NoticeResult is present]} #{field|name|BT-196(BT-556)-NoticeResult}: ${BT-196(BT-556)-NoticeResult} // Unpublished Justification Description
@@ -258,8 +268,8 @@
 			{ND-GroupReestimatedValueUnpublish[BT-196(BT-1561)-NoticeResult is present]} #{field|name|BT-196(BT-1561)-NoticeResult}: ${BT-196(BT-1561)-NoticeResult} // Unpublished Justification Description
 			{ND-GroupReestimatedValueUnpublish[BT-198(BT-1561)-NoticeResult is present]} #{field|name|BT-198(BT-1561)-NoticeResult}: ${BT-198(BT-1561)-NoticeResult} // Unpublished Access Date
 	0 {ND-DirectAward} #{auxiliary|text|direct-award}: // Direct award
-		0 {ND-DirectAward[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
-		0 {ND-DirectAward[BT-136-Procedure == 'unpublished']} #{field|name|BT-136-Procedure}: #{auxiliary|text|unpublished} // Justification for direct award (unpublished)
+		0 {BT-136-Procedure[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
+		0 {BT-136-Procedure[BT-136-Procedure == 'unpublished']} #{field|name|BT-136-Procedure}: #{auxiliary|text|unpublished} // Justification for direct award (unpublished)
 			{ND-DirectAwardJustificationCodeUnpublish} #{field|name|BT-197(BT-136)-Procedure}: #{BT-197(BT-136)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationCodeUnpublish[BT-196(BT-136)-Procedure is present]} #{field|name|BT-196(BT-136)-Procedure}: ${BT-196(BT-136)-Procedure} // Unpublished Justification Description
 			{ND-DirectAwardJustificationCodeUnpublish[BT-198(BT-136)-Procedure is present]} #{field|name|BT-198(BT-136)-Procedure}: ${BT-198(BT-136)-Procedure} // Unpublished Access Date
@@ -268,7 +278,7 @@
 			{ND-DirectAwardJustificationTextUnpublish} #{field|name|BT-197(BT-135)-Procedure}: #{BT-197(BT-135)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationTextUnpublish[BT-196(BT-135)-Procedure is present]} #{field|name|BT-196(BT-135)-Procedure}: ${BT-196(BT-135)-Procedure} // Unpublished Justification Description
 			{ND-DirectAwardJustificationTextUnpublish[BT-198(BT-135)-Procedure is present]} #{field|name|BT-198(BT-135)-Procedure}: ${BT-198(BT-135)-Procedure} // Unpublished Access Date
-		0 {ND-DirectAward[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
+		0 {BT-1252-Procedure[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
 		0 {ND-DirectAward[BT-1252-Procedure == 'unpublished']} #{field|name|BT-1252-Procedure}: #{auxiliary|text|unpublished} // Identifier of the previous procedure that justifies direct award (unpublished)
 			{ND-DirectAwardJustificationPreviousUnpublish} #{field|name|BT-197(BT-1252)-Procedure}: #{BT-197(BT-1252)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationPreviousUnpublish[BT-196(BT-1252)-Procedure is present]} #{field|name|BT-196(BT-1252)-Procedure}: ${BT-196(BT-1252)-Procedure} // Unpublished Justification Description
@@ -297,9 +307,11 @@
 				{ND-ReestimatedValueUnpublish[BT-198(BT-660)-LotResult is present]} #{field|name|BT-198(BT-660)-LotResult}: ${BT-198(BT-660)-LotResult} // Unpublished Access Date
 		2 {ND-LotResult[BT-02-notice == 'veat' or BT-02-notice == 'can-modif' or ((BT-142-LotResult == 'selec-w' or BT-142-LotResult == 'unpublished') and OPT-320-LotResult is present and OPT-315-LotResult is present)]} #{auxiliary|text|winner-info} // 6.1.2. Winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]])>0]} #{auxiliary|text|winner}: // Winner
-				{OPT-320-LotResult} #{field|name|BT-500-Organization-Company}: ${for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa or OPT-170-Tenderer[OPT-210-Tenderer == $tpa] == TRUE]), text:$org in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($org, '
')} // Name of this winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Name of this winner (single organisation in Tendering Party)
 				0 {OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{auxiliary|text|winner-subcontractor}: // Subcontractors of the winner
-					{OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{field|name|BT-500-Business}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid]} // Subcontractor name
+					{OPT-320-LotResult[some text:$orgname1 in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $orgname1 != '']} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]], text:$orgname2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($orgname2, ', ')} // Subcontractor names
 				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]])>0]} #{auxiliary|text|tender}: // Tender
 				{OPT-320-LotResult} #{field|name|BT-3201-Tender}: ${for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender == $tender]} // Tender identifier
 				{OPT-320-LotResult} #{field|name|BT-13714-Tender}: ${for text:$tender in OPT-320-LotResult return BT-13714-Tender[OPT-321-Tender == $tender]} // Identifier of lot or group of lots
@@ -314,7 +326,7 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-171)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-171)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-171)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender} // The tender is a variant
+				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender}  // TODO The tender is a variant  0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender}    #{code|name|${if (some indicator:$bool2 in (for text:$tender2 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender2]) satisfies $bool2 == TRUE) then 'indicator.true' else 'indicator.false' }}
 				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1]) satisfies $bool == FALSE) and (some text:$code in (for text:$tender2 in OPT-320-LotResult return BT-195(BT-193)-Tender[OPT-321-Tender == $tender2]) satisfies $code != '')]} #{field|name|BT-193-Tender}: #{auxiliary|text|unpublished} // The tender is a variant (unpublished)
 					0 {OPT-320-LotResult[(some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-193)-Tender[OPT-321-Tender == $tender1] ) satisfies $code != '')]} #{field|name|BT-197(BT-193)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-193)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					0 {OPT-320-LotResult[(some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-193)-Tender[OPT-321-Tender == $tender1] ) satisfies $desc != '')]} #{field|name|BT-196(BT-193)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-196(BT-193)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Description
@@ -324,8 +336,9 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-773)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-730-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
-					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-730-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-730-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties (unpublished)
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$code2 in BT-197(BT-730)-Tender[OPT-321-Tender == $tender2] return $code2} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $desc != '']} #{field|name|BT-196(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc1 in BT-196(BT-730)-Tender[OPT-321-Tender == $tender2] return $desc1} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-553-Tender[BT-553-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-553-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-553-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} ${for text:$tender3 in OPT-320-LotResult return BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID} // Estimated value of the part of the contract that the contractor will subcontract to third parties
@@ -333,7 +346,8 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-553)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-731-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$spk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $spk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-731-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-731)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
@@ -352,16 +366,18 @@
 					{OPT-320-LotResult[some text:$title1 in (for text:$tender1 in OPT-320-LotResult return BT-721-Contract[BT-3202-Contract == $tender1]) satisfies $title1 != '']} #{field|name|BT-721-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$title2 in BT-721-Contract[BT-3202-Contract == $tender2] return $title2} // Contract title
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-1451-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z ]} #{field|name|BT-1451-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-1451-Contract[BT-3202-Contract == $tender2]} // Winning Decision date
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-145-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-145-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-145-Contract[BT-3202-Contract == $tender2]} // Contract Conclusion Date
-					{OPT-320-LotResult} #{field|name|BT-768-Contract}: ${some indicator:$fa in (for text:$tender1 in OPT-320-LotResult return indicator:BT-768-Contract[BT-3202-Contract == $tender1]) satisfies $fa == TRUE } // Contract Framework Agreement
+					{OPT-320-LotResult} #{field|name|BT-768-Contract}: #{code|name|${if (some indicator:$fa in (for text:$tender1 in OPT-320-LotResult return indicator:BT-768-Contract[BT-3202-Contract == $tender1]) satisfies $fa == TRUE) then 'indicator.true' else 'indicator.false'}} // Contract Framework Agreement indicator.true
 					{OPT-320-LotResult[some text:$url in (for text:$tender1 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender1]) satisfies $url != '']} #{field|name|BT-151-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender2]} // Contract URL
 					0 {OPT-320-LotResult[some text:$contractid in (for text:$tender in OPT-320-LotResult return BT-3202-Contract[BT-3202-Contract[BT-5011-Contract is present or BT-722-Contract is present or BT-6110-Contract is present] == $tender]) satisfies $contractid != '']} #{auxiliary|text|eu-funds-used} // Information about European Union funds used to finance the contract
-						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Name
+						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$name in BT-722-Contract[BT-3202-Contract == $tender2] return $name} // Contract EU Funds Name
 						{OPT-320-LotResult[some text:$eufundid in (for text:$tender1 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender1]) satisfies $eufundid != '']} #{field|name|BT-5011-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Identifier
 						{OPT-320-LotResult[some text:$eufunddesc in (for text:$tender1 in OPT-320-LotResult return BT-6110-Contract[BT-3202-Contract == $tender1]) satisfies $eufunddesc != '']} #{field|name|BT-6110-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$details in BT-6110-Contract[BT-3202-Contract == $tender2] return $details} // Contract EU Funds Details
 					{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-300-Contract-Signatory[BT-3202-Contract == $tender1]) > 0]} #{auxiliary|text|organisation-signing-contract}: ${for text:$tender2 in OPT-320-LotResult, text:$orgid in OPT-300-Contract-Signatory[BT-3202-Contract == $tender2], text:$orgname in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return $orgname} // Organisation signing the contract
 		3 {ND-LotResult[count(for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender[count(OPT-316-Contract[BT-3202-Contract == $tender]) == 0] == $tender])>0]} #{auxiliary|text|non-winning-tender}: // 6.1.3. Non-winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender[count(OPT-316-Contract[BT-3202-Contract == $tender]) == 0] == $tender])>0]} #{auxiliary|text|organisation-tenderer}: // Non-winning tender
-				{OPT-320-LotResult} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]]} // Name of this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of this non-winning tenderer (single organisation in Tendering Party)
 		4 {ND-LotResult[(BT-712(a)-LotResult is present) or (BT-636-LotResult is present) or (BT-760-LotResult is present) or (BT-710-LotResult is present) or (BT-710-LotResult is present) or (BT-735-LotResult is present)]} #{auxiliary|text|statistical-information} // 6.1.4. Statistical information
 			0 {ND-BuyerReviewComplainants} #{auxiliary|text|review-requests-summary}: // Summary of the review requests the buyer received
 				0 {BT-712(b)-LotResult[BT-712(b)-LotResult != -1]} #{field|name|BT-712(b)-LotResult}: ${BT-712(b)-LotResult} // Buyer Review Complainants
@@ -400,15 +416,19 @@
 						{BT-197(BT-759)-LotResult} #{field|name|BT-197(BT-759)-LotResult}: #{BT-197(BT-759)-LotResult} // Unpublished Justification Code
 						{BT-759-LotResult[BT-196(BT-759)-LotResult is present]} #{field|name|BT-196(BT-759)-LotResult}: ${BT-196(BT-759)-LotResult} // Unpublished Justification Description
 						{BT-198(BT-759)-LotResult} #{field|name|BT-198(BT-759)-LotResult}: ${BT-198(BT-759)-LotResult} // Unpublished Access Date
+			0 {ND-StrategicProcurementLotResult} #{auxiliary|text|statistics-strategic}: // Statistics about strategic procurement
+				0 {BT-735-LotResult} #{field|name|BT-735-LotResult}: #value // The type of contract of the procurement procedure within the scope of Clean Vehicles Directive 2009/33/EC.
+					0 {BT-723-LotResult} #{field|name|BT-723-LotResult}: #value // The category of vehicle falling within the scope of Directive 2009/33/EC.
+						{OPT-155-LotResult} #{OPT-155-LotResult}: ${format-number(OPT-156-LotResult, '###,##0')} // Vehicle category and number
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
 		{BT-165-Organization-Company} #{field|name|BT-165-Organization-Company}: ${BT-165-Organization-Company} // Size of the economic operator
 		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -442,14 +462,12 @@
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'ted-esen') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'ted-esen')]} #{auxiliary|text|organisation-esender} // This org is an eSender
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-300-Contract-Signatory) or (OPT-201-Organization-TouchPoint == OPT-300-Contract-Signatory)]} #{auxiliary|text|organisation-signing-contract} // Contract Signatory organisation (SettledContract)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Financing) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Financing)]} #{auxiliary|text|organisation-financing} // Financing Organisation (LotResult)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Paying) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Paying)]} #{auxiliary|text|organisation-paying} // Paying Organisation (LotResult)
@@ -483,6 +501,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/35.efx b/view-templates/35.efx
index 2d5258135..0510cf175 100644
--- a/view-templates/35.efx
+++ b/view-templates/35.efx
@@ -14,11 +14,6 @@
 		{BT-04-notice} #{field|name|BT-04-notice}: ${BT-04-notice} // Procedure identifier
 		{OPP-090-Procedure} #{field|name|OPP-090-Procedure}: ${OPP-090-Procedure} // Previous Notice
 		{BT-22-Procedure} #{field|name|BT-22-Procedure}: ${BT-22-Procedure} // Internal identifier
-		0 {BT-105-Procedure[BT-105-Procedure != 'unpublished']} #{field|name|BT-105-Procedure}: #{BT-105-Procedure} // Type of the procedure
-		0 {BT-105-Procedure[BT-105-Procedure == 'unpublished']} #{field|name|BT-105-Procedure}: #{auxiliary|text|unpublished} // Type of the procedure (unpublished)
-			{BT-197(BT-105)-Procedure} #{field|name|BT-197(BT-105)-Procedure}: #{BT-197(BT-105)-Procedure} // Unpublished Justification Code
-			{BT-105-Procedure[BT-196(BT-105)-Procedure is present]} #{field|name|BT-196(BT-105)-Procedure}: ${BT-196(BT-105)-Procedure} // Unpublished Justification Description
-			{BT-105-Procedure[BT-198(BT-105)-Procedure is present]} #{field|name|BT-198(BT-105)-Procedure}: ${BT-198(BT-105)-Procedure} // Unpublished Access Date
 		0 {ND-ProcedureProcurementScope[BT-88-Procedure != 'unpublished']} #{field|name|BT-88-Procedure}: ${BT-88-Procedure} // Procedure Features / Description of the procedure
 		0 {ND-ProcedureProcurementScope[BT-88-Procedure == 'unpublished']} #{field|name|BT-88-Procedure}: #{auxiliary|text|unpublished} // Procedure Features / Description of the procedure (unpublished)
 			{BT-197(BT-88)-Procedure} #{field|name|BT-197(BT-88)-Procedure}: #{BT-197(BT-88)-Procedure} // Unpublished Justification Code
@@ -41,7 +36,6 @@
 			{ND-ProcedurePlacePerformance[BT-728-Procedure is present]} #{field|name|BT-728-Procedure}: ${BT-728-Procedure} // Place Performance Additional information
 		3 {ND-ProcedureProcurementScope[(BT-27-Procedure is present) or (BT-271-Procedure is present)]} #{auxiliary|text|value} // 2.1.3 Value
 			{BT-27-Procedure} #{field|name|BT-27-Procedure}: ${format-number(BT-27-Procedure, '###,##0.##')} ${BT-27-Procedure/@currencyID} // Estimated value
-			{BT-271-Procedure} #{field|name|BT-271-Procedure}: ${format-number(BT-271-Procedure, '###,##0.##')} ${BT-271-Procedure/@currencyID} // Estimated Framework Maximum Value
 		4 {ND-ProcedureProcurementScope[BT-01-notice is present]} #{auxiliary|text|general-information} // 2.1.4 General information
 			{BT-634-Procedure[BT-634-Procedure == TRUE]} #{field|name|BT-634-Procedure} // Procurement Relaunch
 			{BT-756-Procedure[BT-756-Procedure == TRUE]} #{field|name|BT-756-Procedure} // Call for competition is terminated
@@ -50,11 +44,10 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
-					{BT-197(BT-09)-Procedure} #{field|name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
-					{ND-Root[BT-196(BT-09)-Procedure is present]} #{field|name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
-					{BT-198(BT-09)-Procedure} #{field|name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
+				{BT-197(BT-09)-Procedure} #{name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
+				{ND-Root[BT-196(BT-09)-Procedure is present]} #{name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
+				{BT-198(BT-09)-Procedure} #{name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
 4 {ND-Root[BT-137-LotsGroup is present]} #{auxiliary|text|group-of-lots} // 4. Group of lots
 	1 {ND-LotsGroup} #{field|name|BT-330-Procedure}: ${BT-137-LotsGroup} // 4.1 Group of lots
 		{BT-137-LotsGroup} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-137-LotsGroup return BT-1375-Procedure[BT-330-Procedure == $gloid]} // Lots included / Group Lot Identifier 
@@ -63,7 +56,6 @@
 		{BT-22-LotsGroup} #{field|name|BT-22-LotsGroup}: ${BT-22-LotsGroup} // Internal identifier of LotsGroup
 		1 {BT-137-LotsGroup[(BT-27-LotsGroup is present) or (BT-271-LotsGroup is present) or (BT-157-LotsGroup is present)]} #{auxiliary|text|value} // 4.1.1 Value
 			{BT-27-LotsGroup} #{field|name|BT-27-LotsGroup}: ${format-number(BT-27-LotsGroup, '###,##0.##')} ${BT-27-LotsGroup/@currencyID} // Estimated value
-			{BT-271-LotsGroup} #{field|name|BT-271-LotsGroup}: ${format-number(BT-271-LotsGroup, '###,##0.##')} ${BT-271-LotsGroup/@currencyID} // Framework Maximum Value
 		2 {ND-LotsGroupProcurementScope[BT-300-LotsGroup is present]} #{auxiliary|text|general-information} // 4.1.2 General information
 			{BT-137-LotsGroup[BT-300-LotsGroup is present]} #{field|name|BT-300-LotsGroup}: ${BT-300-LotsGroup} // Additional information
 		3 {ND-LotsGroupAwardCriteria} #{auxiliary|text|award-criteria} // 4.1.3 Award criteria
@@ -140,7 +132,6 @@
 			{ND-OptionsAndRenewals[BT-57-Lot is present]} #{field|name|BT-57-Lot}: ${BT-57-Lot} // Description
 		5 {ND-LotValueEstimate[(BT-27-Lot is present) or (BT-271-Lot is present) or (some text:$glo in (for text:$lotid in BT-137-Lot, text:$ldgloid in BT-330-Procedure[BT-1375-Procedure == $lotid], text:$gloid in BT-137-LotsGroup[BT-137-LotsGroup[BT-157-LotsGroup is present] == $ldgloid] return $gloid) satisfies $glo != '')]} #{auxiliary|text|value} // 5.1.5 Value
 			{BT-27-Lot} #{field|name|BT-27-Lot}: ${format-number(BT-27-Lot, '###,##0.##')} ${BT-27-Lot/@currencyID} // Estimated value
-			{BT-271-Lot} #{field|name|BT-271-Lot}: ${format-number(BT-271-Lot, '###,##0.##')} ${BT-271-Lot/@currencyID} // Framework Maximum Value
 		6 {BT-137-Lot[(BT-634-Lot == TRUE) or (BT-94-Lot == TRUE) or (BT-95-Lot is present) or (BT-71-Lot is present) or (BT-79-Lot is present) or (BT-60-Lot == 'eu-funds') or (BT-7220-Lot is present) or (BT-5010-Lot is present) or (BT-6140-Lot is present) or (BT-115-Lot == TRUE) or (BT-726-Lot == TRUE) or (BT-125(i)-Lot is present) or (BT-1251-Lot is present) or (BT-300-Lot is present)]} #{auxiliary|text|general-information} // 5.1.6 General information
 			{BT-634-Lot[BT-634-Lot == TRUE]} #{field|name|BT-634-Lot} // This cancelled or unsuccessful procedure or lot will be relaunched (only true allowed).
 			{BT-60-Lot} #value // EU Funds
@@ -155,6 +146,8 @@
 			{BT-805-Lot} #{field|name|BT-805-Lot}: #{BT-805-Lot} // Green Procurement Criteria
 			{BT-775-Lot} #{field|name|BT-775-Lot}: #{BT-775-Lot} // Social Procurement
 			{BT-776-Lot} #{field|name|BT-776-Lot}: #{BT-776-Lot} // Procurement of Innovation
+			0 {ND-StrategicProcurementLot[BT-717-Lot == 'true']} #{field|name|BT-717-Lot} // Clean Vehicles Directive
+				{BT-735-Lot} #{field|name|BT-735-Lot} #{BT-735-Lot} // CVD Contract Type
 		8 {ND-AccessibilityJustification} #{auxiliary|text|accessibility} // 5.1.8 Accessibility criteria
 			{BT-754-Lot} #{BT-754-Lot} // Accessibility 
 			{BT-137-Lot[BT-755-Lot is present]} #{field|name|BT-755-Lot}: ${BT-755-Lot} // Accessibility Justification
@@ -203,12 +196,6 @@
 		12 {BT-137-Lot[(BT-631-Lot is present) or (BT-130-Lot is present) or (BT-578-Lot == 'true') or (BT-732-Lot is present) or (BT-78-Lot is present) or (BT-42-Lot == TRUE) or (BT-46-Lot is present) or (BT-47-Lot is present) or (BT-644-Lot is present) or (BT-44-Lot is present) or (BT-41-Lot == TRUE) or (BT-45-Lot is present) or (BT-651-Lot is present) or (BT-17-Lot is present) or (BT-18-Lot is present) or (BT-19-Lot is present) or (BT-745-Lot is present) or (BT-97-Lot is present) or (BT-764-Lot is present) or (BT-744-Lot is present) or (BT-63-Lot is present) or (BT-769-Lot == 'allowed') or (BT-75-Lot is present) or (BT-630(d)-Lot is present) or (BT-1311(d)-Lot is present) or (BT-131(d)-Lot is present) or (BT-98-Lot is present) or ((BT-771-Lot is present) and (BT-772-Lot is present)) or (BT-132(d)-Lot is present) or (BT-133-Lot is present) or (BT-134-Lot is present) or (BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present) or (BT-99-Lot is present) or (OPP-020-Contract is present)]} #{auxiliary|text|procurement-terms} // 5.1.12 Procurement terms
 			{BT-137-Lot[BT-99-Lot is present]} #{field|name|BT-99-Lot}: ${BT-99-Lot} // Information about review deadlines
 		15 {ND-LotTenderingProcess[(BT-765-Lot is present) or (BT-113-Lot is present) or (BT-109-Lot is present) or (BT-111-Lot is present) or (BT-766-Lot is present) or (BT-119-LotResult == TRUE) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|techniques} // 5.1.15 Techniques
-			0 {ND-LotTenderingProcess[(BT-765-Lot is present) or (BT-113-Lot is present) or (BT-109-Lot is present) or (BT-111-Lot is present)]} #{auxiliary|text|framework-agreement}: // Information about framework agreement
-				{BT-765-Lot} #{BT-765-Lot} // Framework Agreement Type
-				{BT-113-Lot} #{field|name|BT-113-Lot}: ${BT-113-Lot} // Maximum number of participants
-				{BT-137-Lot[BT-109-Lot is present]} #{field|name|BT-109-Lot}: ${BT-109-Lot} // Justification for the duration of framework agreement
-				{BT-137-Lot[BT-111-Lot is present]} #{field|name|BT-111-Lot}: ${BT-111-Lot} // Framework Buyer Categories (Lot)
-			0 {ND-AuctionTerms[(BT-767-Lot is present) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|electronic-auction}: // Electronic auction #{code|name|indicator.true}
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
 			{BT-137-Lot[OPT-301-Lot-Mediator is present]} #{auxiliary|text|organisation-mediation}: ${for text:$refid in OPT-301-Lot-Mediator, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Mediation organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewOrg is present]} #{auxiliary|text|organisation-review}: ${for text:$refid in OPT-301-Lot-ReviewOrg, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Review organisation (Lot)
@@ -218,20 +205,20 @@
 			{BT-137-Lot[OPT-301-Lot-AddInfo is present]} #{auxiliary|text|organisation-providing-info-procedure}: ${for text:$refid in OPT-301-Lot-AddInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation providing additional information about the procurement procedure (Lot)
 			{BT-137-Lot[OPT-301-Lot-DocProvider is present]} #{auxiliary|text|organisation-providing-docs}: ${for text:$refid in OPT-301-Lot-DocProvider, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Documents provider organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-financing}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Financing Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-paying}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Paying Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$conid1 in OPT-315-LotResult[BT-13713-LotResult == $lotid1], text:$orgid1 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-signing-contract}: ${distinct-values(for text:$lotid2 in BT-137-Lot, text:$conid2 in OPT-315-LotResult[BT-13713-LotResult == $lotid2], text:$orgid2 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname)} // Contract Signatory (LotResult)
-6 {ND-Root[(BT-13713-LotResult is present)]} #{auxiliary|text|results} // 6. Results
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
+6 {ND-Root[(BT-3201-Tender is present)]} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} ${BT-161-NoticeResult/@currencyID} // Notice Value (Value of all contracts awarded in this procedure)
 	0 {ND-NoticeResult[BT-161-NoticeResult == -1]} #{field|name|BT-161-NoticeResult}: #{auxiliary|text|unpublished} // Notice Value (Value of all contracts awarded in this procedure) (unpublished)
 		{ND-NoticeValueUnpublish} #{field|name|BT-197(BT-161)-NoticeResult}: #{BT-197(BT-161)-NoticeResult} // Unpublished Justification Code
 		{ND-NoticeValueUnpublish[BT-196(BT-161)-NoticeResult is present]} #{field|name|BT-196(BT-161)-NoticeResult}: ${BT-196(BT-161)-NoticeResult} // Unpublished Justification Description
 		{ND-NoticeValueUnpublish[BT-198(BT-161)-NoticeResult is present]} #{field|name|BT-198(BT-161)-NoticeResult}: ${BT-198(BT-161)-NoticeResult} // Unpublished Access Date
 	0 {ND-DirectAward} #{auxiliary|text|direct-award}: // Direct award
-		0 {ND-DirectAward[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
-		0 {ND-DirectAward[BT-136-Procedure == 'unpublished']} #{field|name|BT-136-Procedure}: #{auxiliary|text|unpublished} // Justification for direct award (unpublished)
+		0 {BT-136-Procedure[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
+		0 {BT-136-Procedure[BT-136-Procedure == 'unpublished']} #{field|name|BT-136-Procedure}: #{auxiliary|text|unpublished} // Justification for direct award (unpublished)
 			{ND-DirectAwardJustificationCodeUnpublish} #{field|name|BT-197(BT-136)-Procedure}: #{BT-197(BT-136)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationCodeUnpublish[BT-196(BT-136)-Procedure is present]} #{field|name|BT-196(BT-136)-Procedure}: ${BT-196(BT-136)-Procedure} // Unpublished Justification Description
 			{ND-DirectAwardJustificationCodeUnpublish[BT-198(BT-136)-Procedure is present]} #{field|name|BT-198(BT-136)-Procedure}: ${BT-198(BT-136)-Procedure} // Unpublished Access Date
@@ -240,7 +227,7 @@
 			{ND-DirectAwardJustificationTextUnpublish} #{field|name|BT-197(BT-135)-Procedure}: #{BT-197(BT-135)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationTextUnpublish[BT-196(BT-135)-Procedure is present]} #{field|name|BT-196(BT-135)-Procedure}: ${BT-196(BT-135)-Procedure} // Unpublished Justification Description
 			{ND-DirectAwardJustificationTextUnpublish[BT-198(BT-135)-Procedure is present]} #{field|name|BT-198(BT-135)-Procedure}: ${BT-198(BT-135)-Procedure} // Unpublished Access Date
-		0 {ND-DirectAward[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
+		0 {BT-1252-Procedure[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
 		0 {ND-DirectAward[BT-1252-Procedure == 'unpublished']} #{field|name|BT-1252-Procedure}: #{auxiliary|text|unpublished} // Identifier of the previous procedure that justifies direct award (unpublished)
 			{ND-DirectAwardJustificationPreviousUnpublish} #{field|name|BT-197(BT-1252)-Procedure}: #{BT-197(BT-1252)-Procedure} // Unpublished Justification Code
 			{ND-DirectAwardJustificationPreviousUnpublish[BT-196(BT-1252)-Procedure is present]} #{field|name|BT-196(BT-1252)-Procedure}: ${BT-196(BT-1252)-Procedure} // Unpublished Justification Description
@@ -258,9 +245,11 @@
 			{BT-198(BT-144)-LotResult[BT-198(BT-144)-LotResult is present]} #{field|name|BT-198(BT-144)-LotResult}: ${BT-198(BT-144)-LotResult} // Unpublished Access Date
 		2 {ND-LotResult[BT-02-notice == 'veat' or BT-02-notice == 'can-modif' or ((BT-142-LotResult == 'selec-w' or BT-142-LotResult == 'unpublished') and OPT-320-LotResult is present and OPT-315-LotResult is present)]} #{auxiliary|text|winner-info} // 6.1.2. Winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]])>0]} #{auxiliary|text|winner}: // Winner
-				{OPT-320-LotResult} #{field|name|BT-500-Organization-Company}: ${for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa or OPT-170-Tenderer[OPT-210-Tenderer == $tpa] == TRUE]), text:$org in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($org, '
')} // Name of this winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Name of this winner (single organisation in Tendering Party)
 				0 {OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{auxiliary|text|winner-subcontractor}: // Subcontractors of the winner
-					{OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{field|name|BT-500-Business}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid]} // Subcontractor name
+					{OPT-320-LotResult[some text:$orgname1 in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $orgname1 != '']} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]], text:$orgname2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($orgname2, ', ')} // Subcontractor names
 				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]])>0]} #{auxiliary|text|tender}: // Tender
 				{OPT-320-LotResult} #{field|name|BT-3201-Tender}: ${for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender == $tender]} // Tender identifier
 				{OPT-320-LotResult} #{field|name|BT-13714-Tender}: ${for text:$tender in OPT-320-LotResult return BT-13714-Tender[OPT-321-Tender == $tender]} // Identifier of lot or group of lots
@@ -285,7 +274,7 @@
 						{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-163)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-163)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-163)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 						{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-163)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-163)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-163)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 						{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-163)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-163)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-163)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender} // The tender is a variant
+				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender}  // TODO The tender is a variant  0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender}    #{code|name|${if (some indicator:$bool2 in (for text:$tender2 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender2]) satisfies $bool2 == TRUE) then 'indicator.true' else 'indicator.false' }}
 				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1]) satisfies $bool == FALSE) and (some text:$code in (for text:$tender2 in OPT-320-LotResult return BT-195(BT-193)-Tender[OPT-321-Tender == $tender2]) satisfies $code != '')]} #{field|name|BT-193-Tender}: #{auxiliary|text|unpublished} // The tender is a variant (unpublished)
 					0 {OPT-320-LotResult[(some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-193)-Tender[OPT-321-Tender == $tender1] ) satisfies $code != '')]} #{field|name|BT-197(BT-193)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-193)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					0 {OPT-320-LotResult[(some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-193)-Tender[OPT-321-Tender == $tender1] ) satisfies $desc != '')]} #{field|name|BT-196(BT-193)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-196(BT-193)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Description
@@ -295,8 +284,9 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-773)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-730-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
-					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-730-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-730-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties (unpublished)
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$code2 in BT-197(BT-730)-Tender[OPT-321-Tender == $tender2] return $code2} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $desc != '']} #{field|name|BT-196(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc1 in BT-196(BT-730)-Tender[OPT-321-Tender == $tender2] return $desc1} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-553-Tender[BT-553-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-553-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-553-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} ${for text:$tender3 in OPT-320-LotResult return BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID} // Estimated value of the part of the contract that the contractor will subcontract to third parties
@@ -304,7 +294,8 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-553)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-731-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$spk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $spk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-731-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-731)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
@@ -323,16 +314,18 @@
 					{OPT-320-LotResult[some text:$title1 in (for text:$tender1 in OPT-320-LotResult return BT-721-Contract[BT-3202-Contract == $tender1]) satisfies $title1 != '']} #{field|name|BT-721-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$title2 in BT-721-Contract[BT-3202-Contract == $tender2] return $title2} // Contract title
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-1451-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z ]} #{field|name|BT-1451-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-1451-Contract[BT-3202-Contract == $tender2]} // Winning Decision date
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-145-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-145-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-145-Contract[BT-3202-Contract == $tender2]} // Contract Conclusion Date
-					{OPT-320-LotResult} #{field|name|BT-768-Contract}: ${some indicator:$fa in (for text:$tender1 in OPT-320-LotResult return indicator:BT-768-Contract[BT-3202-Contract == $tender1]) satisfies $fa == TRUE } // Contract Framework Agreement
+					{OPT-320-LotResult} #{field|name|BT-768-Contract}: #{code|name|${if (some indicator:$fa in (for text:$tender1 in OPT-320-LotResult return indicator:BT-768-Contract[BT-3202-Contract == $tender1]) satisfies $fa == TRUE) then 'indicator.true' else 'indicator.false'}} // Contract Framework Agreement indicator.true
 					{OPT-320-LotResult[some text:$url in (for text:$tender1 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender1]) satisfies $url != '']} #{field|name|BT-151-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender2]} // Contract URL
 					0 {OPT-320-LotResult[some text:$contractid in (for text:$tender in OPT-320-LotResult return BT-3202-Contract[BT-3202-Contract[BT-5011-Contract is present or BT-722-Contract is present or BT-6110-Contract is present] == $tender]) satisfies $contractid != '']} #{auxiliary|text|eu-funds-used} // Information about European Union funds used to finance the contract
-						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Name
+						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$name in BT-722-Contract[BT-3202-Contract == $tender2] return $name} // Contract EU Funds Name
 						{OPT-320-LotResult[some text:$eufundid in (for text:$tender1 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender1]) satisfies $eufundid != '']} #{field|name|BT-5011-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Identifier
 						{OPT-320-LotResult[some text:$eufunddesc in (for text:$tender1 in OPT-320-LotResult return BT-6110-Contract[BT-3202-Contract == $tender1]) satisfies $eufunddesc != '']} #{field|name|BT-6110-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$details in BT-6110-Contract[BT-3202-Contract == $tender2] return $details} // Contract EU Funds Details
 					{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-300-Contract-Signatory[BT-3202-Contract == $tender1]) > 0]} #{auxiliary|text|organisation-signing-contract}: ${for text:$tender2 in OPT-320-LotResult, text:$orgid in OPT-300-Contract-Signatory[BT-3202-Contract == $tender2], text:$orgname in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return $orgname} // Organisation signing the contract
 		3 {ND-LotResult[count(for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender[count(OPT-316-Contract[BT-3202-Contract == $tender]) == 0] == $tender])>0]} #{auxiliary|text|non-winning-tender}: // 6.1.3. Non-winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender[count(OPT-316-Contract[BT-3202-Contract == $tender]) == 0] == $tender])>0]} #{auxiliary|text|organisation-tenderer}: // Non-winning tender
-				{OPT-320-LotResult} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]]} // Name of this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of this non-winning tenderer (single organisation in Tendering Party)
 		4 {ND-LotResult[(BT-712(a)-LotResult is present) or (BT-636-LotResult is present) or (BT-760-LotResult is present) or (BT-710-LotResult is present) or (BT-710-LotResult is present) or (BT-735-LotResult is present)]} #{auxiliary|text|statistical-information} // 6.1.4. Statistical information
 			0 {ND-BuyerReviewComplainants} #{auxiliary|text|review-requests-summary}: // Summary of the review requests the buyer received
 				0 {BT-712(b)-LotResult[BT-712(b)-LotResult != -1]} #{field|name|BT-712(b)-LotResult}: ${BT-712(b)-LotResult} // Buyer Review Complainants
@@ -371,15 +364,19 @@
 						{BT-197(BT-759)-LotResult} #{field|name|BT-197(BT-759)-LotResult}: #{BT-197(BT-759)-LotResult} // Unpublished Justification Code
 						{BT-759-LotResult[BT-196(BT-759)-LotResult is present]} #{field|name|BT-196(BT-759)-LotResult}: ${BT-196(BT-759)-LotResult} // Unpublished Justification Description
 						{BT-198(BT-759)-LotResult} #{field|name|BT-198(BT-759)-LotResult}: ${BT-198(BT-759)-LotResult} // Unpublished Access Date
+			0 {ND-StrategicProcurementLotResult} #{auxiliary|text|statistics-strategic}: // Statistics about strategic procurement
+				0 {BT-735-LotResult} #{field|name|BT-735-LotResult}: #value // The type of contract of the procurement procedure within the scope of Clean Vehicles Directive 2009/33/EC.
+					0 {BT-723-LotResult} #{field|name|BT-723-LotResult}: #value // The category of vehicle falling within the scope of Directive 2009/33/EC.
+						{OPT-155-LotResult} #{OPT-155-LotResult}: ${format-number(OPT-156-LotResult, '###,##0')} // Vehicle category and number
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
 		{BT-165-Organization-Company} #{field|name|BT-165-Organization-Company}: ${BT-165-Organization-Company} // Size of the economic operator
 		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -407,20 +404,16 @@
 		0 {ND-Organization} #{auxiliary|text|roles}: // Roles of this organisation
 			0 {ND-Organization[count(for text:$orgid in OPT-200-Organization-Company return OPT-300-Procedure-Buyer[OPT-300-Procedure-Buyer == $orgid])>0]} #{auxiliary|text|buyer} // This org is a Buyer
 				{OPP-050-Organization[OPP-050-Organization == TRUE]} #{field|name|OPP-050-Organization} // Leader of the group
-				{OPP-052-Organization[OPP-052-Organization == TRUE]} #{field|name|OPP-052-Organization} // CPB Acquiring
-				{OPP-051-Organization[OPP-051-Organization == TRUE]} #{field|name|OPP-051-Organization} // CPB Awarding
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'serv-prov') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'serv-prov')]} #{auxiliary|text|organisation-providing-procurement-service} // This org is a Service Provider
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'ted-esen') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'ted-esen')]} #{auxiliary|text|organisation-esender} // This org is an eSender
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-300-Contract-Signatory) or (OPT-201-Organization-TouchPoint == OPT-300-Contract-Signatory)]} #{auxiliary|text|organisation-signing-contract} // Contract Signatory organisation (SettledContract)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Financing) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Financing)]} #{auxiliary|text|organisation-financing} // Financing Organisation (LotResult)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Paying) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Paying)]} #{auxiliary|text|organisation-paying} // Paying Organisation (LotResult)
@@ -454,6 +447,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/36.efx b/view-templates/36.efx
index 1061348ca..d45d80ed2 100644
--- a/view-templates/36.efx
+++ b/view-templates/36.efx
@@ -18,6 +18,10 @@
 			{BT-105-Procedure[BT-196(BT-105)-Procedure is present]} #{field|name|BT-196(BT-105)-Procedure}: ${BT-196(BT-105)-Procedure} // Unpublished Justification Description
 			{BT-105-Procedure[BT-198(BT-105)-Procedure is present]} #{field|name|BT-198(BT-105)-Procedure}: ${BT-198(BT-105)-Procedure} // Unpublished Access Date
 		0 {ND-ProcedureProcurementScope[BT-88-Procedure != 'unpublished']} #{field|name|BT-88-Procedure}: ${BT-88-Procedure} // Procedure Features / Description of the procedure
+		0 {ND-ProcedureProcurementScope[BT-88-Procedure == 'unpublished']} #{field|name|BT-88-Procedure}: #{auxiliary|text|unpublished} // Procedure Features / Description of the procedure (unpublished)
+			{BT-197(BT-88)-Procedure} #{field|name|BT-197(BT-88)-Procedure}: #{BT-197(BT-88)-Procedure} // Unpublished Justification Code
+			{ND-ProcedureProcurementScope[BT-196(BT-88)-Procedure is present]} #{field|name|BT-196(BT-88)-Procedure}: ${BT-196(BT-88)-Procedure} // Unpublished Justification Description
+			{ND-ProcedureProcurementScope[BT-198(BT-88)-Procedure is present]} #{field|name|BT-198(BT-88)-Procedure}: ${BT-198(BT-88)-Procedure} // Unpublished Access Date
 		1 {ND-ProcedureProcurementScope[(BT-23-Procedure is present) or (BT-531-Procedure is present) or (BT-262-Procedure is present) or (BT-263-Procedure is present)]} #{auxiliary|text|purpose} // 2.1.1 Purpose
 			{BT-23-Procedure} #{field|name|BT-23-Procedure}: #{BT-23-Procedure} // Nature of the contract
 			{BT-531-Procedure} #{field|name|BT-531-Procedure}: #{BT-531-Procedure} // Additional nature of the contract
@@ -40,11 +44,10 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
-					{BT-197(BT-09)-Procedure} #{field|name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
-					{ND-Root[BT-196(BT-09)-Procedure is present]} #{field|name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
-					{BT-198(BT-09)-Procedure} #{field|name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
+				{BT-197(BT-09)-Procedure} #{name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
+				{ND-Root[BT-196(BT-09)-Procedure is present]} #{name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
+				{BT-198(BT-09)-Procedure} #{name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
 4 {ND-Root[BT-137-LotsGroup is present]} #{auxiliary|text|group-of-lots} // 4. Group of lots
 	1 {ND-LotsGroup} #{field|name|BT-330-Procedure}: ${BT-137-LotsGroup} // 4.1 Group of lots
 		{BT-137-LotsGroup} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-137-LotsGroup return BT-1375-Procedure[BT-330-Procedure == $gloid]} // Lots included / Group Lot Identifier 
@@ -185,12 +188,12 @@
 			{BT-137-Lot[OPT-301-Lot-AddInfo is present]} #{auxiliary|text|organisation-providing-info-procedure}: ${for text:$refid in OPT-301-Lot-AddInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation providing additional information about the procurement procedure (Lot)
 			{BT-137-Lot[OPT-301-Lot-DocProvider is present]} #{auxiliary|text|organisation-providing-docs}: ${for text:$refid in OPT-301-Lot-DocProvider, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Documents provider organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-financing}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Financing Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-paying}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Paying Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$conid1 in OPT-315-LotResult[BT-13713-LotResult == $lotid1], text:$orgid1 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-signing-contract}: ${distinct-values(for text:$lotid2 in BT-137-Lot, text:$conid2 in OPT-315-LotResult[BT-13713-LotResult == $lotid2], text:$orgid2 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname)} // Contract Signatory (LotResult)
-6 {ND-Root[(BT-13713-LotResult is present)]} #{auxiliary|text|results} // 6. Results
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
+6 {ND-Root[(BT-3201-Tender is present)]} #{auxiliary|text|results} // 6. Results
 	1 {ND-LotResult} #{field|name|BT-13713-LotResult}: ${BT-13713-LotResult} // 6.1 Result Lot Identifier (LOT-XXXX)
 		0 {BT-142-LotResult[BT-142-LotResult != 'unpublished']} #{BT-142-LotResult} // A winner was chosen ?
 		0 {BT-142-LotResult[BT-142-LotResult == 'unpublished']} #{field|name|BT-142-LotResult} #{auxiliary|text|unpublished} // A winner was chosen ? (unpublished)
@@ -205,9 +208,11 @@
 		0 {ND-LotResultFAValues} #{auxiliary|text|framework-agreement}: // Framework agreement
 		2 {ND-LotResult[BT-02-notice == 'veat' or BT-02-notice == 'can-modif' or ((BT-142-LotResult == 'selec-w' or BT-142-LotResult == 'unpublished') and OPT-320-LotResult is present and OPT-315-LotResult is present)]} #{auxiliary|text|winner-info} // 6.1.2. Winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]])>0]} #{auxiliary|text|winner}: // Winner
-				{OPT-320-LotResult} #{field|name|BT-500-Organization-Company}: ${for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa or OPT-170-Tenderer[OPT-210-Tenderer == $tpa] == TRUE]), text:$org in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($org, '
')} // Name of this winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Name of this winner (single organisation in Tendering Party)
 				0 {OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{auxiliary|text|winner-subcontractor}: // Subcontractors of the winner
-					{OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{field|name|BT-500-Business}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid]} // Subcontractor name
+					{OPT-320-LotResult[some text:$orgname1 in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $orgname1 != '']} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]], text:$orgname2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($orgname2, ', ')} // Subcontractor names
 				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]])>0]} #{auxiliary|text|tender}: // Tender
 				{OPT-320-LotResult} #{field|name|BT-3201-Tender}: ${for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender == $tender]} // Tender identifier
 				{OPT-320-LotResult} #{field|name|BT-13714-Tender}: ${for text:$tender in OPT-320-LotResult return BT-13714-Tender[OPT-321-Tender == $tender]} // Identifier of lot or group of lots
@@ -217,25 +222,26 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-171)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-171)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-171)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender} // The tender is a variant
+				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender}  // TODO The tender is a variant  0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender}    #{code|name|${if (some indicator:$bool2 in (for text:$tender2 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender2]) satisfies $bool2 == TRUE) then 'indicator.true' else 'indicator.false' }}
 				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1]) satisfies $bool == FALSE) and (some text:$code in (for text:$tender2 in OPT-320-LotResult return BT-195(BT-193)-Tender[OPT-321-Tender == $tender2]) satisfies $code != '')]} #{field|name|BT-193-Tender}: #{auxiliary|text|unpublished} // The tender is a variant (unpublished)
 					0 {OPT-320-LotResult[(some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-193)-Tender[OPT-321-Tender == $tender1] ) satisfies $code != '')]} #{field|name|BT-197(BT-193)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-193)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					0 {OPT-320-LotResult[(some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-193)-Tender[OPT-321-Tender == $tender1] ) satisfies $desc != '')]} #{field|name|BT-196(BT-193)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-196(BT-193)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender in OPT-320-LotResult return BT-198(BT-193)-Tender[OPT-321-Tender == $tender]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-193)-Tender}: ${for text:$tender1 in OPT-320-LotResult return date:BT-198(BT-193)-Tender[OPT-321-Tender == $tender1]} // Unpublished Access Date
 				0 {OPT-320-LotResult} #{auxiliary|text|contract-information}: // Contract info for this tender
-					{OPT-320-LotResult} #{field|name|BT-150-Contract}: ${for text:$tender in OPT-320-LotResult return BT-150-Contract[BT-3202-Contract == $tender]} // Contract identifier
 					{OPT-320-LotResult[some text:$title1 in (for text:$tender1 in OPT-320-LotResult return BT-721-Contract[BT-3202-Contract == $tender1]) satisfies $title1 != '']} #{field|name|BT-721-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$title2 in BT-721-Contract[BT-3202-Contract == $tender2] return $title2} // Contract title
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-1451-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z ]} #{field|name|BT-1451-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-1451-Contract[BT-3202-Contract == $tender2]} // Winning Decision date
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-145-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-145-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-145-Contract[BT-3202-Contract == $tender2]} // Contract Conclusion Date
 					{OPT-320-LotResult[some text:$url in (for text:$tender1 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender1]) satisfies $url != '']} #{field|name|BT-151-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender2]} // Contract URL
 					0 {OPT-320-LotResult[some text:$contractid in (for text:$tender in OPT-320-LotResult return BT-3202-Contract[BT-3202-Contract[BT-5011-Contract is present or BT-722-Contract is present or BT-6110-Contract is present] == $tender]) satisfies $contractid != '']} #{auxiliary|text|eu-funds-used} // Information about European Union funds used to finance the contract
-						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Name
+						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$name in BT-722-Contract[BT-3202-Contract == $tender2] return $name} // Contract EU Funds Name
 						{OPT-320-LotResult[some text:$eufundid in (for text:$tender1 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender1]) satisfies $eufundid != '']} #{field|name|BT-5011-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Identifier
 						{OPT-320-LotResult[some text:$eufunddesc in (for text:$tender1 in OPT-320-LotResult return BT-6110-Contract[BT-3202-Contract == $tender1]) satisfies $eufunddesc != '']} #{field|name|BT-6110-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$details in BT-6110-Contract[BT-3202-Contract == $tender2] return $details} // Contract EU Funds Details
 					{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-300-Contract-Signatory[BT-3202-Contract == $tender1]) > 0]} #{auxiliary|text|organisation-signing-contract}: ${for text:$tender2 in OPT-320-LotResult, text:$orgid in OPT-300-Contract-Signatory[BT-3202-Contract == $tender2], text:$orgname in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return $orgname} // Organisation signing the contract
 		3 {ND-LotResult[count(for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender[count(OPT-316-Contract[BT-3202-Contract == $tender]) == 0] == $tender])>0]} #{auxiliary|text|non-winning-tender}: // 6.1.3. Non-winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender[count(OPT-316-Contract[BT-3202-Contract == $tender]) == 0] == $tender])>0]} #{auxiliary|text|organisation-tenderer}: // Non-winning tender
-				{OPT-320-LotResult} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]]} // Name of this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of this non-winning tenderer (single organisation in Tendering Party)
 		4 {ND-LotResult[(BT-712(a)-LotResult is present) or (BT-636-LotResult is present) or (BT-760-LotResult is present) or (BT-710-LotResult is present) or (BT-710-LotResult is present) or (BT-735-LotResult is present)]} #{auxiliary|text|statistical-information} // 6.1.4. Statistical information
 			0 {ND-BuyerReviewComplainants} #{auxiliary|text|review-requests-summary}: // Summary of the review requests the buyer received
 				0 {BT-712(b)-LotResult[BT-712(b)-LotResult != -1]} #{field|name|BT-712(b)-LotResult}: ${BT-712(b)-LotResult} // Buyer Review Complainants
@@ -274,22 +280,15 @@
 						{BT-197(BT-759)-LotResult} #{field|name|BT-197(BT-759)-LotResult}: #{BT-197(BT-759)-LotResult} // Unpublished Justification Code
 						{BT-759-LotResult[BT-196(BT-759)-LotResult is present]} #{field|name|BT-196(BT-759)-LotResult}: ${BT-196(BT-759)-LotResult} // Unpublished Justification Description
 						{BT-198(BT-759)-LotResult} #{field|name|BT-198(BT-759)-LotResult}: ${BT-198(BT-759)-LotResult} // Unpublished Access Date
-7 {ND-Root[BT-1501(n)-Contract is present]} #{auxiliary|text|modification} // 7. Modifications
-	{BT-1501(n)-Contract} #{field|name|BT-1501(n)-Contract}: ${BT-1501(n)-Contract} // Modification Previous Notice Identifier
-	{BT-200-Contract} #{field|name|BT-200-Contract}: #{BT-200-Contract} // Modification Reason Code
-	{BT-201-Contract} #{field|name|BT-201-Contract}: ${BT-201-Contract} // Modification Reason Description
-	1 {ND-Modification} #{auxiliary|text|modification} // Modification
-		{BT-1501(s)-Contract} #{field|name|BT-1501(s)-Contract}: ${BT-1501(s)-Contract} // Modification Previous Notice Section Identifier
-		{BT-202-Contract} #{field|name|BT-202-Contract}: ${BT-202-Contract} // Modification Previous Notice Section Identifier
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
 		{BT-165-Organization-Company} #{field|name|BT-165-Organization-Company}: ${BT-165-Organization-Company} // Size of the economic operator
 		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -323,14 +322,12 @@
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'ted-esen') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'ted-esen')]} #{auxiliary|text|organisation-esender} // This org is an eSender
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-300-Contract-Signatory) or (OPT-201-Organization-TouchPoint == OPT-300-Contract-Signatory)]} #{auxiliary|text|organisation-signing-contract} // Contract Signatory organisation (SettledContract)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Financing) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Financing)]} #{auxiliary|text|organisation-financing} // Financing Organisation (LotResult)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Paying) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Paying)]} #{auxiliary|text|organisation-paying} // Paying Organisation (LotResult)
@@ -364,6 +361,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/37.efx b/view-templates/37.efx
index 5b1f68625..025993ace 100644
--- a/view-templates/37.efx
+++ b/view-templates/37.efx
@@ -19,6 +19,10 @@
 			{BT-105-Procedure[BT-196(BT-105)-Procedure is present]} #{field|name|BT-196(BT-105)-Procedure}: ${BT-196(BT-105)-Procedure} // Unpublished Justification Description
 			{BT-105-Procedure[BT-198(BT-105)-Procedure is present]} #{field|name|BT-198(BT-105)-Procedure}: ${BT-198(BT-105)-Procedure} // Unpublished Access Date
 		0 {ND-ProcedureProcurementScope[BT-88-Procedure != 'unpublished']} #{field|name|BT-88-Procedure}: ${BT-88-Procedure} // Procedure Features / Description of the procedure
+		0 {ND-ProcedureProcurementScope[BT-88-Procedure == 'unpublished']} #{field|name|BT-88-Procedure}: #{auxiliary|text|unpublished} // Procedure Features / Description of the procedure (unpublished)
+			{BT-197(BT-88)-Procedure} #{field|name|BT-197(BT-88)-Procedure}: #{BT-197(BT-88)-Procedure} // Unpublished Justification Code
+			{ND-ProcedureProcurementScope[BT-196(BT-88)-Procedure is present]} #{field|name|BT-196(BT-88)-Procedure}: ${BT-196(BT-88)-Procedure} // Unpublished Justification Description
+			{ND-ProcedureProcurementScope[BT-198(BT-88)-Procedure is present]} #{field|name|BT-198(BT-88)-Procedure}: ${BT-198(BT-88)-Procedure} // Unpublished Access Date
 		1 {ND-ProcedureProcurementScope[(BT-23-Procedure is present) or (BT-531-Procedure is present) or (BT-262-Procedure is present) or (BT-263-Procedure is present)]} #{auxiliary|text|purpose} // 2.1.1 Purpose
 			{BT-23-Procedure} #{field|name|BT-23-Procedure}: #{BT-23-Procedure} // Nature of the contract
 			{BT-531-Procedure} #{field|name|BT-531-Procedure}: #{BT-531-Procedure} // Additional nature of the contract
@@ -41,11 +45,10 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
-					{BT-197(BT-09)-Procedure} #{field|name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
-					{ND-Root[BT-196(BT-09)-Procedure is present]} #{field|name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
-					{BT-198(BT-09)-Procedure} #{field|name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
+				{BT-197(BT-09)-Procedure} #{name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
+				{ND-Root[BT-196(BT-09)-Procedure is present]} #{name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
+				{BT-198(BT-09)-Procedure} #{name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
 4 {ND-Root[BT-137-LotsGroup is present]} #{auxiliary|text|group-of-lots} // 4. Group of lots
 	1 {ND-LotsGroup} #{field|name|BT-330-Procedure}: ${BT-137-LotsGroup} // 4.1 Group of lots
 		{BT-137-LotsGroup} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-137-LotsGroup return BT-1375-Procedure[BT-330-Procedure == $gloid]} // Lots included / Group Lot Identifier 
@@ -186,12 +189,12 @@
 			{BT-137-Lot[OPT-301-Lot-AddInfo is present]} #{auxiliary|text|organisation-providing-info-procedure}: ${for text:$refid in OPT-301-Lot-AddInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation providing additional information about the procurement procedure (Lot)
 			{BT-137-Lot[OPT-301-Lot-DocProvider is present]} #{auxiliary|text|organisation-providing-docs}: ${for text:$refid in OPT-301-Lot-DocProvider, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Documents provider organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-financing}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Financing Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-paying}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Paying Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$conid1 in OPT-315-LotResult[BT-13713-LotResult == $lotid1], text:$orgid1 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-signing-contract}: ${distinct-values(for text:$lotid2 in BT-137-Lot, text:$conid2 in OPT-315-LotResult[BT-13713-LotResult == $lotid2], text:$orgid2 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname)} // Contract Signatory (LotResult)
-6 {ND-Root[(BT-13713-LotResult is present)]} #{auxiliary|text|results} // 6. Results
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
+6 {ND-Root[(BT-3201-Tender is present)]} #{auxiliary|text|results} // 6. Results
 	1 {ND-LotResult} #{field|name|BT-13713-LotResult}: ${BT-13713-LotResult} // 6.1 Result Lot Identifier (LOT-XXXX)
 		0 {BT-142-LotResult[BT-142-LotResult != 'unpublished']} #{BT-142-LotResult} // A winner was chosen ?
 		0 {BT-142-LotResult[BT-142-LotResult == 'unpublished']} #{field|name|BT-142-LotResult} #{auxiliary|text|unpublished} // A winner was chosen ? (unpublished)
@@ -206,9 +209,11 @@
 		0 {ND-LotResultFAValues} #{auxiliary|text|framework-agreement}: // Framework agreement
 		2 {ND-LotResult[BT-02-notice == 'veat' or BT-02-notice == 'can-modif' or ((BT-142-LotResult == 'selec-w' or BT-142-LotResult == 'unpublished') and OPT-320-LotResult is present and OPT-315-LotResult is present)]} #{auxiliary|text|winner-info} // 6.1.2. Winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]])>0]} #{auxiliary|text|winner}: // Winner
-				{OPT-320-LotResult} #{field|name|BT-500-Organization-Company}: ${for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa or OPT-170-Tenderer[OPT-210-Tenderer == $tpa] == TRUE]), text:$org in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($org, '
')} // Name of this winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Name of this winner (single organisation in Tendering Party)
 				0 {OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{auxiliary|text|winner-subcontractor}: // Subcontractors of the winner
-					{OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{field|name|BT-500-Business}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid]} // Subcontractor name
+					{OPT-320-LotResult[some text:$orgname1 in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $orgname1 != '']} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]], text:$orgname2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($orgname2, ', ')} // Subcontractor names
 				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]])>0]} #{auxiliary|text|tender}: // Tender
 				{OPT-320-LotResult} #{field|name|BT-3201-Tender}: ${for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender == $tender]} // Tender identifier
 				{OPT-320-LotResult} #{field|name|BT-13714-Tender}: ${for text:$tender in OPT-320-LotResult return BT-13714-Tender[OPT-321-Tender == $tender]} // Identifier of lot or group of lots
@@ -218,25 +223,26 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-171)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-171)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-171)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender} // The tender is a variant
+				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender}  // TODO The tender is a variant  0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender}    #{code|name|${if (some indicator:$bool2 in (for text:$tender2 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender2]) satisfies $bool2 == TRUE) then 'indicator.true' else 'indicator.false' }}
 				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1]) satisfies $bool == FALSE) and (some text:$code in (for text:$tender2 in OPT-320-LotResult return BT-195(BT-193)-Tender[OPT-321-Tender == $tender2]) satisfies $code != '')]} #{field|name|BT-193-Tender}: #{auxiliary|text|unpublished} // The tender is a variant (unpublished)
 					0 {OPT-320-LotResult[(some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-193)-Tender[OPT-321-Tender == $tender1] ) satisfies $code != '')]} #{field|name|BT-197(BT-193)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-193)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					0 {OPT-320-LotResult[(some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-193)-Tender[OPT-321-Tender == $tender1] ) satisfies $desc != '')]} #{field|name|BT-196(BT-193)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-196(BT-193)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender in OPT-320-LotResult return BT-198(BT-193)-Tender[OPT-321-Tender == $tender]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-193)-Tender}: ${for text:$tender1 in OPT-320-LotResult return date:BT-198(BT-193)-Tender[OPT-321-Tender == $tender1]} // Unpublished Access Date
 				0 {OPT-320-LotResult} #{auxiliary|text|contract-information}: // Contract info for this tender
-					{OPT-320-LotResult} #{field|name|BT-150-Contract}: ${for text:$tender in OPT-320-LotResult return BT-150-Contract[BT-3202-Contract == $tender]} // Contract identifier
 					{OPT-320-LotResult[some text:$title1 in (for text:$tender1 in OPT-320-LotResult return BT-721-Contract[BT-3202-Contract == $tender1]) satisfies $title1 != '']} #{field|name|BT-721-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$title2 in BT-721-Contract[BT-3202-Contract == $tender2] return $title2} // Contract title
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-1451-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z ]} #{field|name|BT-1451-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-1451-Contract[BT-3202-Contract == $tender2]} // Winning Decision date
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-145-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-145-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-145-Contract[BT-3202-Contract == $tender2]} // Contract Conclusion Date
 					{OPT-320-LotResult[some text:$url in (for text:$tender1 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender1]) satisfies $url != '']} #{field|name|BT-151-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender2]} // Contract URL
 					0 {OPT-320-LotResult[some text:$contractid in (for text:$tender in OPT-320-LotResult return BT-3202-Contract[BT-3202-Contract[BT-5011-Contract is present or BT-722-Contract is present or BT-6110-Contract is present] == $tender]) satisfies $contractid != '']} #{auxiliary|text|eu-funds-used} // Information about European Union funds used to finance the contract
-						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Name
+						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$name in BT-722-Contract[BT-3202-Contract == $tender2] return $name} // Contract EU Funds Name
 						{OPT-320-LotResult[some text:$eufundid in (for text:$tender1 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender1]) satisfies $eufundid != '']} #{field|name|BT-5011-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Identifier
 						{OPT-320-LotResult[some text:$eufunddesc in (for text:$tender1 in OPT-320-LotResult return BT-6110-Contract[BT-3202-Contract == $tender1]) satisfies $eufunddesc != '']} #{field|name|BT-6110-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$details in BT-6110-Contract[BT-3202-Contract == $tender2] return $details} // Contract EU Funds Details
 					{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-300-Contract-Signatory[BT-3202-Contract == $tender1]) > 0]} #{auxiliary|text|organisation-signing-contract}: ${for text:$tender2 in OPT-320-LotResult, text:$orgid in OPT-300-Contract-Signatory[BT-3202-Contract == $tender2], text:$orgname in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return $orgname} // Organisation signing the contract
 		3 {ND-LotResult[count(for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender[count(OPT-316-Contract[BT-3202-Contract == $tender]) == 0] == $tender])>0]} #{auxiliary|text|non-winning-tender}: // 6.1.3. Non-winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender[count(OPT-316-Contract[BT-3202-Contract == $tender]) == 0] == $tender])>0]} #{auxiliary|text|organisation-tenderer}: // Non-winning tender
-				{OPT-320-LotResult} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]]} // Name of this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of this non-winning tenderer (single organisation in Tendering Party)
 		4 {ND-LotResult[(BT-712(a)-LotResult is present) or (BT-636-LotResult is present) or (BT-760-LotResult is present) or (BT-710-LotResult is present) or (BT-710-LotResult is present) or (BT-735-LotResult is present)]} #{auxiliary|text|statistical-information} // 6.1.4. Statistical information
 			0 {ND-BuyerReviewComplainants} #{auxiliary|text|review-requests-summary}: // Summary of the review requests the buyer received
 				0 {BT-712(b)-LotResult[BT-712(b)-LotResult != -1]} #{field|name|BT-712(b)-LotResult}: ${BT-712(b)-LotResult} // Buyer Review Complainants
@@ -275,22 +281,15 @@
 						{BT-197(BT-759)-LotResult} #{field|name|BT-197(BT-759)-LotResult}: #{BT-197(BT-759)-LotResult} // Unpublished Justification Code
 						{BT-759-LotResult[BT-196(BT-759)-LotResult is present]} #{field|name|BT-196(BT-759)-LotResult}: ${BT-196(BT-759)-LotResult} // Unpublished Justification Description
 						{BT-198(BT-759)-LotResult} #{field|name|BT-198(BT-759)-LotResult}: ${BT-198(BT-759)-LotResult} // Unpublished Access Date
-7 {ND-Root[BT-1501(n)-Contract is present]} #{auxiliary|text|modification} // 7. Modifications
-	{BT-1501(n)-Contract} #{field|name|BT-1501(n)-Contract}: ${BT-1501(n)-Contract} // Modification Previous Notice Identifier
-	{BT-200-Contract} #{field|name|BT-200-Contract}: #{BT-200-Contract} // Modification Reason Code
-	{BT-201-Contract} #{field|name|BT-201-Contract}: ${BT-201-Contract} // Modification Reason Description
-	1 {ND-Modification} #{auxiliary|text|modification} // Modification
-		{BT-1501(s)-Contract} #{field|name|BT-1501(s)-Contract}: ${BT-1501(s)-Contract} // Modification Previous Notice Section Identifier
-		{BT-202-Contract} #{field|name|BT-202-Contract}: ${BT-202-Contract} // Modification Previous Notice Section Identifier
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
 		{BT-165-Organization-Company} #{field|name|BT-165-Organization-Company}: ${BT-165-Organization-Company} // Size of the economic operator
 		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -324,14 +323,12 @@
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'ted-esen') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'ted-esen')]} #{auxiliary|text|organisation-esender} // This org is an eSender
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-300-Contract-Signatory) or (OPT-201-Organization-TouchPoint == OPT-300-Contract-Signatory)]} #{auxiliary|text|organisation-signing-contract} // Contract Signatory organisation (SettledContract)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Financing) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Financing)]} #{auxiliary|text|organisation-financing} // Financing Organisation (LotResult)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Paying) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Paying)]} #{auxiliary|text|organisation-paying} // Paying Organisation (LotResult)
@@ -365,6 +362,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/38.efx b/view-templates/38.efx
index a826758dd..d368ab98b 100644
--- a/view-templates/38.efx
+++ b/view-templates/38.efx
@@ -73,7 +73,6 @@
 			{BT-137-Lot[BT-95-Lot is present]} #{field|name|BT-95-Lot}: ${BT-95-Lot} // Recurrence Description
 			{BT-60-Lot} #value // EU Funds
 			{BT-115-Lot[BT-115-Lot == TRUE]} #{field|name|BT-115-Lot} // GPA Coverage
-			0 {ND-LotTenderingProcess[(BT-125(i)-Lot is present) or (BT-1251-Lot is present)]} #{auxiliary|text|previous-planning}: // Information about previous notices - Previous planning
 			{BT-137-Lot[BT-300-Lot is present]} #{field|name|BT-300-Lot}: ${BT-300-Lot} // Additional information
 		7 {ND-LotProcurementScope[(BT-06-Lot is present) or (BT-777-Lot is present) or (BT-774-Lot is present) or (BT-775-Lot is present) or (BT-776-Lot is present) or (BT-805-Lot is present)]} #{auxiliary|text|strategic-procurement} // 5.1.7 Strategic procurement
 			0 {BT-06-Lot} #{field|name|BT-06-Lot}: #{BT-06-Lot} // Aim of strategic procurement
@@ -88,6 +87,14 @@
 			{BT-754-Lot} #{BT-754-Lot} // Accessibility 
 			{BT-137-Lot[BT-755-Lot is present]} #{field|name|BT-755-Lot}: ${BT-755-Lot} // Accessibility Justification
 		12 {BT-137-Lot[(BT-631-Lot is present) or (BT-130-Lot is present) or (BT-578-Lot == 'true') or (BT-732-Lot is present) or (BT-78-Lot is present) or (BT-42-Lot == TRUE) or (BT-46-Lot is present) or (BT-47-Lot is present) or (BT-644-Lot is present) or (BT-44-Lot is present) or (BT-41-Lot == TRUE) or (BT-45-Lot is present) or (BT-651-Lot is present) or (BT-17-Lot is present) or (BT-18-Lot is present) or (BT-19-Lot is present) or (BT-745-Lot is present) or (BT-97-Lot is present) or (BT-764-Lot is present) or (BT-744-Lot is present) or (BT-63-Lot is present) or (BT-769-Lot == 'allowed') or (BT-75-Lot is present) or (BT-630(d)-Lot is present) or (BT-1311(d)-Lot is present) or (BT-131(d)-Lot is present) or (BT-98-Lot is present) or ((BT-771-Lot is present) and (BT-772-Lot is present)) or (BT-132(d)-Lot is present) or (BT-133-Lot is present) or (BT-134-Lot is present) or (BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present) or (BT-99-Lot is present) or (OPP-020-Contract is present)]} #{auxiliary|text|procurement-terms} // 5.1.12 Procurement terms
+			0 {ND-LotTenderingTerms[(BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present)]} #{auxiliary|text|contract-terms}: // Terms of contract
+				{BT-736-Lot[BT-736-Lot != 'no']} #{field|name|BT-736-Lot}: #{BT-736-Lot} // The execution of the contract must be performed in the framework of sheltered employment programmes (yes / no / not-known)
+				{ND-ExecutionRequirements[BT-70-Lot is present]} #{field|name|BT-70-Lot}: ${BT-70-Lot} // Terms Performance
+				{BT-743-Lot} #{field|name|BT-743-Lot}: #{BT-743-Lot} // Electronic invoicing
+				{BT-92-Lot} #{field|name|BT-92-Lot}: #{code|name|${if (BT-92-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic ordering will be used (true / false)
+				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot}: #{code|name|${if (BT-93-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic payment will be used (true/false)
+				{BT-761-Lot[(BT-76-Lot is present)]} #{field|name|BT-76-Lot}: ${BT-76-Lot} // Legal form that must be taken by a group of tenderers that is awarded a contract
+				{ND-PaymentTerms[BT-77-Lot is present]} #{field|name|BT-77-Lot}: ${BT-77-Lot} // Financial arrangement
 			{BT-137-Lot[BT-99-Lot is present]} #{field|name|BT-99-Lot}: ${BT-99-Lot} // Information about review deadlines
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
 			{BT-137-Lot[OPT-301-Lot-Mediator is present]} #{auxiliary|text|organisation-mediation}: ${for text:$refid in OPT-301-Lot-Mediator, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Mediation organisation (Lot)
@@ -98,12 +105,12 @@
 			{BT-137-Lot[OPT-301-Lot-AddInfo is present]} #{auxiliary|text|organisation-providing-info-procedure}: ${for text:$refid in OPT-301-Lot-AddInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation providing additional information about the procurement procedure (Lot)
 			{BT-137-Lot[OPT-301-Lot-DocProvider is present]} #{auxiliary|text|organisation-providing-docs}: ${for text:$refid in OPT-301-Lot-DocProvider, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Documents provider organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-financing}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Financing Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-paying}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Paying Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$conid1 in OPT-315-LotResult[BT-13713-LotResult == $lotid1], text:$orgid1 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-signing-contract}: ${distinct-values(for text:$lotid2 in BT-137-Lot, text:$conid2 in OPT-315-LotResult[BT-13713-LotResult == $lotid2], text:$orgid2 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname)} // Contract Signatory (LotResult)
-6 {ND-Root[(BT-13713-LotResult is present)]} #{auxiliary|text|results} // 6. Results
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
+6 {ND-Root[(BT-3201-Tender is present)]} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} ${BT-161-NoticeResult/@currencyID} // Notice Value (Value of all contracts awarded in this procedure)
 	0 {ND-NoticeResult[BT-161-NoticeResult == -1]} #{field|name|BT-161-NoticeResult}: #{auxiliary|text|unpublished} // Notice Value (Value of all contracts awarded in this procedure) (unpublished)
 		{ND-NoticeValueUnpublish} #{field|name|BT-197(BT-161)-NoticeResult}: #{BT-197(BT-161)-NoticeResult} // Unpublished Justification Code
@@ -119,6 +126,18 @@
 		{ND-NoticeApproximateValueUnpublish} #{field|name|BT-197(BT-1118)-NoticeResult}: #{BT-197(BT-1118)-NoticeResult} // Unpublished Justification Code
 		{ND-NoticeApproximateValueUnpublish[BT-196(BT-1118)-NoticeResult is present]} #{field|name|BT-196(BT-1118)-NoticeResult}: ${BT-196(BT-1118)-NoticeResult} // Unpublished Justification Description
 		{ND-NoticeApproximateValueUnpublish[BT-198(BT-1118)-NoticeResult is present]} #{field|name|BT-198(BT-1118)-NoticeResult}: ${BT-198(BT-1118)-NoticeResult} // Unpublished Access Date
+	0 {ND-NoticeResultGroupFA[BT-556-NoticeResult != 'unpublished']} #{auxiliary|text|group-framework-value}: ${BT-556-NoticeResult} // Value of the framework agreements in this group of lots
+		0 {ND-NoticeResultGroupFA} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-556-NoticeResult return BT-1375-Procedure[BT-330-Procedure == $gloid] } // Lots included: LOT-0001, LOT-0003
+		0 {BT-156-NoticeResult[BT-156-NoticeResult != -1]} #{field|name|BT-156-NoticeResult}: ${format-number(BT-156-NoticeResult, '###,##0.##')} ${BT-156-NoticeResult/@currencyID} // Maximum value of the framework agreements in this group of lots
+		0 {BT-156-NoticeResult[BT-156-NoticeResult == -1]} #{field|name|BT-156-NoticeResult}:#{auxiliary|text|unpublished} // Maximum value of the framework agreements in this group of lots (unpublished)
+			{ND-GroupMaximumValueUnpublish} #{field|name|BT-197(BT-156)-NoticeResult}: #{BT-197(BT-156)-NoticeResult} // Unpublished Justification Code
+			{ND-GroupMaximumValueUnpublish[BT-196(BT-156)-NoticeResult is present]} #{field|name|BT-196(BT-156)-NoticeResult}: ${BT-196(BT-156)-NoticeResult} // Unpublished Justification Description
+			{ND-GroupMaximumValueUnpublish[BT-198(BT-156)-NoticeResult is present]} #{field|name|BT-198(BT-156)-NoticeResult}: ${BT-198(BT-156)-NoticeResult} // Unpublished Access Date
+		0 {BT-1561-NoticeResult[BT-1561-NoticeResult != -1]} #{field|name|BT-1561-NoticeResult}: ${format-number(BT-1561-NoticeResult, '###,##0.##')} ${BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID} // Re-estimated value of the framework agreements within a group of lots
+		0 {BT-1561-NoticeResult[BT-1561-NoticeResult == -1]} #{field|name|BT-1561-NoticeResult}: #{auxiliary|text|unpublished} // Re-estimated value of the framework agreements within a group of lots (unpublished)
+			{ND-GroupReestimatedValueUnpublish} #{field|name|BT-197(BT-1561)-NoticeResult}: #{BT-197(BT-1561)-NoticeResult} // Unpublished Justification Code
+			{ND-GroupReestimatedValueUnpublish[BT-196(BT-1561)-NoticeResult is present]} #{field|name|BT-196(BT-1561)-NoticeResult}: ${BT-196(BT-1561)-NoticeResult} // Unpublished Justification Description
+			{ND-GroupReestimatedValueUnpublish[BT-198(BT-1561)-NoticeResult is present]} #{field|name|BT-198(BT-1561)-NoticeResult}: ${BT-198(BT-1561)-NoticeResult} // Unpublished Access Date
 	0 {ND-NoticeResultGroupFA[BT-556-NoticeResult == 'unpublished']} #{auxiliary|text|group-framework-value}: #{auxiliary|text|unpublished} // Value of the framework agreements in this group of lots (unpublished)
 		{ND-GroupMaximalValueIdentifierUnpublish} #{field|name|BT-197(BT-556)-NoticeResult}: #{BT-197(BT-556)-NoticeResult} // Unpublished Justification Code
 		{ND-GroupMaximalValueIdentifierUnpublish[BT-196(BT-556)-NoticeResult is present]} #{field|name|BT-196(BT-556)-NoticeResult}: ${BT-196(BT-556)-NoticeResult} // Unpublished Justification Description
@@ -148,6 +167,11 @@
 				{ND-ReestimatedValueUnpublish[BT-198(BT-660)-LotResult is present]} #{field|name|BT-198(BT-660)-LotResult}: ${BT-198(BT-660)-LotResult} // Unpublished Access Date
 		2 {ND-LotResult[BT-02-notice == 'veat' or BT-02-notice == 'can-modif' or ((BT-142-LotResult == 'selec-w' or BT-142-LotResult == 'unpublished') and OPT-320-LotResult is present and OPT-315-LotResult is present)]} #{auxiliary|text|winner-info} // 6.1.2. Winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]])>0]} #{auxiliary|text|winner}: // Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Name of this winner (single organisation in Tendering Party)
+				0 {OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{auxiliary|text|winner-subcontractor}: // Subcontractors of the winner
+					{OPT-320-LotResult[some text:$orgname1 in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $orgname1 != '']} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]], text:$orgname2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($orgname2, ', ')} // Subcontractor names
 				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]])>0]} #{auxiliary|text|tender}: // Tender
 				{OPT-320-LotResult} #{field|name|BT-3201-Tender}: ${for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender == $tender]} // Tender identifier
 				{OPT-320-LotResult} #{field|name|BT-13714-Tender}: ${for text:$tender in OPT-320-LotResult return BT-13714-Tender[OPT-321-Tender == $tender]} // Identifier of lot or group of lots
@@ -167,8 +191,9 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-773)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-730-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
-					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-730-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-730-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties (unpublished)
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$code2 in BT-197(BT-730)-Tender[OPT-321-Tender == $tender2] return $code2} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $desc != '']} #{field|name|BT-196(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc1 in BT-196(BT-730)-Tender[OPT-321-Tender == $tender2] return $desc1} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-553-Tender[BT-553-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-553-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-553-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} ${for text:$tender3 in OPT-320-LotResult return BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID} // Estimated value of the part of the contract that the contractor will subcontract to third parties
@@ -176,7 +201,8 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-553)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-731-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$spk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $spk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-731-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-731)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
@@ -197,7 +223,7 @@
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-145-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-145-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-145-Contract[BT-3202-Contract == $tender2]} // Contract Conclusion Date
 					{OPT-320-LotResult[some text:$url in (for text:$tender1 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender1]) satisfies $url != '']} #{field|name|BT-151-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender2]} // Contract URL
 					0 {OPT-320-LotResult[some text:$contractid in (for text:$tender in OPT-320-LotResult return BT-3202-Contract[BT-3202-Contract[BT-5011-Contract is present or BT-722-Contract is present or BT-6110-Contract is present] == $tender]) satisfies $contractid != '']} #{auxiliary|text|eu-funds-used} // Information about European Union funds used to finance the contract
-						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Name
+						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$name in BT-722-Contract[BT-3202-Contract == $tender2] return $name} // Contract EU Funds Name
 						{OPT-320-LotResult[some text:$eufundid in (for text:$tender1 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender1]) satisfies $eufundid != '']} #{field|name|BT-5011-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Identifier
 						{OPT-320-LotResult[some text:$eufunddesc in (for text:$tender1 in OPT-320-LotResult return BT-6110-Contract[BT-3202-Contract == $tender1]) satisfies $eufunddesc != '']} #{field|name|BT-6110-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$details in BT-6110-Contract[BT-3202-Contract == $tender2] return $details} // Contract EU Funds Details
 					{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-300-Contract-Signatory[BT-3202-Contract == $tender1]) > 0]} #{auxiliary|text|organisation-signing-contract}: ${for text:$tender2 in OPT-320-LotResult, text:$orgid in OPT-300-Contract-Signatory[BT-3202-Contract == $tender2], text:$orgname in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return $orgname} // Organisation signing the contract
@@ -237,12 +263,10 @@
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-165-Organization-Company} #{field|name|BT-165-Organization-Company}: ${BT-165-Organization-Company} // Size of the economic operator
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -274,44 +298,20 @@
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'serv-prov') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'serv-prov')]} #{auxiliary|text|organisation-providing-procurement-service} // This org is a Service Provider
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'ted-esen') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'ted-esen')]} #{auxiliary|text|organisation-esender} // This org is an eSender
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Part-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Part-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Part-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Part-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Part-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Part-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Part-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (PART)
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-300-Contract-Signatory) or (OPT-201-Organization-TouchPoint == OPT-300-Contract-Signatory)]} #{auxiliary|text|organisation-signing-contract} // Contract Signatory organisation (SettledContract)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Financing) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Financing)]} #{auxiliary|text|organisation-financing} // Financing Organisation (LotResult)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Paying) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Paying)]} #{auxiliary|text|organisation-paying} // Paying Organisation (LotResult)
 			0 {ND-Organization[(OPT-200-Organization-Company == OPT-300-Tenderer) or (OPT-201-Organization-TouchPoint == OPT-300-Tenderer)]} #{auxiliary|text|organisation-tenderer} // Tenderer Organisation (Tenderer)
 				{OPT-200-Organization-Company[some indicator:$leader in (for text:$orgid in OPT-200-Organization-Company, indicator:$groupleader in OPT-170-Tenderer[OPT-300-Tenderer == $orgid] return $groupleader) satisfies $leader == TRUE]} #{field|name|OPP-050-Organization} // Leader of the group
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Tenderer-SubCont) or (OPT-201-Organization-TouchPoint == OPT-301-Tenderer-SubCont)]} #{auxiliary|text|organisation-subcontractor} // Subcontractor Organisation (SubContractor)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
 			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -326,6 +326,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/39.efx b/view-templates/39.efx
index 129dcb7c5..4322947ae 100644
--- a/view-templates/39.efx
+++ b/view-templates/39.efx
@@ -73,7 +73,6 @@
 			{BT-137-Lot[BT-95-Lot is present]} #{field|name|BT-95-Lot}: ${BT-95-Lot} // Recurrence Description
 			{BT-60-Lot} #value // EU Funds
 			{BT-115-Lot[BT-115-Lot == TRUE]} #{field|name|BT-115-Lot} // GPA Coverage
-			0 {ND-LotTenderingProcess[(BT-125(i)-Lot is present) or (BT-1251-Lot is present)]} #{auxiliary|text|previous-planning}: // Information about previous notices - Previous planning
 			{BT-137-Lot[BT-300-Lot is present]} #{field|name|BT-300-Lot}: ${BT-300-Lot} // Additional information
 		7 {ND-LotProcurementScope[(BT-06-Lot is present) or (BT-777-Lot is present) or (BT-774-Lot is present) or (BT-775-Lot is present) or (BT-776-Lot is present) or (BT-805-Lot is present)]} #{auxiliary|text|strategic-procurement} // 5.1.7 Strategic procurement
 			0 {BT-06-Lot} #{field|name|BT-06-Lot}: #{BT-06-Lot} // Aim of strategic procurement
@@ -88,6 +87,14 @@
 			{BT-754-Lot} #{BT-754-Lot} // Accessibility 
 			{BT-137-Lot[BT-755-Lot is present]} #{field|name|BT-755-Lot}: ${BT-755-Lot} // Accessibility Justification
 		12 {BT-137-Lot[(BT-631-Lot is present) or (BT-130-Lot is present) or (BT-578-Lot == 'true') or (BT-732-Lot is present) or (BT-78-Lot is present) or (BT-42-Lot == TRUE) or (BT-46-Lot is present) or (BT-47-Lot is present) or (BT-644-Lot is present) or (BT-44-Lot is present) or (BT-41-Lot == TRUE) or (BT-45-Lot is present) or (BT-651-Lot is present) or (BT-17-Lot is present) or (BT-18-Lot is present) or (BT-19-Lot is present) or (BT-745-Lot is present) or (BT-97-Lot is present) or (BT-764-Lot is present) or (BT-744-Lot is present) or (BT-63-Lot is present) or (BT-769-Lot == 'allowed') or (BT-75-Lot is present) or (BT-630(d)-Lot is present) or (BT-1311(d)-Lot is present) or (BT-131(d)-Lot is present) or (BT-98-Lot is present) or ((BT-771-Lot is present) and (BT-772-Lot is present)) or (BT-132(d)-Lot is present) or (BT-133-Lot is present) or (BT-134-Lot is present) or (BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present) or (BT-99-Lot is present) or (OPP-020-Contract is present)]} #{auxiliary|text|procurement-terms} // 5.1.12 Procurement terms
+			0 {ND-LotTenderingTerms[(BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present)]} #{auxiliary|text|contract-terms}: // Terms of contract
+				{BT-736-Lot[BT-736-Lot != 'no']} #{field|name|BT-736-Lot}: #{BT-736-Lot} // The execution of the contract must be performed in the framework of sheltered employment programmes (yes / no / not-known)
+				{ND-ExecutionRequirements[BT-70-Lot is present]} #{field|name|BT-70-Lot}: ${BT-70-Lot} // Terms Performance
+				{BT-743-Lot} #{field|name|BT-743-Lot}: #{BT-743-Lot} // Electronic invoicing
+				{BT-92-Lot} #{field|name|BT-92-Lot}: #{code|name|${if (BT-92-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic ordering will be used (true / false)
+				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot}: #{code|name|${if (BT-93-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic payment will be used (true/false)
+				{BT-761-Lot[(BT-76-Lot is present)]} #{field|name|BT-76-Lot}: ${BT-76-Lot} // Legal form that must be taken by a group of tenderers that is awarded a contract
+				{ND-PaymentTerms[BT-77-Lot is present]} #{field|name|BT-77-Lot}: ${BT-77-Lot} // Financial arrangement
 			{BT-137-Lot[BT-99-Lot is present]} #{field|name|BT-99-Lot}: ${BT-99-Lot} // Information about review deadlines
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
 			{BT-137-Lot[OPT-301-Lot-Mediator is present]} #{auxiliary|text|organisation-mediation}: ${for text:$refid in OPT-301-Lot-Mediator, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Mediation organisation (Lot)
@@ -98,12 +105,12 @@
 			{BT-137-Lot[OPT-301-Lot-AddInfo is present]} #{auxiliary|text|organisation-providing-info-procedure}: ${for text:$refid in OPT-301-Lot-AddInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation providing additional information about the procurement procedure (Lot)
 			{BT-137-Lot[OPT-301-Lot-DocProvider is present]} #{auxiliary|text|organisation-providing-docs}: ${for text:$refid in OPT-301-Lot-DocProvider, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Documents provider organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-financing}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Financing Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-paying}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Paying Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$conid1 in OPT-315-LotResult[BT-13713-LotResult == $lotid1], text:$orgid1 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-signing-contract}: ${distinct-values(for text:$lotid2 in BT-137-Lot, text:$conid2 in OPT-315-LotResult[BT-13713-LotResult == $lotid2], text:$orgid2 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname)} // Contract Signatory (LotResult)
-6 {ND-Root[(BT-13713-LotResult is present)]} #{auxiliary|text|results} // 6. Results
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
+6 {ND-Root[(BT-3201-Tender is present)]} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} ${BT-161-NoticeResult/@currencyID} // Notice Value (Value of all contracts awarded in this procedure)
 	0 {ND-NoticeResult[BT-161-NoticeResult == -1]} #{field|name|BT-161-NoticeResult}: #{auxiliary|text|unpublished} // Notice Value (Value of all contracts awarded in this procedure) (unpublished)
 		{ND-NoticeValueUnpublish} #{field|name|BT-197(BT-161)-NoticeResult}: #{BT-197(BT-161)-NoticeResult} // Unpublished Justification Code
@@ -119,6 +126,18 @@
 		{ND-NoticeApproximateValueUnpublish} #{field|name|BT-197(BT-1118)-NoticeResult}: #{BT-197(BT-1118)-NoticeResult} // Unpublished Justification Code
 		{ND-NoticeApproximateValueUnpublish[BT-196(BT-1118)-NoticeResult is present]} #{field|name|BT-196(BT-1118)-NoticeResult}: ${BT-196(BT-1118)-NoticeResult} // Unpublished Justification Description
 		{ND-NoticeApproximateValueUnpublish[BT-198(BT-1118)-NoticeResult is present]} #{field|name|BT-198(BT-1118)-NoticeResult}: ${BT-198(BT-1118)-NoticeResult} // Unpublished Access Date
+	0 {ND-NoticeResultGroupFA[BT-556-NoticeResult != 'unpublished']} #{auxiliary|text|group-framework-value}: ${BT-556-NoticeResult} // Value of the framework agreements in this group of lots
+		0 {ND-NoticeResultGroupFA} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-556-NoticeResult return BT-1375-Procedure[BT-330-Procedure == $gloid] } // Lots included: LOT-0001, LOT-0003
+		0 {BT-156-NoticeResult[BT-156-NoticeResult != -1]} #{field|name|BT-156-NoticeResult}: ${format-number(BT-156-NoticeResult, '###,##0.##')} ${BT-156-NoticeResult/@currencyID} // Maximum value of the framework agreements in this group of lots
+		0 {BT-156-NoticeResult[BT-156-NoticeResult == -1]} #{field|name|BT-156-NoticeResult}:#{auxiliary|text|unpublished} // Maximum value of the framework agreements in this group of lots (unpublished)
+			{ND-GroupMaximumValueUnpublish} #{field|name|BT-197(BT-156)-NoticeResult}: #{BT-197(BT-156)-NoticeResult} // Unpublished Justification Code
+			{ND-GroupMaximumValueUnpublish[BT-196(BT-156)-NoticeResult is present]} #{field|name|BT-196(BT-156)-NoticeResult}: ${BT-196(BT-156)-NoticeResult} // Unpublished Justification Description
+			{ND-GroupMaximumValueUnpublish[BT-198(BT-156)-NoticeResult is present]} #{field|name|BT-198(BT-156)-NoticeResult}: ${BT-198(BT-156)-NoticeResult} // Unpublished Access Date
+		0 {BT-1561-NoticeResult[BT-1561-NoticeResult != -1]} #{field|name|BT-1561-NoticeResult}: ${format-number(BT-1561-NoticeResult, '###,##0.##')} ${BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID} // Re-estimated value of the framework agreements within a group of lots
+		0 {BT-1561-NoticeResult[BT-1561-NoticeResult == -1]} #{field|name|BT-1561-NoticeResult}: #{auxiliary|text|unpublished} // Re-estimated value of the framework agreements within a group of lots (unpublished)
+			{ND-GroupReestimatedValueUnpublish} #{field|name|BT-197(BT-1561)-NoticeResult}: #{BT-197(BT-1561)-NoticeResult} // Unpublished Justification Code
+			{ND-GroupReestimatedValueUnpublish[BT-196(BT-1561)-NoticeResult is present]} #{field|name|BT-196(BT-1561)-NoticeResult}: ${BT-196(BT-1561)-NoticeResult} // Unpublished Justification Description
+			{ND-GroupReestimatedValueUnpublish[BT-198(BT-1561)-NoticeResult is present]} #{field|name|BT-198(BT-1561)-NoticeResult}: ${BT-198(BT-1561)-NoticeResult} // Unpublished Access Date
 	0 {ND-NoticeResultGroupFA[BT-556-NoticeResult == 'unpublished']} #{auxiliary|text|group-framework-value}: #{auxiliary|text|unpublished} // Value of the framework agreements in this group of lots (unpublished)
 		{ND-GroupMaximalValueIdentifierUnpublish} #{field|name|BT-197(BT-556)-NoticeResult}: #{BT-197(BT-556)-NoticeResult} // Unpublished Justification Code
 		{ND-GroupMaximalValueIdentifierUnpublish[BT-196(BT-556)-NoticeResult is present]} #{field|name|BT-196(BT-556)-NoticeResult}: ${BT-196(BT-556)-NoticeResult} // Unpublished Justification Description
@@ -148,6 +167,11 @@
 				{ND-ReestimatedValueUnpublish[BT-198(BT-660)-LotResult is present]} #{field|name|BT-198(BT-660)-LotResult}: ${BT-198(BT-660)-LotResult} // Unpublished Access Date
 		2 {ND-LotResult[BT-02-notice == 'veat' or BT-02-notice == 'can-modif' or ((BT-142-LotResult == 'selec-w' or BT-142-LotResult == 'unpublished') and OPT-320-LotResult is present and OPT-315-LotResult is present)]} #{auxiliary|text|winner-info} // 6.1.2. Winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]])>0]} #{auxiliary|text|winner}: // Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Name of this winner (single organisation in Tendering Party)
+				0 {OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{auxiliary|text|winner-subcontractor}: // Subcontractors of the winner
+					{OPT-320-LotResult[some text:$orgname1 in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $orgname1 != '']} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]], text:$orgname2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($orgname2, ', ')} // Subcontractor names
 				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]])>0]} #{auxiliary|text|tender}: // Tender
 				{OPT-320-LotResult} #{field|name|BT-3201-Tender}: ${for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender == $tender]} // Tender identifier
 				{OPT-320-LotResult} #{field|name|BT-13714-Tender}: ${for text:$tender in OPT-320-LotResult return BT-13714-Tender[OPT-321-Tender == $tender]} // Identifier of lot or group of lots
@@ -167,8 +191,9 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-773)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-730-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
-					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-730-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-730-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties (unpublished)
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$code2 in BT-197(BT-730)-Tender[OPT-321-Tender == $tender2] return $code2} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $desc != '']} #{field|name|BT-196(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc1 in BT-196(BT-730)-Tender[OPT-321-Tender == $tender2] return $desc1} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-553-Tender[BT-553-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-553-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-553-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} ${for text:$tender3 in OPT-320-LotResult return BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID} // Estimated value of the part of the contract that the contractor will subcontract to third parties
@@ -176,7 +201,8 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-553)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-731-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$spk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $spk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-731-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-731)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
@@ -197,7 +223,7 @@
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-145-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-145-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-145-Contract[BT-3202-Contract == $tender2]} // Contract Conclusion Date
 					{OPT-320-LotResult[some text:$url in (for text:$tender1 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender1]) satisfies $url != '']} #{field|name|BT-151-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender2]} // Contract URL
 					0 {OPT-320-LotResult[some text:$contractid in (for text:$tender in OPT-320-LotResult return BT-3202-Contract[BT-3202-Contract[BT-5011-Contract is present or BT-722-Contract is present or BT-6110-Contract is present] == $tender]) satisfies $contractid != '']} #{auxiliary|text|eu-funds-used} // Information about European Union funds used to finance the contract
-						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Name
+						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$name in BT-722-Contract[BT-3202-Contract == $tender2] return $name} // Contract EU Funds Name
 						{OPT-320-LotResult[some text:$eufundid in (for text:$tender1 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender1]) satisfies $eufundid != '']} #{field|name|BT-5011-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Identifier
 						{OPT-320-LotResult[some text:$eufunddesc in (for text:$tender1 in OPT-320-LotResult return BT-6110-Contract[BT-3202-Contract == $tender1]) satisfies $eufunddesc != '']} #{field|name|BT-6110-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$details in BT-6110-Contract[BT-3202-Contract == $tender2] return $details} // Contract EU Funds Details
 					{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-300-Contract-Signatory[BT-3202-Contract == $tender1]) > 0]} #{auxiliary|text|organisation-signing-contract}: ${for text:$tender2 in OPT-320-LotResult, text:$orgid in OPT-300-Contract-Signatory[BT-3202-Contract == $tender2], text:$orgname in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return $orgname} // Organisation signing the contract
@@ -237,12 +263,10 @@
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-165-Organization-Company} #{field|name|BT-165-Organization-Company}: ${BT-165-Organization-Company} // Size of the economic operator
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -274,44 +298,20 @@
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'serv-prov') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'serv-prov')]} #{auxiliary|text|organisation-providing-procurement-service} // This org is a Service Provider
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'ted-esen') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'ted-esen')]} #{auxiliary|text|organisation-esender} // This org is an eSender
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Part-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Part-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Part-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Part-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Part-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Part-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Part-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (PART)
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-300-Contract-Signatory) or (OPT-201-Organization-TouchPoint == OPT-300-Contract-Signatory)]} #{auxiliary|text|organisation-signing-contract} // Contract Signatory organisation (SettledContract)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Financing) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Financing)]} #{auxiliary|text|organisation-financing} // Financing Organisation (LotResult)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Paying) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Paying)]} #{auxiliary|text|organisation-paying} // Paying Organisation (LotResult)
 			0 {ND-Organization[(OPT-200-Organization-Company == OPT-300-Tenderer) or (OPT-201-Organization-TouchPoint == OPT-300-Tenderer)]} #{auxiliary|text|organisation-tenderer} // Tenderer Organisation (Tenderer)
 				{OPT-200-Organization-Company[some indicator:$leader in (for text:$orgid in OPT-200-Organization-Company, indicator:$groupleader in OPT-170-Tenderer[OPT-300-Tenderer == $orgid] return $groupleader) satisfies $leader == TRUE]} #{field|name|OPP-050-Organization} // Leader of the group
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Tenderer-SubCont) or (OPT-201-Organization-TouchPoint == OPT-301-Tenderer-SubCont)]} #{auxiliary|text|organisation-subcontractor} // Subcontractor Organisation (SubContractor)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
 			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -326,6 +326,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/4.efx b/view-templates/4.efx
index 91f45404c..5b3ab1c0a 100644
--- a/view-templates/4.efx
+++ b/view-templates/4.efx
@@ -27,7 +27,6 @@
 			{ND-ProcedurePlacePerformance[BT-728-Procedure is present]} #{field|name|BT-728-Procedure}: ${BT-728-Procedure} // Place Performance Additional information
 		3 {ND-ProcedureProcurementScope[(BT-27-Procedure is present) or (BT-271-Procedure is present)]} #{auxiliary|text|value} // 2.1.3 Value
 			{BT-27-Procedure} #{field|name|BT-27-Procedure}: ${format-number(BT-27-Procedure, '###,##0.##')} ${BT-27-Procedure/@currencyID} // Estimated value
-			{BT-271-Procedure} #{field|name|BT-271-Procedure}: ${format-number(BT-271-Procedure, '###,##0.##')} ${BT-271-Procedure/@currencyID} // Estimated Framework Maximum Value
 		4 {ND-ProcedureProcurementScope[BT-01-notice is present]} #{auxiliary|text|general-information} // 2.1.4 General information
 			{ND-ProcedureProcurementScope[BT-300-Procedure is present]} #{field|name|BT-300-Procedure}: ${BT-300-Procedure} // Additional information
 			{ND-ProcedureProcurementScope} #{auxiliary|text|legal-basis}: // Legal basis
@@ -56,6 +55,7 @@
 			{BT-536-Part} #{field|name|BT-536-Part}: ${BT-536-Part} // Start date
 			{BT-537-Part} #{field|name|BT-537-Part}: ${BT-537-Part} // End date
 			{BT-36-Part} #{field|name|BT-36-Part}: ${format-number(OPA-36-Part-Number, '###,##0.###,###,###')} ${BT-36-Part/@unitCode} // Period
+			{BT-538-Part} #{field|name|BT-538-Part}: #{BT-538-Part} // Planned Period (Unlimited)
 		4 {ND-PartValueEstimate[(BT-27-Part is present)]} #{auxiliary|text|value} // 3.1.4 Value
 			{BT-27-Part} #{field|name|BT-27-Part}: ${format-number(BT-27-Part, '###,##0.##')} ${BT-27-Part/@currencyID} // Estimated value excluding VAT
 		5 {BT-137-Part[(BT-71-Part is present) or (BT-115-Part == TRUE) or (BT-726-Part == TRUE) or (BT-125(i)-Part is present) or (BT-1251-Part is present) or (BT-300-Part is present)]} #{auxiliary|text|general-information} // 3.1.5 General information
@@ -70,8 +70,8 @@
 		6 {BT-137-Part[(BT-15-Part is present) or (BT-14-Part is present) or (BT-707-Part is present) or (BT-13(d)-Part is present) or (BT-708-Part is present) or (BT-737-Part is present) or (BT-632-Part is present) or (BT-124-Part is present)]} #{auxiliary|text|procurement-documents} // 3.1.6 Procurement documents (PART)
 			{BT-137-Part[some text:$restricted in (for text:$somerestricted in BT-14-Part return $somerestricted) satisfies $restricted == 'restricted-document']} #{field|name|BT-14-Part} // The access to certain procurement documents is restricted. (PART)
 			{BT-707-Part[BT-707-Part is present]} #{field|name|BT-707-Part}: #{BT-707-Part} // Justification for restricting access to certain procurement documents (PART)
-			{BT-137-Part[BT-708-Part is present]} #{field|name|BT-708-Part}: ${distinct-values(for text:$lang in BT-708-Part return $lang)} // Languages in which the procurement documents are officially available (PART)
-			{BT-137-Part[BT-737-Part is present]} #{field|name|BT-737-Part}: ${distinct-values(for text:$lang in BT-737-Part return $lang)} // Languages in which the procurement documents are unofficially available (PART)
+			{BT-137-Part[BT-708-Part is present]} #{field|name|BT-708-Part}: #{BT-708-Part} // Languages in which the procurement documents are officially available (PART)
+			{BT-137-Part[BT-737-Part is present]} #{field|name|BT-737-Part}: #{BT-737-Part} // Languages in which the procurement documents are unofficially available (PART)
 			{BT-137-Part[BT-615-Part is present]} #{field|name|BT-615-Part}: ${distinct-values(for text:$url in BT-615-Part return concat($url, ', '))} // Information about restricted documents is available at (PART) 
 			{BT-137-Part[BT-15-Part is present]} #{field|name|BT-15-Part}: ${distinct-values(for text:$url in BT-15-Part return concat($url, ', '))} // Information about non-restricted documents is available at (PART) 
 			{BT-137-Part[BT-13(d)-Part is present]} #{field|name|BT-13(d)-Part}: ${BT-13(d)-Part} ${BT-13(t)-Part} // Deadline for requesting additional information
@@ -80,8 +80,8 @@
 				{BT-124-Part} #{field|name|BT-124-Part}: ${BT-124-Part} // Tool Atypical URL (Part)
 		7 {BT-137-Part[BT-736-Part is present]} #{auxiliary|text|procurement-terms} // 3.1.7 Procurement Terms (PART)
 			{BT-736-Part[BT-736-Part != 'no']} #{field|name|BT-736-Part}: #{BT-736-Part} // Reserved Execution (PART)
-		8 {ND-PartTenderingProcess[(BT-765-Part != 'none') or (BT-766-Part != 'none')]} #{auxiliary|text|techniques} // 3.1.8 Techniques
-			{BT-765-Part[BT-765-Part != 'none']} #{auxiliary|text|framework-agreement} #{BT-765-Part} // Information about framework agreement (PART)
+		8 {ND-PartTenderingProcess[(BT-765-Part is present) or (BT-766-Part is present)]} #{auxiliary|text|techniques} // 3.1.8 Techniques
+			{BT-765-Part} #{auxiliary|text|framework-agreement} #{BT-765-Part} // Information about framework agreement (PART)
 			{BT-766-Part[BT-766-Part != 'none']} #{BT-766-Part} // Dynamic purchasing system, also usable by buyers not listed in this notice (PART)
 		9 {ND-PartTenderingTerms[(OPT-301-Part-Mediator is present) or (OPT-301-Part-ReviewOrg is present) or (OPT-301-Part-FiscalLegis is present) or (OPT-301-Part-EnvironLegis is present) or (OPT-301-Part-EmployLegis is present) or (OPT-301-Part-AddInfo is present) or (OPT-301-Part-DocProvider is present) or (OPT-301-Part-ReviewInfo is present) or (OPT-301-Part-TenderReceipt is present) or (OPT-301-Part-TenderEval is present)]} #{auxiliary|text|further-info} // 3.1.9 Further information, mediation and review
 			{BT-137-Part[OPT-301-Part-Mediator is present]} #{auxiliary|text|organisation-mediation}: ${for text:$refid in OPT-301-Part-Mediator, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Mediation organisation (Part)
@@ -97,11 +97,10 @@
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -143,19 +142,6 @@
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (PART)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -170,6 +156,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/40.efx b/view-templates/40.efx
index 3edf3dd68..ff380ad21 100644
--- a/view-templates/40.efx
+++ b/view-templates/40.efx
@@ -73,7 +73,6 @@
 			{BT-137-Lot[BT-95-Lot is present]} #{field|name|BT-95-Lot}: ${BT-95-Lot} // Recurrence Description
 			{BT-60-Lot} #value // EU Funds
 			{BT-115-Lot[BT-115-Lot == TRUE]} #{field|name|BT-115-Lot} // GPA Coverage
-			0 {ND-LotTenderingProcess[(BT-125(i)-Lot is present) or (BT-1251-Lot is present)]} #{auxiliary|text|previous-planning}: // Information about previous notices - Previous planning
 			{BT-137-Lot[BT-300-Lot is present]} #{field|name|BT-300-Lot}: ${BT-300-Lot} // Additional information
 		7 {ND-LotProcurementScope[(BT-06-Lot is present) or (BT-777-Lot is present) or (BT-774-Lot is present) or (BT-775-Lot is present) or (BT-776-Lot is present) or (BT-805-Lot is present)]} #{auxiliary|text|strategic-procurement} // 5.1.7 Strategic procurement
 			0 {BT-06-Lot} #{field|name|BT-06-Lot}: #{BT-06-Lot} // Aim of strategic procurement
@@ -88,6 +87,14 @@
 			{BT-754-Lot} #{BT-754-Lot} // Accessibility 
 			{BT-137-Lot[BT-755-Lot is present]} #{field|name|BT-755-Lot}: ${BT-755-Lot} // Accessibility Justification
 		12 {BT-137-Lot[(BT-631-Lot is present) or (BT-130-Lot is present) or (BT-578-Lot == 'true') or (BT-732-Lot is present) or (BT-78-Lot is present) or (BT-42-Lot == TRUE) or (BT-46-Lot is present) or (BT-47-Lot is present) or (BT-644-Lot is present) or (BT-44-Lot is present) or (BT-41-Lot == TRUE) or (BT-45-Lot is present) or (BT-651-Lot is present) or (BT-17-Lot is present) or (BT-18-Lot is present) or (BT-19-Lot is present) or (BT-745-Lot is present) or (BT-97-Lot is present) or (BT-764-Lot is present) or (BT-744-Lot is present) or (BT-63-Lot is present) or (BT-769-Lot == 'allowed') or (BT-75-Lot is present) or (BT-630(d)-Lot is present) or (BT-1311(d)-Lot is present) or (BT-131(d)-Lot is present) or (BT-98-Lot is present) or ((BT-771-Lot is present) and (BT-772-Lot is present)) or (BT-132(d)-Lot is present) or (BT-133-Lot is present) or (BT-134-Lot is present) or (BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present) or (BT-99-Lot is present) or (OPP-020-Contract is present)]} #{auxiliary|text|procurement-terms} // 5.1.12 Procurement terms
+			0 {ND-LotTenderingTerms[(BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present)]} #{auxiliary|text|contract-terms}: // Terms of contract
+				{BT-736-Lot[BT-736-Lot != 'no']} #{field|name|BT-736-Lot}: #{BT-736-Lot} // The execution of the contract must be performed in the framework of sheltered employment programmes (yes / no / not-known)
+				{ND-ExecutionRequirements[BT-70-Lot is present]} #{field|name|BT-70-Lot}: ${BT-70-Lot} // Terms Performance
+				{BT-743-Lot} #{field|name|BT-743-Lot}: #{BT-743-Lot} // Electronic invoicing
+				{BT-92-Lot} #{field|name|BT-92-Lot}: #{code|name|${if (BT-92-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic ordering will be used (true / false)
+				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot}: #{code|name|${if (BT-93-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic payment will be used (true/false)
+				{BT-761-Lot[(BT-76-Lot is present)]} #{field|name|BT-76-Lot}: ${BT-76-Lot} // Legal form that must be taken by a group of tenderers that is awarded a contract
+				{ND-PaymentTerms[BT-77-Lot is present]} #{field|name|BT-77-Lot}: ${BT-77-Lot} // Financial arrangement
 			{BT-137-Lot[BT-99-Lot is present]} #{field|name|BT-99-Lot}: ${BT-99-Lot} // Information about review deadlines
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
 			{BT-137-Lot[OPT-301-Lot-Mediator is present]} #{auxiliary|text|organisation-mediation}: ${for text:$refid in OPT-301-Lot-Mediator, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Mediation organisation (Lot)
@@ -98,12 +105,12 @@
 			{BT-137-Lot[OPT-301-Lot-AddInfo is present]} #{auxiliary|text|organisation-providing-info-procedure}: ${for text:$refid in OPT-301-Lot-AddInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation providing additional information about the procurement procedure (Lot)
 			{BT-137-Lot[OPT-301-Lot-DocProvider is present]} #{auxiliary|text|organisation-providing-docs}: ${for text:$refid in OPT-301-Lot-DocProvider, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Documents provider organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-financing}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Financing Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-paying}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Paying Organisation (LotResult)
 			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$conid1 in OPT-315-LotResult[BT-13713-LotResult == $lotid1], text:$orgid1 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-signing-contract}: ${distinct-values(for text:$lotid2 in BT-137-Lot, text:$conid2 in OPT-315-LotResult[BT-13713-LotResult == $lotid2], text:$orgid2 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname)} // Contract Signatory (LotResult)
-6 {ND-Root[(BT-13713-LotResult is present)]} #{auxiliary|text|results} // 6. Results
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
+6 {ND-Root[(BT-3201-Tender is present)]} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} ${BT-161-NoticeResult/@currencyID} // Notice Value (Value of all contracts awarded in this procedure)
 	0 {ND-NoticeResult[BT-161-NoticeResult == -1]} #{field|name|BT-161-NoticeResult}: #{auxiliary|text|unpublished} // Notice Value (Value of all contracts awarded in this procedure) (unpublished)
 		{ND-NoticeValueUnpublish} #{field|name|BT-197(BT-161)-NoticeResult}: #{BT-197(BT-161)-NoticeResult} // Unpublished Justification Code
@@ -113,6 +120,11 @@
 		0 {ND-LotResultFAValues} #{auxiliary|text|framework-agreement}: // Framework agreement
 		2 {ND-LotResult[BT-02-notice == 'veat' or BT-02-notice == 'can-modif' or ((BT-142-LotResult == 'selec-w' or BT-142-LotResult == 'unpublished') and OPT-320-LotResult is present and OPT-315-LotResult is present)]} #{auxiliary|text|winner-info} // 6.1.2. Winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]])>0]} #{auxiliary|text|winner}: // Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Name of this winner (single organisation in Tendering Party)
+				0 {OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{auxiliary|text|winner-subcontractor}: // Subcontractors of the winner
+					{OPT-320-LotResult[some text:$orgname1 in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $orgname1 != '']} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]], text:$orgname2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($orgname2, ', ')} // Subcontractor names
 				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]])>0]} #{auxiliary|text|tender}: // Tender
 				{OPT-320-LotResult} #{field|name|BT-3201-Tender}: ${for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender == $tender]} // Tender identifier
 				{OPT-320-LotResult} #{field|name|BT-13714-Tender}: ${for text:$tender in OPT-320-LotResult return BT-13714-Tender[OPT-321-Tender == $tender]} // Identifier of lot or group of lots
@@ -148,8 +160,9 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-773)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-773)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-773)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-730-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
-					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-730-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-730-Tender[OPT-321-Tender == $tender2]) satisfies $svk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-730)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-730-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties (unpublished)
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$code2 in BT-197(BT-730)-Tender[OPT-321-Tender == $tender2] return $code2} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $desc != '']} #{field|name|BT-196(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc1 in BT-196(BT-730)-Tender[OPT-321-Tender == $tender2] return $desc1} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-730)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-553-Tender[BT-553-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-553-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-553-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} ${for text:$tender3 in OPT-320-LotResult return BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID} // Estimated value of the part of the contract that the contractor will subcontract to third parties
@@ -157,7 +170,8 @@
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-553)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-553)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-553)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[(some indicator:$svk in (for text:$tender1 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender1]) satisfies ($svk == TRUE or $svk == FALSE))]} #{field|name|BT-731-Tender}: ${if (some indicator:$svk1 in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk1 == TRUE) then 'Yes' else if (some text:$svku in (for text:$tender3 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender3]) satisfies $svku != '' ) then '0' else 'No'} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) == 0]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$spk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $spk == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+				0 {OPT-320-LotResult[count (for text:$tender1 in OPT-320-LotResult return BT-195(BT-731)-Tender[OPT-321-Tender == $tender1]) > 0]} #{field|name|BT-731-Tender}: #{auxiliary|text|unpublished} // The Buyer knows the estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-731)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
@@ -178,7 +192,7 @@
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-145-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-145-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-145-Contract[BT-3202-Contract == $tender2]} // Contract Conclusion Date
 					{OPT-320-LotResult[some text:$url in (for text:$tender1 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender1]) satisfies $url != '']} #{field|name|BT-151-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender2]} // Contract URL
 					0 {OPT-320-LotResult[some text:$contractid in (for text:$tender in OPT-320-LotResult return BT-3202-Contract[BT-3202-Contract[BT-5011-Contract is present or BT-722-Contract is present or BT-6110-Contract is present] == $tender]) satisfies $contractid != '']} #{auxiliary|text|eu-funds-used} // Information about European Union funds used to finance the contract
-						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Name
+						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$name in BT-722-Contract[BT-3202-Contract == $tender2] return $name} // Contract EU Funds Name
 						{OPT-320-LotResult[some text:$eufundid in (for text:$tender1 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender1]) satisfies $eufundid != '']} #{field|name|BT-5011-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-5011-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Identifier
 						{OPT-320-LotResult[some text:$eufunddesc in (for text:$tender1 in OPT-320-LotResult return BT-6110-Contract[BT-3202-Contract == $tender1]) satisfies $eufunddesc != '']} #{field|name|BT-6110-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$details in BT-6110-Contract[BT-3202-Contract == $tender2] return $details} // Contract EU Funds Details
 					{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-300-Contract-Signatory[BT-3202-Contract == $tender1]) > 0]} #{auxiliary|text|organisation-signing-contract}: ${for text:$tender2 in OPT-320-LotResult, text:$orgid in OPT-300-Contract-Signatory[BT-3202-Contract == $tender2], text:$orgname in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return $orgname} // Organisation signing the contract
@@ -218,12 +232,10 @@
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-165-Organization-Company} #{field|name|BT-165-Organization-Company}: ${BT-165-Organization-Company} // Size of the economic operator
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -250,49 +262,23 @@
 		0 {ND-Organization} #{auxiliary|text|roles}: // Roles of this organisation
 			0 {ND-Organization[count(for text:$orgid in OPT-200-Organization-Company return OPT-300-Procedure-Buyer[OPT-300-Procedure-Buyer == $orgid])>0]} #{auxiliary|text|buyer} // This org is a Buyer
 				{OPP-050-Organization[OPP-050-Organization == TRUE]} #{field|name|OPP-050-Organization} // Leader of the group
-				{OPP-052-Organization[OPP-052-Organization == TRUE]} #{field|name|OPP-052-Organization} // CPB Acquiring
-				{OPP-051-Organization[OPP-051-Organization == TRUE]} #{field|name|OPP-051-Organization} // CPB Awarding
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'serv-prov') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'serv-prov')]} #{auxiliary|text|organisation-providing-procurement-service} // This org is a Service Provider
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'ted-esen') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'ted-esen')]} #{auxiliary|text|organisation-esender} // This org is an eSender
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Part-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Part-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Part-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Part-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Part-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Part-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Part-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (PART)
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-300-Contract-Signatory) or (OPT-201-Organization-TouchPoint == OPT-300-Contract-Signatory)]} #{auxiliary|text|organisation-signing-contract} // Contract Signatory organisation (SettledContract)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Financing) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Financing)]} #{auxiliary|text|organisation-financing} // Financing Organisation (LotResult)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Paying) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Paying)]} #{auxiliary|text|organisation-paying} // Paying Organisation (LotResult)
 			0 {ND-Organization[(OPT-200-Organization-Company == OPT-300-Tenderer) or (OPT-201-Organization-TouchPoint == OPT-300-Tenderer)]} #{auxiliary|text|organisation-tenderer} // Tenderer Organisation (Tenderer)
 				{OPT-200-Organization-Company[some indicator:$leader in (for text:$orgid in OPT-200-Organization-Company, indicator:$groupleader in OPT-170-Tenderer[OPT-300-Tenderer == $orgid] return $groupleader) satisfies $leader == TRUE]} #{field|name|OPP-050-Organization} // Leader of the group
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Tenderer-SubCont) or (OPT-201-Organization-TouchPoint == OPT-301-Tenderer-SubCont)]} #{auxiliary|text|organisation-subcontractor} // Subcontractor Organisation (SubContractor)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
 			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -307,6 +293,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/5.efx b/view-templates/5.efx
index 568137f3d..1e73019bd 100644
--- a/view-templates/5.efx
+++ b/view-templates/5.efx
@@ -28,7 +28,6 @@
 			{ND-ProcedurePlacePerformance[BT-728-Procedure is present]} #{field|name|BT-728-Procedure}: ${BT-728-Procedure} // Place Performance Additional information
 		3 {ND-ProcedureProcurementScope[(BT-27-Procedure is present) or (BT-271-Procedure is present)]} #{auxiliary|text|value} // 2.1.3 Value
 			{BT-27-Procedure} #{field|name|BT-27-Procedure}: ${format-number(BT-27-Procedure, '###,##0.##')} ${BT-27-Procedure/@currencyID} // Estimated value
-			{BT-271-Procedure} #{field|name|BT-271-Procedure}: ${format-number(BT-271-Procedure, '###,##0.##')} ${BT-271-Procedure/@currencyID} // Estimated Framework Maximum Value
 		4 {ND-ProcedureProcurementScope[BT-01-notice is present]} #{auxiliary|text|general-information} // 2.1.4 General information
 			{ND-ProcedureProcurementScope[BT-300-Procedure is present]} #{field|name|BT-300-Procedure}: ${BT-300-Procedure} // Additional information
 			{ND-ProcedureProcurementScope} #{auxiliary|text|legal-basis}: // Legal basis
@@ -57,6 +56,7 @@
 			{BT-536-Part} #{field|name|BT-536-Part}: ${BT-536-Part} // Start date
 			{BT-537-Part} #{field|name|BT-537-Part}: ${BT-537-Part} // End date
 			{BT-36-Part} #{field|name|BT-36-Part}: ${format-number(OPA-36-Part-Number, '###,##0.###,###,###')} ${BT-36-Part/@unitCode} // Period
+			{BT-538-Part} #{field|name|BT-538-Part}: #{BT-538-Part} // Planned Period (Unlimited)
 		4 {ND-PartValueEstimate[(BT-27-Part is present)]} #{auxiliary|text|value} // 3.1.4 Value
 			{BT-27-Part} #{field|name|BT-27-Part}: ${format-number(BT-27-Part, '###,##0.##')} ${BT-27-Part/@currencyID} // Estimated value excluding VAT
 		5 {BT-137-Part[(BT-71-Part is present) or (BT-115-Part == TRUE) or (BT-726-Part == TRUE) or (BT-125(i)-Part is present) or (BT-1251-Part is present) or (BT-300-Part is present)]} #{auxiliary|text|general-information} // 3.1.5 General information
@@ -71,8 +71,8 @@
 		6 {BT-137-Part[(BT-15-Part is present) or (BT-14-Part is present) or (BT-707-Part is present) or (BT-13(d)-Part is present) or (BT-708-Part is present) or (BT-737-Part is present) or (BT-632-Part is present) or (BT-124-Part is present)]} #{auxiliary|text|procurement-documents} // 3.1.6 Procurement documents (PART)
 			{BT-137-Part[some text:$restricted in (for text:$somerestricted in BT-14-Part return $somerestricted) satisfies $restricted == 'restricted-document']} #{field|name|BT-14-Part} // The access to certain procurement documents is restricted. (PART)
 			{BT-707-Part[BT-707-Part is present]} #{field|name|BT-707-Part}: #{BT-707-Part} // Justification for restricting access to certain procurement documents (PART)
-			{BT-137-Part[BT-708-Part is present]} #{field|name|BT-708-Part}: ${distinct-values(for text:$lang in BT-708-Part return $lang)} // Languages in which the procurement documents are officially available (PART)
-			{BT-137-Part[BT-737-Part is present]} #{field|name|BT-737-Part}: ${distinct-values(for text:$lang in BT-737-Part return $lang)} // Languages in which the procurement documents are unofficially available (PART)
+			{BT-137-Part[BT-708-Part is present]} #{field|name|BT-708-Part}: #{BT-708-Part} // Languages in which the procurement documents are officially available (PART)
+			{BT-137-Part[BT-737-Part is present]} #{field|name|BT-737-Part}: #{BT-737-Part} // Languages in which the procurement documents are unofficially available (PART)
 			{BT-137-Part[BT-615-Part is present]} #{field|name|BT-615-Part}: ${distinct-values(for text:$url in BT-615-Part return concat($url, ', '))} // Information about restricted documents is available at (PART) 
 			{BT-137-Part[BT-15-Part is present]} #{field|name|BT-15-Part}: ${distinct-values(for text:$url in BT-15-Part return concat($url, ', '))} // Information about non-restricted documents is available at (PART) 
 			{BT-137-Part[BT-13(d)-Part is present]} #{field|name|BT-13(d)-Part}: ${BT-13(d)-Part} ${BT-13(t)-Part} // Deadline for requesting additional information
@@ -81,8 +81,8 @@
 				{BT-124-Part} #{field|name|BT-124-Part}: ${BT-124-Part} // Tool Atypical URL (Part)
 		7 {BT-137-Part[BT-736-Part is present]} #{auxiliary|text|procurement-terms} // 3.1.7 Procurement Terms (PART)
 			{BT-736-Part[BT-736-Part != 'no']} #{field|name|BT-736-Part}: #{BT-736-Part} // Reserved Execution (PART)
-		8 {ND-PartTenderingProcess[(BT-765-Part != 'none') or (BT-766-Part != 'none')]} #{auxiliary|text|techniques} // 3.1.8 Techniques
-			{BT-765-Part[BT-765-Part != 'none']} #{auxiliary|text|framework-agreement} #{BT-765-Part} // Information about framework agreement (PART)
+		8 {ND-PartTenderingProcess[(BT-765-Part is present) or (BT-766-Part is present)]} #{auxiliary|text|techniques} // 3.1.8 Techniques
+			{BT-765-Part} #{auxiliary|text|framework-agreement} #{BT-765-Part} // Information about framework agreement (PART)
 			{BT-766-Part[BT-766-Part != 'none']} #{BT-766-Part} // Dynamic purchasing system, also usable by buyers not listed in this notice (PART)
 		9 {ND-PartTenderingTerms[(OPT-301-Part-Mediator is present) or (OPT-301-Part-ReviewOrg is present) or (OPT-301-Part-FiscalLegis is present) or (OPT-301-Part-EnvironLegis is present) or (OPT-301-Part-EmployLegis is present) or (OPT-301-Part-AddInfo is present) or (OPT-301-Part-DocProvider is present) or (OPT-301-Part-ReviewInfo is present) or (OPT-301-Part-TenderReceipt is present) or (OPT-301-Part-TenderEval is present)]} #{auxiliary|text|further-info} // 3.1.9 Further information, mediation and review
 			{BT-137-Part[OPT-301-Part-Mediator is present]} #{auxiliary|text|organisation-mediation}: ${for text:$refid in OPT-301-Part-Mediator, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Mediation organisation (Part)
@@ -98,11 +98,10 @@
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -144,19 +143,6 @@
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (PART)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -171,6 +157,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/6.efx b/view-templates/6.efx
index fb8441788..db6647211 100644
--- a/view-templates/6.efx
+++ b/view-templates/6.efx
@@ -29,7 +29,6 @@
 			{ND-ProcedurePlacePerformance[BT-728-Procedure is present]} #{field|name|BT-728-Procedure}: ${BT-728-Procedure} // Place Performance Additional information
 		3 {ND-ProcedureProcurementScope[(BT-27-Procedure is present) or (BT-271-Procedure is present)]} #{auxiliary|text|value} // 2.1.3 Value
 			{BT-27-Procedure} #{field|name|BT-27-Procedure}: ${format-number(BT-27-Procedure, '###,##0.##')} ${BT-27-Procedure/@currencyID} // Estimated value
-			{BT-271-Procedure} #{field|name|BT-271-Procedure}: ${format-number(BT-271-Procedure, '###,##0.##')} ${BT-271-Procedure/@currencyID} // Estimated Framework Maximum Value
 		4 {ND-ProcedureProcurementScope[BT-01-notice is present]} #{auxiliary|text|general-information} // 2.1.4 General information
 			{ND-ProcedureProcurementScope[BT-300-Procedure is present]} #{field|name|BT-300-Procedure}: ${BT-300-Procedure} // Additional information
 			{ND-ProcedureProcurementScope} #{auxiliary|text|legal-basis}: // Legal basis
@@ -58,12 +57,12 @@
 			{BT-536-Part} #{field|name|BT-536-Part}: ${BT-536-Part} // Start date
 			{BT-537-Part} #{field|name|BT-537-Part}: ${BT-537-Part} // End date
 			{BT-36-Part} #{field|name|BT-36-Part}: ${format-number(OPA-36-Part-Number, '###,##0.###,###,###')} ${BT-36-Part/@unitCode} // Period
+			{BT-538-Part} #{field|name|BT-538-Part}: #{BT-538-Part} // Planned Period (Unlimited)
 		4 {ND-PartValueEstimate[(BT-27-Part is present)]} #{auxiliary|text|value} // 3.1.4 Value
 			{BT-27-Part} #{field|name|BT-27-Part}: ${format-number(BT-27-Part, '###,##0.##')} ${BT-27-Part/@currencyID} // Estimated value excluding VAT
 		5 {BT-137-Part[(BT-71-Part is present) or (BT-115-Part == TRUE) or (BT-726-Part == TRUE) or (BT-125(i)-Part is present) or (BT-1251-Part is present) or (BT-300-Part is present)]} #{auxiliary|text|general-information} // 3.1.5 General information
 			{BT-137-Part[BT-71-Part == 'none']} #{field|name|BT-71-Part}: #{BT-71-Part} // Reserved Participation: none (PART)
 			{BT-71-Part[BT-71-Part != 'none']} #{field|name|BT-71-Part}: #{BT-71-Part} // Reserved Participation (PART)
-			{BT-115-Part[BT-115-Part == TRUE]} #{field|name|BT-115-Part} // GPA Coverage (true/false) 
 			{BT-726-Part[BT-726-Part == TRUE]} #{field|name|BT-726-Part} // This procurement is also suitable for small and medium-sized enterprises (SMEs). (true/false)
 			0 {BT-137-Part[(BT-125(i)-Part is present) or (BT-1251-Part is present)]} #{auxiliary|text|previous-planning} // Information about previous notices
 				{BT-125(i)-Part} #{field|name|BT-125(i)-Part}: ${BT-125(i)-Part} // Identifier of the previous notice
@@ -72,8 +71,8 @@
 		6 {BT-137-Part[(BT-15-Part is present) or (BT-14-Part is present) or (BT-707-Part is present) or (BT-13(d)-Part is present) or (BT-708-Part is present) or (BT-737-Part is present) or (BT-632-Part is present) or (BT-124-Part is present)]} #{auxiliary|text|procurement-documents} // 3.1.6 Procurement documents (PART)
 			{BT-137-Part[some text:$restricted in (for text:$somerestricted in BT-14-Part return $somerestricted) satisfies $restricted == 'restricted-document']} #{field|name|BT-14-Part} // The access to certain procurement documents is restricted. (PART)
 			{BT-707-Part[BT-707-Part is present]} #{field|name|BT-707-Part}: #{BT-707-Part} // Justification for restricting access to certain procurement documents (PART)
-			{BT-137-Part[BT-708-Part is present]} #{field|name|BT-708-Part}: ${distinct-values(for text:$lang in BT-708-Part return $lang)} // Languages in which the procurement documents are officially available (PART)
-			{BT-137-Part[BT-737-Part is present]} #{field|name|BT-737-Part}: ${distinct-values(for text:$lang in BT-737-Part return $lang)} // Languages in which the procurement documents are unofficially available (PART)
+			{BT-137-Part[BT-708-Part is present]} #{field|name|BT-708-Part}: #{BT-708-Part} // Languages in which the procurement documents are officially available (PART)
+			{BT-137-Part[BT-737-Part is present]} #{field|name|BT-737-Part}: #{BT-737-Part} // Languages in which the procurement documents are unofficially available (PART)
 			{BT-137-Part[BT-615-Part is present]} #{field|name|BT-615-Part}: ${distinct-values(for text:$url in BT-615-Part return concat($url, ', '))} // Information about restricted documents is available at (PART) 
 			{BT-137-Part[BT-15-Part is present]} #{field|name|BT-15-Part}: ${distinct-values(for text:$url in BT-15-Part return concat($url, ', '))} // Information about non-restricted documents is available at (PART) 
 			{BT-137-Part[BT-13(d)-Part is present]} #{field|name|BT-13(d)-Part}: ${BT-13(d)-Part} ${BT-13(t)-Part} // Deadline for requesting additional information
@@ -82,8 +81,8 @@
 				{BT-124-Part} #{field|name|BT-124-Part}: ${BT-124-Part} // Tool Atypical URL (Part)
 		7 {BT-137-Part[BT-736-Part is present]} #{auxiliary|text|procurement-terms} // 3.1.7 Procurement Terms (PART)
 			{BT-736-Part[BT-736-Part != 'no']} #{field|name|BT-736-Part}: #{BT-736-Part} // Reserved Execution (PART)
-		8 {ND-PartTenderingProcess[(BT-765-Part != 'none') or (BT-766-Part != 'none')]} #{auxiliary|text|techniques} // 3.1.8 Techniques
-			{BT-765-Part[BT-765-Part != 'none']} #{auxiliary|text|framework-agreement} #{BT-765-Part} // Information about framework agreement (PART)
+		8 {ND-PartTenderingProcess[(BT-765-Part is present) or (BT-766-Part is present)]} #{auxiliary|text|techniques} // 3.1.8 Techniques
+			{BT-765-Part} #{auxiliary|text|framework-agreement} #{BT-765-Part} // Information about framework agreement (PART)
 			{BT-766-Part[BT-766-Part != 'none']} #{BT-766-Part} // Dynamic purchasing system, also usable by buyers not listed in this notice (PART)
 		9 {ND-PartTenderingTerms[(OPT-301-Part-Mediator is present) or (OPT-301-Part-ReviewOrg is present) or (OPT-301-Part-FiscalLegis is present) or (OPT-301-Part-EnvironLegis is present) or (OPT-301-Part-EmployLegis is present) or (OPT-301-Part-AddInfo is present) or (OPT-301-Part-DocProvider is present) or (OPT-301-Part-ReviewInfo is present) or (OPT-301-Part-TenderReceipt is present) or (OPT-301-Part-TenderEval is present)]} #{auxiliary|text|further-info} // 3.1.9 Further information, mediation and review
 			{BT-137-Part[OPT-301-Part-Mediator is present]} #{auxiliary|text|organisation-mediation}: ${for text:$refid in OPT-301-Part-Mediator, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Mediation organisation (Part)
@@ -99,11 +98,10 @@
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -145,19 +143,6 @@
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (PART)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -172,6 +157,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/7.efx b/view-templates/7.efx
index fae12c8d4..a309ab540 100644
--- a/view-templates/7.efx
+++ b/view-templates/7.efx
@@ -36,8 +36,7 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
 		5 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present or BT-33-Procedure is present]} #{auxiliary|text|procurement-terms} // 2.1.5 Procurement terms
 			0 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present]} #{auxiliary|text|submission-terms}: // Terms of submission
 				{BT-31-Procedure} #{field|name|BT-31-Procedure}: ${format-number(BT-31-Procedure, '###,##0')} // Maximum number of lots for which one tenderer can submit tenders
@@ -140,7 +139,6 @@
 				{BT-50-Lot[BT-50-Lot is present]} #{field|name|BT-50-Lot}: ${BT-50-Lot} // Minimum Candidates
 				{BT-661-Lot[BT-51-Lot is present]} #{field|name|BT-51-Lot}: ${BT-51-Lot} // Maximum Candidates
 				{BT-52-Lot[BT-52-Lot == TRUE]} #{field|name|BT-52-Lot} // The procedure will take place in successive stages. In each stage, some participants may be eliminated.
-				{BT-120-Lot[BT-120-Lot == TRUE]} #{field|name|BT-120-Lot} // The buyer reserves the right to award the contract on the basis of the initial tenders without any further negotiations.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
 				0 {ND-LotAwardCriterion[BT-539-Lot != 'unpublished']} #{field|name|BT-539-Lot}: #{BT-539-Lot} // Type
@@ -154,8 +152,8 @@
 		11 {BT-137-Lot[(BT-14-Lot is present) or (BT-632-Lot is present) or (BT-124-Lot is present)]} #{auxiliary|text|procurement-documents} // 5.1.11 Procurement documents
 			{BT-137-Lot[some text:$restricted in (for text:$somerestricted in BT-14-Lot return $somerestricted) satisfies $restricted == 'restricted-document']} #{field|name|BT-14-Lot} // The access to certain procurement documents is restricted. (Lot)
 			{BT-707-Lot} #{field|name|BT-707-Lot}: #{BT-707-Lot} // Justification for restricting access to certain procurement documents (Lot)
-			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: ${distinct-values(for text:$lang in BT-708-Lot return $lang)} // Languages in which the procurement documents are officially available (Lot)
-			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: ${distinct-values(for text:$lang in BT-737-Lot return $lang)} // Languages in which the procurement documents are unofficially available (Lot)
+			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: #{BT-708-Lot} // Languages in which the procurement documents are officially available (Lot)
+			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: #{BT-737-Lot} // Languages in which the procurement documents are unofficially available (Lot)
 			{BT-13(d)-Lot} #{field|name|BT-13(d)-Lot}: ${BT-13(d)-Lot} ${BT-13(t)-Lot} // Deadline for requesting additional information (Lot)
 			{BT-137-Lot[BT-615-Lot is present]} #{field|name|BT-615-Lot}: ${distinct-values(for text:$url in BT-615-Lot return concat($url, ', '))} // Information about restricted documents is available at (Lot) 
 			{BT-137-Lot[BT-15-Lot is present]} #{field|name|BT-15-Lot}: ${distinct-values(for text:$url in BT-15-Lot return concat($url, ', '))} // Information about non-restricted documents is available at (Lot) 
@@ -178,7 +176,7 @@
 				{BT-18-Lot} #{field|name|BT-18-Lot}: ${BT-18-Lot} // Address for submission (URL)
 				{BT-19-Lot} #{field|name|BT-19-Lot}: #{BT-19-Lot} // Submission Nonelectronic Justification
 				{BT-137-Lot[BT-745-Lot is present]} #{field|name|BT-745-Lot}: ${BT-745-Lot} // Submission Nonelectronic Description
-				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders, requests to participate, or expressions of interest may be submitted
+				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders or requests to participate may be submitted
 				{BT-764-Lot} #{field|name|BT-764-Lot}: #{BT-764-Lot} // Electronic catalogue
 				{BT-744-Lot[BT-744-Lot == 'true']} #{field|name|BT-744-Lot} // Advanced or qualified electronic signature or seal (as defined in Regulation (EU) No 910/2014) is required. (true/false)
 				{BT-63-Lot} #{field|name|BT-63-Lot}: #{BT-63-Lot} // Variants
@@ -193,11 +191,11 @@
 			0 {ND-LotTenderingTerms[(BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present)]} #{auxiliary|text|contract-terms}: // Terms of contract
 				{BT-736-Lot[BT-736-Lot != 'no']} #{field|name|BT-736-Lot}: #{BT-736-Lot} // The execution of the contract must be performed in the framework of sheltered employment programmes (yes / no / not-known)
 				{ND-ExecutionRequirements[BT-70-Lot is present]} #{field|name|BT-70-Lot}: ${BT-70-Lot} // Terms Performance
-				0 {BT-801-Lot} #{field|name|BT-801-Lot} // A non-disclosure agreement is required.
+				0 {BT-801-Lot} #{field|name|BT-801-Lot}: #{code|name|${concat('indicator.', BT-801-Lot)}} // A non-disclosure agreement is required.
 					{BT-137-Lot[BT-802-Lot is present]} #{field|name|BT-802-Lot} : ${BT-802-Lot} // Additional information about the non-disclosure agreement
 				{BT-743-Lot} #{field|name|BT-743-Lot}: #{BT-743-Lot} // Electronic invoicing
-				{BT-92-Lot[BT-92-Lot == TRUE]} #{field|name|BT-92-Lot} // Electronic ordering will be used (true / false)
-				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot} // Electronic payment will be used (true/false)
+				{BT-92-Lot} #{field|name|BT-92-Lot}: #{code|name|${if (BT-92-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic ordering will be used (true / false)
+				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot}: #{code|name|${if (BT-93-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic payment will be used (true/false)
 				{BT-761-Lot[(BT-76-Lot is present)]} #{field|name|BT-76-Lot}: ${BT-76-Lot} // Legal form that must be taken by a group of tenderers that is awarded a contract
 				{ND-PaymentTerms[BT-77-Lot is present]} #{field|name|BT-77-Lot}: ${BT-77-Lot} // Financial arrangement
 			{BT-137-Lot[BT-99-Lot is present]} #{field|name|BT-99-Lot}: ${BT-99-Lot} // Information about review deadlines
@@ -207,9 +205,9 @@
 				{BT-113-Lot} #{field|name|BT-113-Lot}: ${BT-113-Lot} // Maximum number of participants
 				{BT-137-Lot[BT-109-Lot is present]} #{field|name|BT-109-Lot}: ${BT-109-Lot} // Justification for the duration of framework agreement
 				{BT-137-Lot[BT-111-Lot is present]} #{field|name|BT-111-Lot}: ${BT-111-Lot} // Framework Buyer Categories (Lot)
-			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system} // Dynamic purchasing system 
+			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system}: // Information about the dynamic purchasing system
 				{BT-766-Lot} #{BT-766-Lot} // Dynamic Purchasing System
-			0 {ND-AuctionTerms[(BT-767-Lot is present) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|electronic-auction}: // Electronic auction #{code|name|indicator.true}
+			0 {ND-AuctionTerms[BT-767-Lot == TRUE]} #{auxiliary|text|electronic-auction}: #{code|name|${'indicator.true'}} // Electronic auction
 				{BT-123-Lot[BT-767-Lot == TRUE]} #{field|name|BT-123-Lot}: ${BT-123-Lot} // An electronic auction at the following address is used
 				{ND-AuctionTerms[BT-122-Lot[BT-767-Lot == TRUE] is present]} #{field|name|BT-122-Lot}: ${BT-122-Lot} // Electronic auction - Description
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
@@ -226,11 +224,10 @@
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -271,20 +268,7 @@
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -299,6 +283,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/8.efx b/view-templates/8.efx
index b4cf733d2..93ef052ad 100644
--- a/view-templates/8.efx
+++ b/view-templates/8.efx
@@ -37,8 +37,7 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
 		5 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present or BT-33-Procedure is present]} #{auxiliary|text|procurement-terms} // 2.1.5 Procurement terms
 			0 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present]} #{auxiliary|text|submission-terms}: // Terms of submission
 				{BT-31-Procedure} #{field|name|BT-31-Procedure}: ${format-number(BT-31-Procedure, '###,##0')} // Maximum number of lots for which one tenderer can submit tenders
@@ -141,7 +140,6 @@
 				{BT-50-Lot[BT-50-Lot is present]} #{field|name|BT-50-Lot}: ${BT-50-Lot} // Minimum Candidates
 				{BT-661-Lot[BT-51-Lot is present]} #{field|name|BT-51-Lot}: ${BT-51-Lot} // Maximum Candidates
 				{BT-52-Lot[BT-52-Lot == TRUE]} #{field|name|BT-52-Lot} // The procedure will take place in successive stages. In each stage, some participants may be eliminated.
-				{BT-120-Lot[BT-120-Lot == TRUE]} #{field|name|BT-120-Lot} // The buyer reserves the right to award the contract on the basis of the initial tenders without any further negotiations.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
 				0 {ND-LotAwardCriterion[BT-539-Lot != 'unpublished']} #{field|name|BT-539-Lot}: #{BT-539-Lot} // Type
@@ -155,8 +153,8 @@
 		11 {BT-137-Lot[(BT-14-Lot is present) or (BT-632-Lot is present) or (BT-124-Lot is present)]} #{auxiliary|text|procurement-documents} // 5.1.11 Procurement documents
 			{BT-137-Lot[some text:$restricted in (for text:$somerestricted in BT-14-Lot return $somerestricted) satisfies $restricted == 'restricted-document']} #{field|name|BT-14-Lot} // The access to certain procurement documents is restricted. (Lot)
 			{BT-707-Lot} #{field|name|BT-707-Lot}: #{BT-707-Lot} // Justification for restricting access to certain procurement documents (Lot)
-			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: ${distinct-values(for text:$lang in BT-708-Lot return $lang)} // Languages in which the procurement documents are officially available (Lot)
-			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: ${distinct-values(for text:$lang in BT-737-Lot return $lang)} // Languages in which the procurement documents are unofficially available (Lot)
+			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: #{BT-708-Lot} // Languages in which the procurement documents are officially available (Lot)
+			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: #{BT-737-Lot} // Languages in which the procurement documents are unofficially available (Lot)
 			{BT-13(d)-Lot} #{field|name|BT-13(d)-Lot}: ${BT-13(d)-Lot} ${BT-13(t)-Lot} // Deadline for requesting additional information (Lot)
 			{BT-137-Lot[BT-615-Lot is present]} #{field|name|BT-615-Lot}: ${distinct-values(for text:$url in BT-615-Lot return concat($url, ', '))} // Information about restricted documents is available at (Lot) 
 			{BT-137-Lot[BT-15-Lot is present]} #{field|name|BT-15-Lot}: ${distinct-values(for text:$url in BT-15-Lot return concat($url, ', '))} // Information about non-restricted documents is available at (Lot) 
@@ -179,7 +177,7 @@
 				{BT-18-Lot} #{field|name|BT-18-Lot}: ${BT-18-Lot} // Address for submission (URL)
 				{BT-19-Lot} #{field|name|BT-19-Lot}: #{BT-19-Lot} // Submission Nonelectronic Justification
 				{BT-137-Lot[BT-745-Lot is present]} #{field|name|BT-745-Lot}: ${BT-745-Lot} // Submission Nonelectronic Description
-				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders, requests to participate, or expressions of interest may be submitted
+				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders or requests to participate may be submitted
 				{BT-764-Lot} #{field|name|BT-764-Lot}: #{BT-764-Lot} // Electronic catalogue
 				{BT-744-Lot[BT-744-Lot == 'true']} #{field|name|BT-744-Lot} // Advanced or qualified electronic signature or seal (as defined in Regulation (EU) No 910/2014) is required. (true/false)
 				{BT-63-Lot} #{field|name|BT-63-Lot}: #{BT-63-Lot} // Variants
@@ -193,11 +191,11 @@
 			0 {ND-LotTenderingTerms[(BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present)]} #{auxiliary|text|contract-terms}: // Terms of contract
 				{BT-736-Lot[BT-736-Lot != 'no']} #{field|name|BT-736-Lot}: #{BT-736-Lot} // The execution of the contract must be performed in the framework of sheltered employment programmes (yes / no / not-known)
 				{ND-ExecutionRequirements[BT-70-Lot is present]} #{field|name|BT-70-Lot}: ${BT-70-Lot} // Terms Performance
-				0 {BT-801-Lot} #{field|name|BT-801-Lot} // A non-disclosure agreement is required.
+				0 {BT-801-Lot} #{field|name|BT-801-Lot}: #{code|name|${concat('indicator.', BT-801-Lot)}} // A non-disclosure agreement is required.
 					{BT-137-Lot[BT-802-Lot is present]} #{field|name|BT-802-Lot} : ${BT-802-Lot} // Additional information about the non-disclosure agreement
 				{BT-743-Lot} #{field|name|BT-743-Lot}: #{BT-743-Lot} // Electronic invoicing
-				{BT-92-Lot[BT-92-Lot == TRUE]} #{field|name|BT-92-Lot} // Electronic ordering will be used (true / false)
-				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot} // Electronic payment will be used (true/false)
+				{BT-92-Lot} #{field|name|BT-92-Lot}: #{code|name|${if (BT-92-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic ordering will be used (true / false)
+				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot}: #{code|name|${if (BT-93-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic payment will be used (true/false)
 				{BT-761-Lot[(BT-76-Lot is present)]} #{field|name|BT-76-Lot}: ${BT-76-Lot} // Legal form that must be taken by a group of tenderers that is awarded a contract
 				{ND-PaymentTerms[BT-77-Lot is present]} #{field|name|BT-77-Lot}: ${BT-77-Lot} // Financial arrangement
 			{BT-137-Lot[BT-99-Lot is present]} #{field|name|BT-99-Lot}: ${BT-99-Lot} // Information about review deadlines
@@ -207,9 +205,9 @@
 				{BT-113-Lot} #{field|name|BT-113-Lot}: ${BT-113-Lot} // Maximum number of participants
 				{BT-137-Lot[BT-109-Lot is present]} #{field|name|BT-109-Lot}: ${BT-109-Lot} // Justification for the duration of framework agreement
 				{BT-137-Lot[BT-111-Lot is present]} #{field|name|BT-111-Lot}: ${BT-111-Lot} // Framework Buyer Categories (Lot)
-			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system} // Dynamic purchasing system 
+			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system}: // Information about the dynamic purchasing system
 				{BT-766-Lot} #{BT-766-Lot} // Dynamic Purchasing System
-			0 {ND-AuctionTerms[(BT-767-Lot is present) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|electronic-auction}: // Electronic auction #{code|name|indicator.true}
+			0 {ND-AuctionTerms[BT-767-Lot == TRUE]} #{auxiliary|text|electronic-auction}: #{code|name|${'indicator.true'}} // Electronic auction
 				{BT-123-Lot[BT-767-Lot == TRUE]} #{field|name|BT-123-Lot}: ${BT-123-Lot} // An electronic auction at the following address is used
 				{ND-AuctionTerms[BT-122-Lot[BT-767-Lot == TRUE] is present]} #{field|name|BT-122-Lot}: ${BT-122-Lot} // Electronic auction - Description
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
@@ -223,14 +221,15 @@
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -271,20 +270,7 @@
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -299,6 +285,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/9.efx b/view-templates/9.efx
index dbbc118e9..16e1495ac 100644
--- a/view-templates/9.efx
+++ b/view-templates/9.efx
@@ -38,8 +38,7 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
 		5 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present or BT-33-Procedure is present]} #{auxiliary|text|procurement-terms} // 2.1.5 Procurement terms
 			0 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present]} #{auxiliary|text|submission-terms}: // Terms of submission
 				{BT-31-Procedure} #{field|name|BT-31-Procedure}: ${format-number(BT-31-Procedure, '###,##0')} // Maximum number of lots for which one tenderer can submit tenders
@@ -141,7 +140,6 @@
 				{BT-50-Lot[BT-50-Lot is present]} #{field|name|BT-50-Lot}: ${BT-50-Lot} // Minimum Candidates
 				{BT-661-Lot[BT-51-Lot is present]} #{field|name|BT-51-Lot}: ${BT-51-Lot} // Maximum Candidates
 				{BT-52-Lot[BT-52-Lot == TRUE]} #{field|name|BT-52-Lot} // The procedure will take place in successive stages. In each stage, some participants may be eliminated.
-				{BT-120-Lot[BT-120-Lot == TRUE]} #{field|name|BT-120-Lot} // The buyer reserves the right to award the contract on the basis of the initial tenders without any further negotiations.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
 				0 {ND-LotAwardCriterion[BT-539-Lot != 'unpublished']} #{field|name|BT-539-Lot}: #{BT-539-Lot} // Type
@@ -155,8 +153,8 @@
 		11 {BT-137-Lot[(BT-14-Lot is present) or (BT-632-Lot is present) or (BT-124-Lot is present)]} #{auxiliary|text|procurement-documents} // 5.1.11 Procurement documents
 			{BT-137-Lot[some text:$restricted in (for text:$somerestricted in BT-14-Lot return $somerestricted) satisfies $restricted == 'restricted-document']} #{field|name|BT-14-Lot} // The access to certain procurement documents is restricted. (Lot)
 			{BT-707-Lot} #{field|name|BT-707-Lot}: #{BT-707-Lot} // Justification for restricting access to certain procurement documents (Lot)
-			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: ${distinct-values(for text:$lang in BT-708-Lot return $lang)} // Languages in which the procurement documents are officially available (Lot)
-			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: ${distinct-values(for text:$lang in BT-737-Lot return $lang)} // Languages in which the procurement documents are unofficially available (Lot)
+			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: #{BT-708-Lot} // Languages in which the procurement documents are officially available (Lot)
+			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: #{BT-737-Lot} // Languages in which the procurement documents are unofficially available (Lot)
 			{BT-13(d)-Lot} #{field|name|BT-13(d)-Lot}: ${BT-13(d)-Lot} ${BT-13(t)-Lot} // Deadline for requesting additional information (Lot)
 			{BT-137-Lot[BT-615-Lot is present]} #{field|name|BT-615-Lot}: ${distinct-values(for text:$url in BT-615-Lot return concat($url, ', '))} // Information about restricted documents is available at (Lot) 
 			{BT-137-Lot[BT-15-Lot is present]} #{field|name|BT-15-Lot}: ${distinct-values(for text:$url in BT-15-Lot return concat($url, ', '))} // Information about non-restricted documents is available at (Lot) 
@@ -180,7 +178,7 @@
 				{BT-18-Lot} #{field|name|BT-18-Lot}: ${BT-18-Lot} // Address for submission (URL)
 				{BT-19-Lot} #{field|name|BT-19-Lot}: #{BT-19-Lot} // Submission Nonelectronic Justification
 				{BT-137-Lot[BT-745-Lot is present]} #{field|name|BT-745-Lot}: ${BT-745-Lot} // Submission Nonelectronic Description
-				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders, requests to participate, or expressions of interest may be submitted
+				{BT-137-Lot[BT-97-Lot is present]} #{field|name|BT-97-Lot}: #{BT-97-Lot} // Languages in which tenders or requests to participate may be submitted
 				{BT-764-Lot} #{field|name|BT-764-Lot}: #{BT-764-Lot} // Electronic catalogue
 				{BT-744-Lot[BT-744-Lot == 'true']} #{field|name|BT-744-Lot} // Advanced or qualified electronic signature or seal (as defined in Regulation (EU) No 910/2014) is required. (true/false)
 				{BT-63-Lot} #{field|name|BT-63-Lot}: #{BT-63-Lot} // Variants
@@ -195,11 +193,11 @@
 			0 {ND-LotTenderingTerms[(BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present)]} #{auxiliary|text|contract-terms}: // Terms of contract
 				{BT-736-Lot[BT-736-Lot != 'no']} #{field|name|BT-736-Lot}: #{BT-736-Lot} // The execution of the contract must be performed in the framework of sheltered employment programmes (yes / no / not-known)
 				{ND-ExecutionRequirements[BT-70-Lot is present]} #{field|name|BT-70-Lot}: ${BT-70-Lot} // Terms Performance
-				0 {BT-801-Lot} #{field|name|BT-801-Lot} // A non-disclosure agreement is required.
+				0 {BT-801-Lot} #{field|name|BT-801-Lot}: #{code|name|${concat('indicator.', BT-801-Lot)}} // A non-disclosure agreement is required.
 					{BT-137-Lot[BT-802-Lot is present]} #{field|name|BT-802-Lot} : ${BT-802-Lot} // Additional information about the non-disclosure agreement
 				{BT-743-Lot} #{field|name|BT-743-Lot}: #{BT-743-Lot} // Electronic invoicing
-				{BT-92-Lot[BT-92-Lot == TRUE]} #{field|name|BT-92-Lot} // Electronic ordering will be used (true / false)
-				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot} // Electronic payment will be used (true/false)
+				{BT-92-Lot} #{field|name|BT-92-Lot}: #{code|name|${if (BT-92-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic ordering will be used (true / false)
+				{BT-93-Lot[BT-93-Lot == TRUE]} #{field|name|BT-93-Lot}: #{code|name|${if (BT-93-Lot == TRUE) then 'indicator.true' else 'indicator.false'}} // Electronic payment will be used (true/false)
 				{BT-761-Lot[(BT-76-Lot is present)]} #{field|name|BT-76-Lot}: ${BT-76-Lot} // Legal form that must be taken by a group of tenderers that is awarded a contract
 				{ND-PaymentTerms[BT-77-Lot is present]} #{field|name|BT-77-Lot}: ${BT-77-Lot} // Financial arrangement
 				0 {ND-LotTenderingTerms[(BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present)]} #{auxiliary|text|subcontracting-terms}: // Terms of subcontracting
@@ -213,9 +211,9 @@
 				{BT-113-Lot} #{field|name|BT-113-Lot}: ${BT-113-Lot} // Maximum number of participants
 				{BT-137-Lot[BT-109-Lot is present]} #{field|name|BT-109-Lot}: ${BT-109-Lot} // Justification for the duration of framework agreement
 				{BT-137-Lot[BT-111-Lot is present]} #{field|name|BT-111-Lot}: ${BT-111-Lot} // Framework Buyer Categories (Lot)
-			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system} // Dynamic purchasing system 
+			0 {ND-LotTenderingProcess[((BT-766-Lot is present) or (BT-119-LotResult == TRUE))]} #{auxiliary|text|dynamic-purchasing-system}: // Information about the dynamic purchasing system
 				{BT-766-Lot} #{BT-766-Lot} // Dynamic Purchasing System
-			0 {ND-AuctionTerms[(BT-767-Lot is present) or (BT-123-Lot is present) or (BT-122-Lot is present)]} #{auxiliary|text|electronic-auction}: // Electronic auction #{code|name|indicator.true}
+			0 {ND-AuctionTerms[BT-767-Lot == TRUE]} #{auxiliary|text|electronic-auction}: #{code|name|${'indicator.true'}} // Electronic auction
 				{BT-123-Lot[BT-767-Lot == TRUE]} #{field|name|BT-123-Lot}: ${BT-123-Lot} // An electronic auction at the following address is used
 				{ND-AuctionTerms[BT-122-Lot[BT-767-Lot == TRUE] is present]} #{field|name|BT-122-Lot}: ${BT-122-Lot} // Electronic auction - Description
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
@@ -229,14 +227,15 @@
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
 			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -277,20 +276,7 @@
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
+			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-employment} // Employment legislation information provider (LOT)
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -305,6 +291,7 @@
 		{BT-03-notice} #{field|name|BT-03-notice}: #{BT-03-notice} // Form type
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/CEI.efx b/view-templates/CEI.efx
index 46ebcfb98..8f9735e63 100644
--- a/view-templates/CEI.efx
+++ b/view-templates/CEI.efx
@@ -4,6 +4,7 @@
 	1 {ND-ContractingParty} #{auxiliary|text|buyer} // 1.1 Buyer
 		{ND-ContractingParty} #{field|name|BT-500-Organization-Company}: ${for text:$orgid in OPT-300-Procedure-Buyer, text:$orgname in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return $orgname} // Official name
 		{BT-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #value // Legal type of the buyer
+		{BT-740-Procedure-Buyer[BT-740-Procedure-Buyer == 'cont-ent']} #{field|name|BT-740-Procedure-Buyer} // Buyer Contracting Entity
 		{BT-10-Procedure-Buyer} #{field|name|BT-10-Procedure-Buyer}: #value // Activity of the contracting authority
 2 {ND-Root} #{auxiliary|text|procedure} // 2. Procedure
 	1 {ND-ProcedureProcurementScope} #{auxiliary|text|procedure} // 2.1 Procedure
@@ -11,14 +12,8 @@
 		{ND-ProcedureProcurementScope} #{field|name|BT-24-Procedure}: ${BT-24-Procedure} // Procedure Description
 		{BT-04-notice} #{field|name|BT-04-notice}: ${BT-04-notice} // Procedure identifier
 		{BT-22-Procedure} #{field|name|BT-22-Procedure}: ${BT-22-Procedure} // Internal identifier
-		0 {BT-105-Procedure[BT-105-Procedure != 'unpublished']} #{field|name|BT-105-Procedure}: #{BT-105-Procedure} // Type of the procedure
-		0 {BT-105-Procedure[BT-105-Procedure == 'unpublished']} #{field|name|BT-105-Procedure}: #{auxiliary|text|unpublished} // Type of the procedure (unpublished)
-			{BT-197(BT-105)-Procedure} #{field|name|BT-197(BT-105)-Procedure}: #{BT-197(BT-105)-Procedure} // Unpublished Justification Code
-			{BT-105-Procedure[BT-196(BT-105)-Procedure is present]} #{field|name|BT-196(BT-105)-Procedure}: ${BT-196(BT-105)-Procedure} // Unpublished Justification Description
-			{BT-105-Procedure[BT-198(BT-105)-Procedure is present]} #{field|name|BT-198(BT-105)-Procedure}: ${BT-198(BT-105)-Procedure} // Unpublished Access Date
 		1 {ND-ProcedureProcurementScope[(BT-23-Procedure is present) or (BT-531-Procedure is present) or (BT-262-Procedure is present) or (BT-263-Procedure is present)]} #{auxiliary|text|purpose} // 2.1.1 Purpose
 			{BT-23-Procedure} #{field|name|BT-23-Procedure}: #{BT-23-Procedure} // Nature of the contract
-			{OPP-040-Procedure} #{field|name|OPP-040-Procedure}: #{OPP-040-Procedure} // Main Nature - Sub Type (T01, T02, CEI)
 			{BT-531-Procedure} #{field|name|BT-531-Procedure}: #{BT-531-Procedure} // Additional nature of the contract
 			{BT-262-Procedure[BT-26(m)-Procedure == 'cpv']} #{field|name|BT-262-Procedure} (${BT-26(m)-Procedure}): ${BT-262-Procedure} #{BT-262-Procedure} // Main classification (CPV)
 			{BT-262-Procedure[BT-26(m)-Procedure != 'cpv']} #{field|name|BT-262-Procedure} (${BT-26(m)-Procedure}): ${BT-262-Procedure} // Main classification (non-CPV)
@@ -38,17 +33,15 @@
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
-					{BT-197(BT-09)-Procedure} #{field|name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
-					{ND-Root[BT-196(BT-09)-Procedure is present]} #{field|name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
-					{BT-198(BT-09)-Procedure} #{field|name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
 		5 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present or BT-33-Procedure is present]} #{auxiliary|text|procurement-terms} // 2.1.5 Procurement terms
 			0 {ND-Root[BT-31-Procedure is present or BT-763-Procedure is present]} #{auxiliary|text|submission-terms}: // Terms of submission
 				{BT-31-Procedure} #{field|name|BT-31-Procedure}: ${format-number(BT-31-Procedure, '###,##0')} // Maximum number of lots for which one tenderer can submit tenders
 				{BT-763-Procedure [BT-763-Procedure == 'all']} #{field|name|BT-763-Procedure} // The tenderer must submit tenders for all lots. (indicator all)
 			0 {ND-Root[BT-33-Procedure is present]} #{auxiliary|text|contract-terms}: // Terms of contract
 				{BT-33-Procedure} #{field|name|BT-33-Procedure}: ${format-number(BT-33-Procedure, '###,##0')} // Maximum number of lots for which contracts can be awarded to one tenderer
+		6 {ND-ProcedureTerms[(BT-67(a)-Procedure is present)]} #{auxiliary|text|exclusion-grounds} // 2.1.6 Exclusion grounds
+			{BT-67(a)-Procedure} #{BT-67(a)-Procedure}: ${for text:$egdesc in BT-67(b)-Procedure return $egdesc} // Description
 5 {ND-Root[BT-137-Lot is present]} #{auxiliary|text|lot} // 5. Lots
 	1 {ND-Lot} #{field|name|BT-137-Lot}: ${BT-137-Lot} // 5.1 Lot
 		{ND-Lot} #{field|name|BT-21-Lot}: ${BT-21-Lot} // Title
@@ -69,20 +62,29 @@
 			{BT-5141-Lot} #{field|name|BT-5141-Lot}: #{BT-5141-Lot} // Country
 			{BT-727-Lot} #{BT-727-Lot} // Restrictions on the place of performance
 			{ND-LotPlacePerformance} #{field|name|BT-728-Lot}: ${BT-728-Lot} // Additional information
-		3 {BT-137-Lot} #{auxiliary|text|duration-call-expressions-interest} // 5.1.3 Duration of the call for expressions of interest (CEI)
+		3 {ND-LotDuration} #{auxiliary|text|duration-call-expressions-interest} // 5.1.3 Duration of the call for expressions of interest (CEI)
 			{BT-36-Lot} #{field|name|BT-36-Lot}: ${format-number(OPA-36-Lot-Number, '###,##0.###,###,###')} ${BT-36-Lot/@unitCode} // Duration
 		6 {BT-137-Lot[(BT-634-Lot == TRUE) or (BT-94-Lot == TRUE) or (BT-95-Lot is present) or (BT-71-Lot is present) or (BT-79-Lot is present) or (BT-60-Lot == 'eu-funds') or (BT-7220-Lot is present) or (BT-5010-Lot is present) or (BT-6140-Lot is present) or (BT-115-Lot == TRUE) or (BT-726-Lot == TRUE) or (BT-125(i)-Lot is present) or (BT-1251-Lot is present) or (BT-300-Lot is present)]} #{auxiliary|text|general-information} // 5.1.6 General information
-			0 {ND-LotTenderingProcess[(BT-125(i)-Lot is present) or (BT-1251-Lot is present)]} #{auxiliary|text|previous-planning}: // Information about previous notices - Previous planning
+			{BT-79-Lot} #{field|name|BT-79-Lot}: #{BT-79-Lot} // Performing Staff Qualification
+			{BT-60-Lot} #value // EU Funds
+			0 {ND-Funding} #{auxiliary|text|eu-funds-used} // EU Funds Information
+				{BT-7220-Lot} #{field|name|BT-7220-Lot}: #{BT-7220-Lot} // EU Funds Programme
+				{BT-5010-Lot} #{field|name|BT-5010-Lot}: ${BT-5010-Lot} // EU Funds Financing Identifier
+				{ND-Funding[BT-6140-Lot is present]} #{field|name|BT-6140-Lot}: ${BT-6140-Lot} // EU Funds Details
+			{BT-726-Lot[BT-726-Lot == TRUE]} #{field|name|BT-726-Lot} // This procurement is also suitable for small and medium enterprises (SMEs). (true / false)
 			{BT-137-Lot[BT-300-Lot is present]} #{field|name|BT-300-Lot}: ${BT-300-Lot} // Additional information
-		9 {ND-LotTenderingTerms[BT-747-Lot is present]} #{auxiliary|text|selection-criteria} // 5.1.9 Selection criteria
+		9 {BT-137-Lot[(BT-747-Lot is present)]} #{auxiliary|text|conditions-participation}: // 5.1.9 Conditions for participation (CEI)
 			0 {ND-SelectionCriteria} #{auxiliary|text|criterion}: // Criterion
 				{BT-747-Lot} #{field|name|BT-747-Lot}: #{BT-747-Lot} // Selection Criterion Type
 				{BT-747-Lot[BT-749-Lot is present]} #{field|name|BT-749-Lot}: ${BT-749-Lot} // Selection Criterion Name
 				{BT-747-Lot[BT-750-Lot is present]} #{field|name|BT-750-Lot}: ${BT-750-Lot} // Selection Criterion Description
 				{BT-748-Lot} #{field|name|BT-748-Lot}: #{BT-748-Lot} // Use of this criterion
-				{BT-40-Lot[BT-40-Lot == TRUE]} #{field|name|BT-40-Lot} // Selection Criteria Second Stage Invite
 		11 {BT-137-Lot[(BT-14-Lot is present) or (BT-632-Lot is present) or (BT-124-Lot is present)]} #{auxiliary|text|procurement-documents} // 5.1.11 Procurement documents
+			{BT-137-Lot[some text:$restricted in (for text:$somerestricted in BT-14-Lot return $somerestricted) satisfies $restricted == 'restricted-document']} #{field|name|BT-14-Lot} // The access to certain procurement documents is restricted. (Lot)
 			{BT-707-Lot} #{field|name|BT-707-Lot}: #{BT-707-Lot} // Justification for restricting access to certain procurement documents (Lot)
+			{BT-137-Lot[(BT-708-Lot is present)]} #{field|name|BT-708-Lot}: #{BT-708-Lot} // Languages in which the procurement documents are officially available (Lot)
+			{BT-137-Lot[BT-737-Lot is present]} #{field|name|BT-737-Lot}: #{BT-737-Lot} // Languages in which the procurement documents are unofficially available (Lot)
+			{BT-13(d)-Lot} #{field|name|BT-13(d)-Lot}: ${BT-13(d)-Lot} ${BT-13(t)-Lot} // Deadline for requesting additional information (Lot)
 			{BT-137-Lot[BT-615-Lot is present]} #{field|name|BT-615-Lot}: ${distinct-values(for text:$url in BT-615-Lot return concat($url, ', '))} // Information about restricted documents is available at (Lot) 
 			{BT-137-Lot[BT-15-Lot is present]} #{field|name|BT-15-Lot}: ${distinct-values(for text:$url in BT-15-Lot return concat($url, ', '))} // Information about non-restricted documents is available at (Lot) 
 			0 {BT-137-Lot[(BT-632-Lot is present) or (BT-124-Lot is present)]} #{auxiliary|text|adhoc-communication}: // Ad hoc communication channel
@@ -91,30 +93,30 @@
 			0 {BT-137-Lot[(BT-651-Lot is present) or (BT-17-Lot is present) or (BT-18-Lot is present) or (BT-19-Lot is present) or (BT-745-Lot is present) or (BT-97-Lot is present) or (BT-764-Lot is present) or (BT-744-Lot is present) or (BT-63-Lot is present) or (BT-769-Lot == 'allowed') or (BT-75-Lot is present) or (BT-630(d)-Lot is present) or (BT-1311(d)-Lot is present) or (BT-131(d)-Lot is present) or (BT-98-Lot is present)]} #{auxiliary|text|submission-terms}: // Terms of submission
 				{BT-17-Lot} #{field|name|BT-17-Lot}: #{BT-17-Lot} // Electronic submission
 				{BT-18-Lot} #{field|name|BT-18-Lot}: ${BT-18-Lot} // Address for submission (URL)
+				{BT-137-Lot[BT-97-Lot is present]} #{auxiliary|text|language-expressions}: #{BT-97-Lot} // Languages in which expressions of interest may be submitted
 				{BT-630(d)-Lot} #{field|name|BT-630(d)-Lot}: ${BT-630(d)-Lot} ${BT-630(t)-Lot} // Deadline for receipt of expressions of interest
 			0 {ND-LotTenderingTerms[(BT-736-Lot == 'yes') or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot == TRUE) or (BT-93-Lot == TRUE) or (BT-76-Lot is present) or (BT-77-Lot is present) or (BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present)]} #{auxiliary|text|contract-terms}: // Terms of contract
 				{BT-736-Lot[BT-736-Lot != 'no']} #{field|name|BT-736-Lot}: #{BT-736-Lot} // The execution of the contract must be performed in the framework of sheltered employment programmes (yes / no / not-known)
 				{ND-ExecutionRequirements[BT-70-Lot is present]} #{field|name|BT-70-Lot}: ${BT-70-Lot} // Terms Performance
-				0 {ND-LotTenderingTerms[(BT-65-Lot is present) or (BT-64-Lot is present) or (BT-729-Lot is present)]} #{auxiliary|text|subcontracting-terms}: // Terms of subcontracting
+				0 {BT-801-Lot} #{field|name|BT-801-Lot}: #{code|name|${concat('indicator.', BT-801-Lot)}} // A non-disclosure agreement is required.
+					{BT-137-Lot[BT-802-Lot is present]} #{field|name|BT-802-Lot} : ${BT-802-Lot} // Additional information about the non-disclosure agreement
+				{ND-LotTenderingTerms[OPT-070-Lot is present]} #{business-term|name|OPT-070}: ${OPT-070-Lot} // Execution of the service is reserved to a particular profession. Reference to the relevant law, regulation, or administrative procedure (Lot)
 			{BT-137-Lot[BT-99-Lot is present]} #{field|name|BT-99-Lot}: ${BT-99-Lot} // Information about review deadlines
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
+			{BT-137-Lot[OPT-301-Lot-Mediator is present]} #{auxiliary|text|organisation-mediation}: ${for text:$refid in OPT-301-Lot-Mediator, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Mediation organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewOrg is present]} #{auxiliary|text|organisation-review}: ${for text:$refid in OPT-301-Lot-ReviewOrg, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Review organisation (Lot)
+			{BT-137-Lot[OPT-301-Lot-AddInfo is present]} #{auxiliary|text|organisation-providing-info-procedure}: ${for text:$refid in OPT-301-Lot-AddInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation providing additional information about the procurement procedure (Lot)
 			{BT-137-Lot[OPT-301-Lot-DocProvider is present]} #{auxiliary|text|organisation-providing-docs}: ${for text:$refid in OPT-301-Lot-DocProvider, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Documents provider organisation (Lot)
 			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
-			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-financing}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Financing Organisation (LotResult)
-			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-paying}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Paying Organisation (LotResult)
-			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$conid1 in OPT-315-LotResult[BT-13713-LotResult == $lotid1], text:$orgid1 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-signing-contract}: ${distinct-values(for text:$lotid2 in BT-137-Lot, text:$conid2 in OPT-315-LotResult[BT-13713-LotResult == $lotid2], text:$orgid2 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname)} // Contract Signatory (LotResult)
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
+			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-165-Organization-Company} #{field|name|BT-165-Organization-Company}: ${BT-165-Organization-Company} // Size of the economic operator
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -141,49 +143,15 @@
 			{BT-509-Organization-TouchPoint[OPT-200-Organization-Company == OPT-300-Procedure-Buyer] } #{field|name|BT-509-Organization-TouchPoint}: ${BT-509-Organization-TouchPoint} // Touchpoint eDelivery Gateway
 		0 {ND-Organization} #{auxiliary|text|roles}: // Roles of this organisation
 			0 {ND-Organization[count(for text:$orgid in OPT-200-Organization-Company return OPT-300-Procedure-Buyer[OPT-300-Procedure-Buyer == $orgid])>0]} #{auxiliary|text|buyer} // This org is a Buyer
-				{OPP-050-Organization[OPP-050-Organization == TRUE]} #{field|name|OPP-050-Organization} // Leader of the group
 				{OPP-052-Organization[OPP-052-Organization == TRUE]} #{field|name|OPP-052-Organization} // CPB Acquiring
 				{OPP-051-Organization[OPP-051-Organization == TRUE]} #{field|name|OPP-051-Organization} // CPB Awarding
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'serv-prov') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'serv-prov')]} #{auxiliary|text|organisation-providing-procurement-service} // This org is a Service Provider
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'ted-esen') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'ted-esen')]} #{auxiliary|text|organisation-esender} // This org is an eSender
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Part-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Part-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Part-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Part-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Part-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Part-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Part-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-300-Contract-Signatory) or (OPT-201-Organization-TouchPoint == OPT-300-Contract-Signatory)]} #{auxiliary|text|organisation-signing-contract} // Contract Signatory organisation (SettledContract)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Financing) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Financing)]} #{auxiliary|text|organisation-financing} // Financing Organisation (LotResult)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Paying) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Paying)]} #{auxiliary|text|organisation-paying} // Paying Organisation (LotResult)
-			0 {ND-Organization[(OPT-200-Organization-Company == OPT-300-Tenderer) or (OPT-201-Organization-TouchPoint == OPT-300-Tenderer)]} #{auxiliary|text|organisation-tenderer} // Tenderer Organisation (Tenderer)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Tenderer-SubCont) or (OPT-201-Organization-TouchPoint == OPT-301-Tenderer-SubCont)]} #{auxiliary|text|organisation-subcontractor} // Subcontractor Organisation (SubContractor)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -199,6 +167,7 @@
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{OPP-070-notice} #{field|name|OPP-070-notice}: ${OPP-070-notice} // Notice subtype
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/T01.efx b/view-templates/T01.efx
index 8b95db01d..5c050be4b 100644
--- a/view-templates/T01.efx
+++ b/view-templates/T01.efx
@@ -4,41 +4,28 @@
 	{OPT-300-Procedure-Buyer} #{auxiliary|text|buyer-competent} // 1.1 Buyer (T01, T02)
 		{ND-ContractingParty} #{field|name|BT-500-Organization-Company}: ${for text:$orgid in OPT-300-Procedure-Buyer, text:$orgname in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return $orgname} // Official name
 		{BT-11-Procedure-Buyer} #{auxiliary|text|legaltype-competent}: #{BT-11-Procedure-Buyer} // Legal type of the buyer (T01, T02)
+		{BT-740-Procedure-Buyer[BT-740-Procedure-Buyer == 'cont-ent']} #{field|name|BT-740-Procedure-Buyer} // Buyer Contracting Entity
+		{BT-10-Procedure-Buyer} #{field|name|BT-10-Procedure-Buyer}: #value // Activity of the contracting authority
 2 {ND-Root} #{auxiliary|text|procedure} // 2. Procedure
 	1 {ND-ProcedureProcurementScope} #{auxiliary|text|procedure} // 2.1 Procedure
 		{ND-ProcedureProcurementScope} #{field|name|BT-21-Procedure}: ${BT-21-Procedure} // Procedure Title
 		{BT-22-Procedure} #{field|name|BT-22-Procedure}: ${BT-22-Procedure} // Internal identifier
 		0 {BT-105-Procedure[BT-105-Procedure != 'unpublished']} #{field|name|BT-105-Procedure}: #{BT-105-Procedure} // Type of the procedure
-		0 {BT-105-Procedure[BT-105-Procedure == 'unpublished']} #{field|name|BT-105-Procedure}: #{auxiliary|text|unpublished} // Type of the procedure (unpublished)
-			{BT-197(BT-105)-Procedure} #{field|name|BT-197(BT-105)-Procedure}: #{BT-197(BT-105)-Procedure} // Unpublished Justification Code
-			{BT-105-Procedure[BT-196(BT-105)-Procedure is present]} #{field|name|BT-196(BT-105)-Procedure}: ${BT-196(BT-105)-Procedure} // Unpublished Justification Description
-			{BT-105-Procedure[BT-198(BT-105)-Procedure is present]} #{field|name|BT-198(BT-105)-Procedure}: ${BT-198(BT-105)-Procedure} // Unpublished Access Date
 		1 {ND-ProcedureProcurementScope[(BT-23-Procedure is present) or (BT-531-Procedure is present) or (BT-262-Procedure is present) or (BT-263-Procedure is present)]} #{auxiliary|text|purpose} // 2.1.1 Purpose
 			{BT-23-Procedure} #{field|name|BT-23-Procedure}: #{BT-23-Procedure} // Nature of the contract
-			{OPP-040-Procedure} #{field|name|OPP-040-Procedure}: #{OPP-040-Procedure} // Main Nature - Sub Type (T01, T02, CEI)
+			{OPP-040-Procedure} #{field|name|OPP-040-Procedure}: #{OPP-040-Procedure} // Main Nature - Sub Type (T01, T02)
+			{BT-531-Procedure} #{field|name|BT-531-Procedure}: #{BT-531-Procedure} // Additional nature of the contract
 			{BT-262-Procedure[BT-26(m)-Procedure == 'cpv']} #{field|name|BT-262-Procedure} (${BT-26(m)-Procedure}): ${BT-262-Procedure} #{BT-262-Procedure} // Main classification (CPV)
 			{BT-262-Procedure[BT-26(m)-Procedure != 'cpv']} #{field|name|BT-262-Procedure} (${BT-26(m)-Procedure}): ${BT-262-Procedure} // Main classification (non-CPV)
 			{BT-263-Procedure[BT-26(a)-Procedure == 'cpv']} #{field|name|BT-263-Procedure} (${BT-26(a)-Procedure}): ${BT-263-Procedure} #{BT-263-Procedure} // Additional classification (CPV)
 			{BT-263-Procedure[BT-26(a)-Procedure != 'cpv']} #{field|name|BT-263-Procedure} (${BT-26(a)-Procedure}): ${BT-263-Procedure} // Additional classification (non-CPV)
-		2 {ND-ProcedurePlacePerformance} #{auxiliary|text|place-performance} // 2.1.2 Place of performance
-			{BT-5101(a)-Procedure} #{field|name|BT-5101(a)-Procedure}: ${BT-5101(a)-Procedure} ${BT-5101(b)-Procedure} ${BT-5101(c)-Procedure} // Place Performance Postal address
-			{BT-5131-Procedure} #{field|name|BT-5131-Procedure}: ${BT-5131-Procedure} // Place Performance Town
-			{BT-5121-Procedure} #{field|name|BT-5121-Procedure}: ${BT-5121-Procedure} // Place Performance Post Code
-			{BT-5071-Procedure} #{field|name|BT-5071-Procedure}: #{BT-5071-Procedure} (${BT-5071-Procedure}) // Place Performance Country Subdivision
-			{BT-5141-Procedure} #{field|name|BT-5141-Procedure}: #{BT-5141-Procedure} // Place Performance Country
-			{BT-727-Procedure} #{BT-727-Procedure} // Place Performance Services Other
-			{ND-ProcedurePlacePerformance[BT-728-Procedure is present]} #{field|name|BT-728-Procedure}: ${BT-728-Procedure} // Place Performance Additional information
 		4 {ND-ProcedureProcurementScope[BT-01-notice is present]} #{auxiliary|text|general-information} // 2.1.4 General information
 			{ND-ProcedureProcurementScope[BT-300-Procedure is present]} #{field|name|BT-300-Procedure}: ${BT-300-Procedure} // Additional information
 			{ND-ProcedureProcurementScope} #{auxiliary|text|legal-basis}: // Legal basis
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
-					{BT-197(BT-09)-Procedure} #{field|name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
-					{ND-Root[BT-196(BT-09)-Procedure is present]} #{field|name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
-					{BT-198(BT-09)-Procedure} #{field|name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
 5 {ND-Root[BT-137-Lot is present]} #{auxiliary|text|lot} // 5. Lots
 	1 {ND-Lot} #{field|name|BT-137-Lot}: ${BT-137-Lot} // 5.1 Lot
 		{ND-Lot} #{field|name|BT-21-Lot}: ${BT-21-Lot} // Title
@@ -46,6 +33,7 @@
 		{BT-22-Lot} #{field|name|BT-22-Lot}: ${BT-22-Lot} // Internal identifier
 		1 {ND-LotProcurementScope[(BT-23-Lot is present) or (BT-26(m)-Lot is present) or (BT-26(a)-Lot is present) or (BT-25-Lot is present) or (BT-54-Lot is present)]} #{auxiliary|text|purpose} // 5.1.1 Purpose
 			{BT-23-Lot} #{field|name|BT-23-Lot}: #{BT-23-Lot} // Nature of the contract
+			{BT-531-Lot} #{field|name|BT-531-Lot}: #{BT-531-Lot} // Additional Nature
 			{BT-262-Lot[BT-26(m)-Lot == 'cpv']} #{field|name|BT-262-Lot} (${BT-26(m)-Lot}): ${BT-262-Lot} #{BT-262-Lot} // Main classification (CPV)
 			{BT-262-Lot[BT-26(m)-Lot != 'cpv']} #{field|name|BT-262-Lot} (${BT-26(m)-Lot}): ${BT-262-Lot} // Main classification (non-CPV)
 			{BT-263-Lot[BT-26(a)-Lot == 'cpv']} #{field|name|BT-263-Lot} (${BT-26(a)-Lot}): ${BT-263-Lot} #{BT-263-Lot} // Additional classification (CPV)
@@ -58,23 +46,22 @@
 			{BT-5141-Lot} #{field|name|BT-5141-Lot}: #{BT-5141-Lot} // Country
 			{BT-727-Lot} #{BT-727-Lot} // Restrictions on the place of performance
 			{ND-LotPlacePerformance} #{field|name|BT-728-Lot}: ${BT-728-Lot} // Additional information
-		3 {BT-137-Lot} #{auxiliary|text|envisaged-start-duration-contract} // 5.1.3 Envisaged start date and the duration of the contract (T01)
+		3 {ND-LotDuration} #{auxiliary|text|envisaged-start-duration-contract} // 5.1.3 Envisaged start date and the duration of the contract (T01)
 			{BT-536-Lot} #{field|name|BT-536-Lot}: ${BT-536-Lot} // Start date
 			{BT-537-Lot} #{field|name|BT-537-Lot}: ${BT-537-Lot} // End date
 			{BT-36-Lot} #{field|name|BT-36-Lot}: ${format-number(OPA-36-Lot-Number, '###,##0.###,###,###')} ${BT-36-Lot/@unitCode} // Duration
 			{BT-538-Lot} #{field|name|BT-538-Lot}: #{BT-538-Lot} // Planned Period (Unlimited)
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
+			{BT-137-Lot[OPT-301-Lot-AddInfo is present]} #{auxiliary|text|organisation-providing-info-procedure}: ${for text:$refid in OPT-301-Lot-AddInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation providing additional information about the procurement procedure (Lot)
 			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
 			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-165-Organization-Company} #{field|name|BT-165-Organization-Company}: ${BT-165-Organization-Company} // Size of the economic operator
-		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -83,7 +70,6 @@
 		{BT-503-Organization-Company} #{field|name|BT-503-Organization-Company}: ${BT-503-Organization-Company} // Organization Contact Telephone Number
 		{BT-739-Organization-Company} #{field|name|BT-739-Organization-Company}: ${BT-739-Organization-Company} // Organization Contact Fax
 		{BT-505-Organization-Company} #{field|name|BT-505-Organization-Company}: ${BT-505-Organization-Company} // Organization Internet Address
-		{BT-509-Organization-Company} #{field|name|BT-509-Organization-Company}: ${BT-509-Organization-Company} // Organization eDelivery Gateway
 		{OPT-200-Organization-Company[some text:$bpurl in (for text:$orgid in OPT-200-Organization-Company return BT-508-Procedure-Buyer[OPT-300-Procedure-Buyer == $orgid]) satisfies $bpurl != '']} #{field|name|BT-508-Procedure-Buyer}: ${for text:$orgid1 in OPT-200-Organization-Company return BT-508-Procedure-Buyer[OPT-300-Procedure-Buyer == $orgid1]} // Buyer Profile URL
 		0 {ND-Touchpoint} #{auxiliary|text|other-contact-point}: // TouchPoint / Other contact points
 			{ND-Touchpoint} #{field|name|BT-500-Organization-TouchPoint}: ${BT-500-Organization-TouchPoint} // Buyer Touchpoint Name
@@ -98,52 +84,13 @@
 			{BT-503-Organization-TouchPoint[OPT-200-Organization-Company == OPT-300-Procedure-Buyer] } #{field|name|BT-503-Organization-TouchPoint}: ${BT-503-Organization-TouchPoint} // Touchpoint Contact Telephone Number
 			{BT-739-Organization-TouchPoint[OPT-200-Organization-Company == OPT-300-Procedure-Buyer] } #{field|name|BT-739-Organization-TouchPoint}: ${BT-739-Organization-TouchPoint} // Touchpoint Contact Fax
 			{BT-505-Organization-TouchPoint[OPT-200-Organization-Company == OPT-300-Procedure-Buyer] } #{field|name|BT-505-Organization-TouchPoint}: ${BT-505-Organization-TouchPoint} // Touchpoint Internet Address
-			{BT-509-Organization-TouchPoint[OPT-200-Organization-Company == OPT-300-Procedure-Buyer] } #{field|name|BT-509-Organization-TouchPoint}: ${BT-509-Organization-TouchPoint} // Touchpoint eDelivery Gateway
 		0 {ND-Organization} #{auxiliary|text|roles}: // Roles of this organisation
 			0 {ND-Organization[count(for text:$orgid in OPT-200-Organization-Company return OPT-300-Procedure-Buyer[OPT-300-Procedure-Buyer == $orgid])>0]} #{auxiliary|text|buyer} // This org is a Buyer
-				{OPP-050-Organization[OPP-050-Organization == TRUE]} #{field|name|OPP-050-Organization} // Leader of the group
 				{OPP-052-Organization[OPP-052-Organization == TRUE]} #{field|name|OPP-052-Organization} // CPB Acquiring
 				{OPP-051-Organization[OPP-051-Organization == TRUE]} #{field|name|OPP-051-Organization} // CPB Awarding
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'serv-prov') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'serv-prov')]} #{auxiliary|text|organisation-providing-procurement-service} // This org is a Service Provider
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'ted-esen') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'ted-esen')]} #{auxiliary|text|organisation-esender} // This org is an eSender
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Part-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Part-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Part-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Part-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Part-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Part-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Part-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-300-Contract-Signatory) or (OPT-201-Organization-TouchPoint == OPT-300-Contract-Signatory)]} #{auxiliary|text|organisation-signing-contract} // Contract Signatory organisation (SettledContract)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Financing) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Financing)]} #{auxiliary|text|organisation-financing} // Financing Organisation (LotResult)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Paying) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Paying)]} #{auxiliary|text|organisation-paying} // Paying Organisation (LotResult)
-			0 {ND-Organization[(OPT-200-Organization-Company == OPT-300-Tenderer) or (OPT-201-Organization-TouchPoint == OPT-300-Tenderer)]} #{auxiliary|text|organisation-tenderer} // Tenderer Organisation (Tenderer)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Tenderer-SubCont) or (OPT-201-Organization-TouchPoint == OPT-301-Tenderer-SubCont)]} #{auxiliary|text|organisation-subcontractor} // Subcontractor Organisation (SubContractor)
-			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
-				{OPT-200-Organization-Company[some text:$uboname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-500-UBO[OPT-202-UBO == $uboid]) satisfies $uboname != '']} #{field|name|BT-500-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(OPT-160-UBO[OPT-202-UBO == $uboid1], ' ', BT-500-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Name 
-				{OPT-200-Organization-Company[some text:$ubonationality in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-706-UBO[OPT-202-UBO == $uboid]) satisfies $ubonationality != '']} #{field|name|BT-706-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-706-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Nationality
-				{OPT-200-Organization-Company[some text:$ubostreetname in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-510(a)-UBO[OPT-202-UBO == $uboid]) satisfies $ubostreetname != '']} #{field|name|BT-510(a)-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return concat(BT-510(a)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(b)-UBO[OPT-202-UBO == $uboid1], ' ', BT-510(c)-UBO[OPT-202-UBO == $uboid1])} // Beneficial Owner Postal Address
-				{OPT-200-Organization-Company[some text:$ubocity in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-513-UBO[OPT-202-UBO == $uboid]) satisfies $ubocity != '']} #{field|name|BT-513-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-513-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner City
-				{OPT-200-Organization-Company[some text:$ubopostcode in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-512-UBO[OPT-202-UBO == $uboid]) satisfies $ubopostcode != '']} #{field|name|BT-512-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-512-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Post Code
-				{OPT-200-Organization-Company[some text:$obonuts in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-507-UBO[OPT-202-UBO == $uboid]) satisfies $obonuts != '']} #{field|name|BT-507-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-507-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country Subdivision
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-514-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-514-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-514-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Country
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-506-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-506-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-506-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Contact Email Address
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-503-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-503-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-503-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Telephone Number
-				{OPT-200-Organization-Company[some text:$obocountry in (for text:$orgid in OPT-200-Organization-Company, text:$uboid in OPT-302-Organization[OPT-200-Organization-Company == $orgid] return BT-739-UBO[OPT-202-UBO == $uboid]) satisfies $obocountry != '']} #{field|name|BT-739-UBO}: ${for text:$orgid1 in OPT-200-Organization-Company, text:$uboid1 in OPT-302-Organization[OPT-200-Organization-Company == $orgid1] return BT-739-UBO[OPT-202-UBO == $uboid1]} // Beneficial Owner Fax
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company, text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lrid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lrid] return $lotid ) satisfies $lotswon != '']} #{auxiliary|text|winner-lots}: ${distinct-values(for text:$orgid1 in OPT-200-Organization-Company, text:$tpaid1 in OPT-210-Tenderer[OPT-300-Tenderer == $orgid1], text:$tenderid1 in OPT-321-Tender[OPT-310-Tender == $tpaid1], text:$contractid1 in OPT-315-LotResult[BT-3202-Contract == $tenderid1], text:$lotresultid1 in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid1] == $tenderid1], text:$lotid1 in BT-13713-LotResult[OPT-322-LotResult == $lotresultid1] return $lotid1 )} // Winner of these Lots 
-			{ND-Organization[some text:$lotswon in (for text:$orgid in OPT-200-Organization-Company[BT-746-Organization == TRUE], text:$tpaid in OPT-210-Tenderer[OPT-300-Tenderer == $orgid], text:$tenderid in OPT-321-Tender[OPT-310-Tender == $tpaid], text:$contractid in OPT-315-LotResult[BT-3202-Contract == $tenderid], text:$lotresultid in OPT-322-LotResult[OPT-320-LotResult[OPT-315-LotResult == $contractid] == $tenderid], text:$lotid in BT-13713-LotResult[OPT-322-LotResult == $lotresultid] return $lotid ) satisfies $lotswon != '']} #{field|name|BT-746-Organization} // The winner is listed on a regulated market
 10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
 	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
 	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
@@ -159,6 +106,7 @@
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{OPP-070-notice} #{field|name|OPP-070-notice}: ${OPP-070-notice} // Notice subtype
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/T02.efx b/view-templates/T02.efx
index 63752c5ba..5e3cbb533 100644
--- a/view-templates/T02.efx
+++ b/view-templates/T02.efx
@@ -4,10 +4,13 @@
 	{OPT-300-Procedure-Buyer} #{auxiliary|text|buyer-competent} // 1.1 Buyer (T01, T02)
 		{ND-ContractingParty} #{field|name|BT-500-Organization-Company}: ${for text:$orgid in OPT-300-Procedure-Buyer, text:$orgname in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return $orgname} // Official name
 		{BT-11-Procedure-Buyer} #{auxiliary|text|legaltype-competent}: #{BT-11-Procedure-Buyer} // Legal type of the buyer (T01, T02)
+		{BT-740-Procedure-Buyer[BT-740-Procedure-Buyer == 'cont-ent']} #{field|name|BT-740-Procedure-Buyer} // Buyer Contracting Entity
+		{BT-10-Procedure-Buyer} #{field|name|BT-10-Procedure-Buyer}: #value // Activity of the contracting authority
 2 {ND-Root} #{auxiliary|text|procedure} // 2. Procedure
 	1 {ND-ProcedureProcurementScope} #{auxiliary|text|procedure} // 2.1 Procedure
 		{ND-ProcedureProcurementScope} #{field|name|BT-21-Procedure}: ${BT-21-Procedure} // Procedure Title
 		{BT-04-notice} #{field|name|BT-04-notice}: ${BT-04-notice} // Procedure identifier
+		{OPP-090-Procedure} #{field|name|OPP-090-Procedure}: ${OPP-090-Procedure} // Previous Notice
 		{BT-22-Procedure} #{field|name|BT-22-Procedure}: ${BT-22-Procedure} // Internal identifier
 		0 {BT-105-Procedure[BT-105-Procedure != 'unpublished']} #{field|name|BT-105-Procedure}: #{BT-105-Procedure} // Type of the procedure
 		0 {BT-105-Procedure[BT-105-Procedure == 'unpublished']} #{field|name|BT-105-Procedure}: #{auxiliary|text|unpublished} // Type of the procedure (unpublished)
@@ -16,30 +19,22 @@
 			{BT-105-Procedure[BT-198(BT-105)-Procedure is present]} #{field|name|BT-198(BT-105)-Procedure}: ${BT-198(BT-105)-Procedure} // Unpublished Access Date
 		1 {ND-ProcedureProcurementScope[(BT-23-Procedure is present) or (BT-531-Procedure is present) or (BT-262-Procedure is present) or (BT-263-Procedure is present)]} #{auxiliary|text|purpose} // 2.1.1 Purpose
 			{BT-23-Procedure} #{field|name|BT-23-Procedure}: #{BT-23-Procedure} // Nature of the contract
-			{OPP-040-Procedure} #{field|name|OPP-040-Procedure}: #{OPP-040-Procedure} // Main Nature - Sub Type (T01, T02, CEI)
+			{OPP-040-Procedure} #{field|name|OPP-040-Procedure}: #{OPP-040-Procedure} // Main Nature - Sub Type (T01, T02)
+			{BT-531-Procedure} #{field|name|BT-531-Procedure}: #{BT-531-Procedure} // Additional nature of the contract
 			{BT-262-Procedure[BT-26(m)-Procedure == 'cpv']} #{field|name|BT-262-Procedure} (${BT-26(m)-Procedure}): ${BT-262-Procedure} #{BT-262-Procedure} // Main classification (CPV)
 			{BT-262-Procedure[BT-26(m)-Procedure != 'cpv']} #{field|name|BT-262-Procedure} (${BT-26(m)-Procedure}): ${BT-262-Procedure} // Main classification (non-CPV)
 			{BT-263-Procedure[BT-26(a)-Procedure == 'cpv']} #{field|name|BT-263-Procedure} (${BT-26(a)-Procedure}): ${BT-263-Procedure} #{BT-263-Procedure} // Additional classification (CPV)
 			{BT-263-Procedure[BT-26(a)-Procedure != 'cpv']} #{field|name|BT-263-Procedure} (${BT-26(a)-Procedure}): ${BT-263-Procedure} // Additional classification (non-CPV)
-		2 {ND-ProcedurePlacePerformance} #{auxiliary|text|place-performance} // 2.1.2 Place of performance
-			{BT-5101(a)-Procedure} #{field|name|BT-5101(a)-Procedure}: ${BT-5101(a)-Procedure} ${BT-5101(b)-Procedure} ${BT-5101(c)-Procedure} // Place Performance Postal address
-			{BT-5131-Procedure} #{field|name|BT-5131-Procedure}: ${BT-5131-Procedure} // Place Performance Town
-			{BT-5121-Procedure} #{field|name|BT-5121-Procedure}: ${BT-5121-Procedure} // Place Performance Post Code
-			{BT-5071-Procedure} #{field|name|BT-5071-Procedure}: #{BT-5071-Procedure} (${BT-5071-Procedure}) // Place Performance Country Subdivision
-			{BT-5141-Procedure} #{field|name|BT-5141-Procedure}: #{BT-5141-Procedure} // Place Performance Country
-			{BT-727-Procedure} #{BT-727-Procedure} // Place Performance Services Other
-			{ND-ProcedurePlacePerformance[BT-728-Procedure is present]} #{field|name|BT-728-Procedure}: ${BT-728-Procedure} // Place Performance Additional information
 		4 {ND-ProcedureProcurementScope[BT-01-notice is present]} #{auxiliary|text|general-information} // 2.1.4 General information
 			{ND-ProcedureProcurementScope[BT-300-Procedure is present]} #{field|name|BT-300-Procedure}: ${BT-300-Procedure} // Additional information
 			{ND-ProcedureProcurementScope} #{auxiliary|text|legal-basis}: // Legal basis
 			{BT-01-notice} #{BT-01-notice} // Procedure Legal Basis
 			{BT-01(c)-Procedure} ${BT-01(c)-Procedure} - ${BT-01(d)-Procedure} // Procedure Legal Basis (ID) - Procedure Legal Basis (Description)
 			{BT-01(e)-Procedure} ${BT-01(f)-Procedure} // Procedure Legal Basis (no ID) Description
-			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: // Applicable cross-border law
-				0 {ND-Root} #{field|name|BT-09(b)-Procedure}: ${BT-09(b)-Procedure} // Cross-border Law Description
-					{BT-197(BT-09)-Procedure} #{field|name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
-					{ND-Root[BT-196(BT-09)-Procedure is present]} #{field|name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
-					{BT-198(BT-09)-Procedure} #{field|name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
+			0 {BT-09(a)-Procedure} #{auxiliary|text|cross-border-law}: ${BT-09(b)-Procedure} // Applicable cross-border law
+				{BT-197(BT-09)-Procedure} #{name|BT-197(BT-09)-Procedure}: #{BT-197(BT-09)-Procedure} // Unpublished Justification Code
+				{ND-Root[BT-196(BT-09)-Procedure is present]} #{name|BT-196(BT-09)-Procedure}: ${BT-196(BT-09)-Procedure}// Unpublished Justification Description
+				{BT-198(BT-09)-Procedure} #{name|BT-198(BT-09)-Procedure}: ${BT-198(BT-09)-Procedure} // Unpublished Access Date
 5 {ND-Root[BT-137-Lot is present]} #{auxiliary|text|lot} // 5. Lots
 	1 {ND-Lot} #{field|name|BT-137-Lot}: ${BT-137-Lot} // 5.1 Lot
 		{ND-Lot} #{field|name|BT-21-Lot}: ${BT-21-Lot} // Title
@@ -47,9 +42,11 @@
 		{BT-22-Lot} #{field|name|BT-22-Lot}: ${BT-22-Lot} // Internal identifier
 		1 {ND-LotProcurementScope[(BT-23-Lot is present) or (BT-26(m)-Lot is present) or (BT-26(a)-Lot is present) or (BT-25-Lot is present) or (BT-54-Lot is present)]} #{auxiliary|text|purpose} // 5.1.1 Purpose
 			{BT-23-Lot} #{field|name|BT-23-Lot}: #{BT-23-Lot} // Nature of the contract
+			{BT-531-Lot} #{field|name|BT-531-Lot}: #{BT-531-Lot} // Additional Nature
 			{BT-262-Lot[BT-26(m)-Lot == 'cpv']} #{field|name|BT-262-Lot} (${BT-26(m)-Lot}): ${BT-262-Lot} #{BT-262-Lot} // Main classification (CPV)
 			{BT-262-Lot[BT-26(m)-Lot != 'cpv']} #{field|name|BT-262-Lot} (${BT-26(m)-Lot}): ${BT-262-Lot} // Main classification (non-CPV)
 			{BT-263-Lot[BT-26(a)-Lot == 'cpv']} #{field|name|BT-263-Lot} (${BT-26(a)-Lot}): ${BT-263-Lot} #{BT-263-Lot} // Additional classification (CPV)
+			{BT-25-Lot} #{field|name|BT-25-Lot}: ${format-number(BT-25-Lot, '###,##0.###,###,###')} #{BT-625-Lot} // Quantity
 		2 {ND-LotPlacePerformance} #{auxiliary|text|place-performance} // 5.1.2 Place of performance
 			{BT-5101(a)-Lot} #{field|name|BT-5101(a)-Lot}: ${BT-5101(a)-Lot} ${BT-5101(b)-Lot} ${BT-5101(c)-Lot} // Postal address
 			{BT-5131-Lot} #{field|name|BT-5131-Lot}: ${BT-5131-Lot} // Town
@@ -58,7 +55,7 @@
 			{BT-5141-Lot} #{field|name|BT-5141-Lot}: #{BT-5141-Lot} // Country
 			{BT-727-Lot} #{BT-727-Lot} // Restrictions on the place of performance
 			{ND-LotPlacePerformance} #{field|name|BT-728-Lot}: ${BT-728-Lot} // Additional information
-		3 {BT-137-Lot} #{auxiliary|text|start-duration-contract} // 5.1.3 Start date and the duration of the contract (T02)
+		3 {ND-LotDuration} #{auxiliary|text|start-duration-contract} // 5.1.3 Start date and the duration of the contract (T02)
 			{BT-536-Lot} #{field|name|BT-536-Lot}: ${BT-536-Lot} // Start date
 			{BT-537-Lot} #{field|name|BT-537-Lot}: ${BT-537-Lot} // End date
 			{BT-36-Lot} #{field|name|BT-36-Lot}: ${format-number(OPA-36-Lot-Number, '###,##0.###,###,###')} ${BT-36-Lot/@unitCode} // Duration
@@ -67,49 +64,70 @@
 			0 {BT-137-Lot[(some text:$conid in (for text:$lotid1 in BT-137-Lot, text:$conid1 in OPT-315-LotResult[BT-13713-LotResult == $lotid1] return $conid1) satisfies $conid != '')]} #{auxiliary|text|essential-assets} // Essential assets (T02)
 				{BT-137-Lot[(some indicator:$edi in (for text:$lotid1 in BT-137-Lot, text:$conid1 in OPT-315-LotResult[BT-13713-LotResult == $lotid1], indicator:$edi1 in OPP-020-Contract[OPT-316-Contract == $conid1] return $edi1) satisfies $edi == TRUE)]} #{field|name|OPP-020-Contract} // Contract duration is extended due to essential assets necessary for the provision of the service (T02)
 				0 {BT-137-Lot[(some text:$desc in (for text:$lotid1 in BT-137-Lot, text:$conid1 in OPT-315-LotResult[BT-13713-LotResult == $lotid1], text:$desc1 in OPP-021-Contract[OPT-316-Contract == $conid1] return $desc1) satisfies $desc != '')]} #{field|name|OPP-021-Contract} // List of assets used for the provision of the public services (T02)
-				{OPP-022-Contract} #{field|name|OPP-022-Contract}: ${OPP-022-Contract} // Significance of the essential assets provided (T02)
-				{OPP-023-Contract} #{field|name|OPP-023-Contract}: ${OPP-023-Contract} // Predominant use of assets
+					0 {BT-137-Lot}  ${for text:$lotid2 in BT-137-Lot, text:$conid2 in OPT-315-LotResult[BT-13713-LotResult == $lotid2], text:$desc2 in OPP-021-Contract[OPT-316-Contract == $conid2] return concat($desc2, ', ')} // List of assets used for the provision of the public services (T02)
+				0 {BT-137-Lot[count(for text:$lotid1 in BT-137-Lot, text:$conid1 in OPT-315-LotResult[BT-13713-LotResult == $lotid1] return OPP-022-Contract[OPT-316-Contract == $conid1])>0]} #{field|name|OPP-022-Contract}:  ${for text:$lotid2 in BT-137-Lot, text:$conid2 in OPT-315-LotResult[BT-13713-LotResult == $lotid2], text:$sign in OPP-022-Contract[OPT-316-Contract == $conid2] return concat($sign, ', ')} // Significance of the essential assets provided (T02)
+				0 {BT-137-Lot[count(for text:$lotid1 in BT-137-Lot, text:$conid1 in OPT-315-LotResult[BT-13713-LotResult == $lotid1] return OPP-023-Contract[OPT-316-Contract == $conid1])>0]} #{field|name|OPP-023-Contract}:  ${for text:$lotid2 in BT-137-Lot, text:$conid2 in OPT-315-LotResult[BT-13713-LotResult == $lotid2], text:$pred in OPP-023-Contract[OPT-316-Contract == $conid2] return concat($pred, ', ')} // Predominant use of assets (T02)
 		13 {BT-137-Lot} #{auxiliary|text|conditions-contract} // 5.1.13. Conditions related to the contract
 			{OPP-030-Tender} #{field|name|OPP-030-Tender}: ${OPP-030-Tender} ${OPP-031-Tender} // Cost parameters for compensation payments (T02)
 			{OPP-030-Tender} #{field|name|OPP-032-Tender}: ${OPP-030-Tender} ${OPP-032-Tender} // Allocation of revenues of sales from tickets (T02)
 		14 {BT-137-Lot} #{auxiliary|text|quality-targets} // 5.1.14. Quality targets
-			{OPT-071-Lot} #{field|name|OPT-071-Lot}: ${OPT-071-Lot} ${OPT-072-Lot} // Information - Tickets (T02)
-			{OPP-033-Tender} #{field|name|OPP-030-Tender}: ${OPP-033-Tender} ${OPP-034-Tender} // Information on rewards and penalties (T02)
+			{OPT-071-Lot} #{field|name|OPT-071-Lot}: ${OPT-071-Lot} ${OPT-072-Lot} // Quality target code (T02)
+			0 {BT-137-Lot[count(for text:$lotid1 in BT-137-Lot, text:$conid1 in OPT-315-LotResult[BT-13713-LotResult == $lotid1], text:$tenderid1 in BT-3202-Contract[OPT-316-Contract == $conid1] return OPP-034-Tender[OPT-321-Tender == $tenderid1])>0]} #{field|name|OPP-033-Tender}: ${for text:$lotid2 in BT-137-Lot, text:$conid2 in OPT-315-LotResult[BT-13713-LotResult == $lotid2], text:$tenderid2 in BT-3202-Contract[OPT-316-Contract == $conid2], text:$desc2 in OPP-034-Tender[OPT-321-Tender == $tenderid2] return concat($desc2, ', ')} // Information on rewards and penalties (T02)
 		16 {BT-137-Lot[(OPT-301-Lot-Mediator is present) or (OPT-301-Lot-ReviewOrg is present) or (OPT-301-Lot-FiscalLegis is present) or (OPT-301-Lot-EnvironLegis is present) or (OPT-301-Lot-EmployLegis is present) or (OPT-301-Lot-AddInfo is present) or (OPT-301-Lot-DocProvider is present) or (OPT-301-Lot-ReviewInfo is present) or (OPT-301-Lot-TenderReceipt is present) or (OPT-301-Lot-TenderEval is present) or (some text:$orgida in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgida != '') or (some text:$orgidb in (for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2] return $orgid2) satisfies $orgidb != '') or (some text:$orgidc in (for text:$lotid3 in BT-137-Lot, text:$conid3 in OPT-315-LotResult[BT-13713-LotResult == $lotid3], text:$orgid3 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid3] return $orgid3) satisfies $orgidc != '')]} #{auxiliary|text|further-info} // 5.1.16 Further information, mediation and review
-			{BT-137-Lot[OPT-301-Lot-Mediator is present]} #{auxiliary|text|organisation-mediation}: ${for text:$refid in OPT-301-Lot-Mediator, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Mediation organisation (Lot)
-			{BT-137-Lot[OPT-301-Lot-ReviewOrg is present]} #{auxiliary|text|organisation-review}: ${for text:$refid in OPT-301-Lot-ReviewOrg, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Review organisation (Lot)
-			{BT-137-Lot[OPT-301-Lot-FiscalLegis is present]} #{auxiliary|text|organisation-providing-info-taxes}: ${for text:$refid in OPT-301-Lot-FiscalLegis, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Tax legislation information provider (Lot)
-			{BT-137-Lot[OPT-301-Lot-EnvironLegis is present]} #{auxiliary|text|organisation-providing-info-environment}: ${for text:$refid in OPT-301-Lot-EnvironLegis, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} //Environment legislation information provider (Lot)
-			{BT-137-Lot[OPT-301-Lot-EmployLegis is present]} #{auxiliary|text|organisation-providing-info-employment}: ${for text:$refid in OPT-301-Lot-EmployLegis, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Employment legislation information provider (Lot)
+			{BT-137-Lot[OPT-301-Lot-AddInfo is present]} #{auxiliary|text|organisation-providing-info-procedure}: ${for text:$refid in OPT-301-Lot-AddInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation providing additional information about the procurement procedure (Lot)
 			{BT-137-Lot[OPT-301-Lot-DocProvider is present]} #{auxiliary|text|organisation-providing-docs}: ${for text:$refid in OPT-301-Lot-DocProvider, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Documents provider organisation (Lot)
-			{BT-137-Lot[OPT-301-Lot-ReviewInfo is present]} #{auxiliary|text|organisation-providing-info-review}: ${for text:$refid in OPT-301-Lot-ReviewInfo, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Appeal Information Providing Organisation (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderReceipt is present]} #{auxiliary|text|organisation-tender-recipient}: ${for text:$refid in OPT-301-Lot-TenderReceipt, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation receiving requests to participate/Tender (Lot)
-			{BT-137-Lot[OPT-301-Lot-TenderEval is present]} #{auxiliary|text|organisation-processing-tenders}: ${for text:$refid in OPT-301-Lot-TenderEval, text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $refid) or (OPT-201-Organization-TouchPoint == $refid)] return $orgname} // Organisation processing requests to participate/Tender Evaluation Organisation: Authority Proc-Request (Lot)
-			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-financing}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Financing[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Financing Organisation (LotResult)
-			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$orgid1 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-paying}: ${for text:$lotid2 in BT-137-Lot, text:$orgid2 in OPT-301-LotResult-Paying[BT-13713-LotResult == $lotid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname} // Paying Organisation (LotResult)
-			{BT-137-Lot[some text:$orgid in (for text:$lotid1 in BT-137-Lot, text:$conid1 in OPT-315-LotResult[BT-13713-LotResult == $lotid1], text:$orgid1 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid1] return $orgid1) satisfies $orgid != '']} #{auxiliary|text|organisation-signing-contract}: ${distinct-values(for text:$lotid2 in BT-137-Lot, text:$conid2 in OPT-315-LotResult[BT-13713-LotResult == $lotid2], text:$orgid2 in OPT-300-Contract-Signatory[OPT-316-Contract == $conid2], text:$orgname in BT-500-Organization-Company[(OPT-200-Organization-Company == $orgid2) or (OPT-201-Organization-TouchPoint == $orgid2)] return $orgname)} // Contract Signatory (LotResult)
 			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: $value // Service Provider organisation
 			{BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: $value // eSender
-6 {ND-Root[(BT-13713-LotResult is present)]} #{auxiliary|text|results} // 6. Results
+6 {ND-Root[(BT-3201-Tender is present)]} #{auxiliary|text|results} // 6. Results
 	1 {ND-LotResult} #{field|name|BT-13713-LotResult}: ${BT-13713-LotResult} // 6.1 Result Lot Identifier (LOT-XXXX)
+		0 {BT-142-LotResult[BT-142-LotResult != 'unpublished']} #{BT-142-LotResult} // A winner was chosen ?
+		0 {BT-142-LotResult[BT-142-LotResult == 'unpublished']} #{field|name|BT-142-LotResult} #{auxiliary|text|unpublished} // A winner was chosen ? (unpublished)
+			{ND-WinnerChosenUnpublish} #{field|name|BT-197(BT-142)-LotResult}: #{BT-197(BT-142)-LotResult} // Unpublished Justification Code
+			{ND-WinnerChosenUnpublish[BT-196(BT-142)-LotResult is present]} #{field|name|BT-196(BT-142)-LotResult}: ${BT-196(BT-142)-LotResult} // Unpublished Justification Description
+			{ND-WinnerChosenUnpublish[BT-198(BT-142)-LotResult is present]} #{field|name|BT-198(BT-142)-LotResult}: ${BT-198(BT-142)-LotResult} // Unpublished Access Date
+		0 {BT-144-LotResult[BT-144-LotResult != 'unpublished']} #{field|name|BT-144-LotResult}: #{BT-144-LotResult} // Not awarded reason
+		0 {BT-144-LotResult[BT-144-LotResult == 'unpublished']} #{field|name|BT-144-LotResult}: #{auxiliary|text|unpublished} // Not awarded reason (unpublished)
+			{BT-197(BT-144)-LotResult} #{field|name|BT-197(BT-144)-LotResult}: #{BT-197(BT-144)-LotResult} // Unpublished Justification Code
+			{BT-144-LotResult[BT-196(BT-144)-LotResult is present]} #{field|name|BT-196(BT-144)-LotResult}: ${BT-196(BT-144)-LotResult} // Unpublished Justification Description
+			{BT-198(BT-144)-LotResult[BT-198(BT-144)-LotResult is present]} #{field|name|BT-198(BT-144)-LotResult}: ${BT-198(BT-144)-LotResult} // Unpublished Access Date
 		2 {ND-LotResult[BT-02-notice == 'veat' or BT-02-notice == 'can-modif' or ((BT-142-LotResult == 'selec-w' or BT-142-LotResult == 'unpublished') and OPT-320-LotResult is present and OPT-315-LotResult is present)]} #{auxiliary|text|winner-info} // 6.1.2. Winning tenders
 			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]])>0]} #{auxiliary|text|winner}: // Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this Winner
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Name of this winner (single organisation in Tendering Party)
+				0 {OPT-320-LotResult[some text:$name in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{auxiliary|text|winner-subcontractor}: // Subcontractors of the winner
+					{OPT-320-LotResult[some text:$orgname1 in (for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $orgname1 != '']} #{field|name|BT-500-Organization-Company}: ${for text:$tender in OPT-320-LotResult, text:$contractid in OPT-316-Contract[BT-3202-Contract == $tender], text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender]]], text:$orgname2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return concat($orgname2, ', ')} // Subcontractor names
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]])>0]} #{auxiliary|text|tender}: // Tender
+				{OPT-320-LotResult} #{field|name|BT-3201-Tender}: ${for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender == $tender]} // Tender identifier
+				{OPT-320-LotResult} #{field|name|BT-13714-Tender}: ${for text:$tender in OPT-320-LotResult return BT-13714-Tender[OPT-321-Tender == $tender]} // Identifier of lot or group of lots
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-720-Tender[BT-720-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-720-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$tendervalue in BT-720-Tender[OPT-321-Tender == $tender2] return format-number($tendervalue, '###,##0.##')} ${for text:$tender3 in OPT-320-LotResult return BT-720-Tender[BT-720-Tender[OPT-321-Tender == $tender3] != -1]/@currencyID } // Value of the tender
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-720-Tender[BT-720-Tender[OPT-321-Tender == $tender1] == -1]) > 0]} #{field|name|BT-720-Tender}: #{auxiliary|text|unpublished} // Value of the tender (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-720)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-720)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-720)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
 					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-720)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-720)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-720)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
 					{OPT-320-LotResult[some date:$date in (for text:$tender in OPT-320-LotResult return BT-198(BT-720)-Tender[OPT-321-Tender == $tender]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-720)-Tender}: ${for text:$tender1 in OPT-320-LotResult return date:BT-198(BT-720)-Tender[OPT-321-Tender == $tender1]} // Unpublished Access Date // {OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-720)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-720)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-720)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult} #{auxiliary|text|contract-information}: // Contract info for this tender
+					{OPT-320-LotResult} #{field|name|BT-150-Contract}: ${for text:$tender in OPT-320-LotResult return BT-150-Contract[BT-3202-Contract == $tender]} // Contract identifier
 					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-145-Contract[BT-3202-Contract == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-145-Contract}: ${for text:$tender2 in OPT-320-LotResult return date:BT-145-Contract[BT-3202-Contract == $tender2]} // Contract Conclusion Date
+		3 {ND-LotResult[count(for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender[count(OPT-316-Contract[BT-3202-Contract == $tender]) == 0] == $tender])>0]} #{auxiliary|text|non-winning-tender}: // 6.1.3. Non-winning tenders
+			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender[count(OPT-316-Contract[BT-3202-Contract == $tender]) == 0] == $tender])>0]} #{auxiliary|text|organisation-tenderer}: // Non-winning tender
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this non-winning tenderer
+				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of this non-winning tenderer (single organisation in Tendering Party)
+7 {ND-Root[BT-1501(n)-Contract is present]} #{auxiliary|text|modification} // 7. Modifications
+	{BT-1501(n)-Contract} #{field|name|BT-1501(n)-Contract}: ${BT-1501(n)-Contract} // Modification Previous Notice Identifier
+	{BT-200-Contract} #{field|name|BT-200-Contract}: #{BT-200-Contract} // Modification Reason Code
+	{BT-201-Contract} #{field|name|BT-201-Contract}: ${BT-201-Contract} // Modification Reason Description
+	1 {ND-Modification} #{auxiliary|text|modification} // Modification
+		{BT-1501(s)-Contract} #{field|name|BT-1501(s)-Contract}: ${BT-1501(s)-Contract} // Modification Previous Notice Section Identifier
+		{BT-202-Contract} #{field|name|BT-202-Contract}: ${BT-202-Contract} // Modification Previous Notice Section Identifier
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
 		{ND-Organization} #{field|name|BT-500-Organization-Company}: ${BT-500-Organization-Company} // Organisation Name
-		{BT-165-Organization-Company} #{field|name|BT-165-Organization-Company}: ${BT-165-Organization-Company} // Size of the economic operator
 		{BT-633-Organization[BT-633-Organization == TRUE]} #{field|name|BT-633-Organization} // The organisation is a natural person.
-		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: $value // Organization Identifier
-		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: $value // Organization Part Name
+		{BT-501-Organization-Company} #{field|name|BT-501-Organization-Company}: ${BT-501-Organization-Company} // Organization Identifier
+		{BT-16-Organization-Company} #{field|name|BT-16-Organization-Company}: ${BT-16-Organization-Company} // Organization Part Name
 		{BT-510(a)-Organization-Company} #{field|name|BT-510(a)-Organization-Company}: ${BT-510(a)-Organization-Company} ${BT-510(b)-Organization-Company} ${BT-510(c)-Organization-Company} // Postal address
-		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: $value // Organization City
+		{BT-513-Organization-Company} #{field|name|BT-513-Organization-Company}: ${BT-513-Organization-Company} // Organization City
 		{BT-512-Organization-Company} #{field|name|BT-512-Organization-Company}: ${BT-512-Organization-Company} // Organization Post Code
 		{BT-507-Organization-Company} #{field|name|BT-507-Organization-Company}: #{BT-507-Organization-Company} (${BT-507-Organization-Company}) // Organization Country Subdivision
 		{BT-514-Organization-Company} #{field|name|BT-514-Organization-Company}: #{BT-514-Organization-Company} // Organization Country
@@ -118,7 +136,6 @@
 		{BT-503-Organization-Company} #{field|name|BT-503-Organization-Company}: ${BT-503-Organization-Company} // Organization Contact Telephone Number
 		{BT-739-Organization-Company} #{field|name|BT-739-Organization-Company}: ${BT-739-Organization-Company} // Organization Contact Fax
 		{BT-505-Organization-Company} #{field|name|BT-505-Organization-Company}: ${BT-505-Organization-Company} // Organization Internet Address
-		{BT-509-Organization-Company} #{field|name|BT-509-Organization-Company}: ${BT-509-Organization-Company} // Organization eDelivery Gateway
 		{OPT-200-Organization-Company[some text:$bpurl in (for text:$orgid in OPT-200-Organization-Company return BT-508-Procedure-Buyer[OPT-300-Procedure-Buyer == $orgid]) satisfies $bpurl != '']} #{field|name|BT-508-Procedure-Buyer}: ${for text:$orgid1 in OPT-200-Organization-Company return BT-508-Procedure-Buyer[OPT-300-Procedure-Buyer == $orgid1]} // Buyer Profile URL
 		0 {ND-Touchpoint} #{auxiliary|text|other-contact-point}: // TouchPoint / Other contact points
 			{ND-Touchpoint} #{field|name|BT-500-Organization-TouchPoint}: ${BT-500-Organization-TouchPoint} // Buyer Touchpoint Name
@@ -133,37 +150,14 @@
 			{BT-503-Organization-TouchPoint[OPT-200-Organization-Company == OPT-300-Procedure-Buyer] } #{field|name|BT-503-Organization-TouchPoint}: ${BT-503-Organization-TouchPoint} // Touchpoint Contact Telephone Number
 			{BT-739-Organization-TouchPoint[OPT-200-Organization-Company == OPT-300-Procedure-Buyer] } #{field|name|BT-739-Organization-TouchPoint}: ${BT-739-Organization-TouchPoint} // Touchpoint Contact Fax
 			{BT-505-Organization-TouchPoint[OPT-200-Organization-Company == OPT-300-Procedure-Buyer] } #{field|name|BT-505-Organization-TouchPoint}: ${BT-505-Organization-TouchPoint} // Touchpoint Internet Address
-			{BT-509-Organization-TouchPoint[OPT-200-Organization-Company == OPT-300-Procedure-Buyer] } #{field|name|BT-509-Organization-TouchPoint}: ${BT-509-Organization-TouchPoint} // Touchpoint eDelivery Gateway
 		0 {ND-Organization} #{auxiliary|text|roles}: // Roles of this organisation
 			0 {ND-Organization[count(for text:$orgid in OPT-200-Organization-Company return OPT-300-Procedure-Buyer[OPT-300-Procedure-Buyer == $orgid])>0]} #{auxiliary|text|buyer} // This org is a Buyer
-				{OPP-050-Organization[OPP-050-Organization == TRUE]} #{field|name|OPP-050-Organization} // Leader of the group
 				{OPP-052-Organization[OPP-052-Organization == TRUE]} #{field|name|OPP-052-Organization} // CPB Acquiring
 				{OPP-051-Organization[OPP-051-Organization == TRUE]} #{field|name|OPP-051-Organization} // CPB Awarding
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'serv-prov') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'serv-prov')]} #{auxiliary|text|organisation-providing-procurement-service} // This org is a Service Provider
 			{ND-Organization[(some text:$esender in (for text:$orgid in OPT-200-Organization-Company, text:$servprovtype in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $orgid] return $servprovtype) satisfies $esender == 'ted-esen') or (some text:$esender1 in (for text:$tpoid in OPT-201-Organization-TouchPoint, text:$servprovtype1 in OPT-030-Procedure-SProvider[OPT-300-Procedure-SProvider == $tpoid] return $servprovtype1) satisfies $esender1 == 'ted-esen')]} #{auxiliary|text|organisation-esender} // This org is an eSender
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-AddInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Part-AddInfo)]} #{auxiliary|text|organisation-providing-info-procedure} // Additional Information Providing Organisation (PART)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-DocProvider) or (OPT-201-Organization-TouchPoint == OPT-301-Part-DocProvider)]} #{auxiliary|text|organisation-providing-docs} // Documents provider organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-TenderReceipt) or (OPT-201-Organization-TouchPoint == OPT-301-Part-TenderReceipt)]} #{auxiliary|text|organisation-tender-recipient} // Organisation receiving requests to participate/Tender Recipient Organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-TenderEval) or (OPT-201-Organization-TouchPoint == OPT-301-Part-TenderEval)]} #{auxiliary|text|organisation-processing-tenders} // Organisation processing requests to participate/Tender Evaluation Organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-ReviewOrg) or (OPT-201-Organization-TouchPoint == OPT-301-Part-ReviewOrg)]} #{auxiliary|text|organisation-review} // Review organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-ReviewInfo) or (OPT-201-Organization-TouchPoint == OPT-301-Part-ReviewInfo)]} #{auxiliary|text|organisation-providing-info-review} // Organisation providing information on the appeal procedures (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-Mediator) or (OPT-201-Organization-TouchPoint == OPT-301-Part-Mediator)]} #{auxiliary|text|organisation-mediation} // Mediation organisation (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-FiscalLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-FiscalLegis)]} #{auxiliary|text|organisation-providing-info-taxes} // Tax legislation information provider (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-EnvironLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-EnvironLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Environment legislation information provider (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Lot-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Lot-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (LOT)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Part-EmployLegis) or (OPT-201-Organization-TouchPoint == OPT-301-Part-EmployLegis)]} #{auxiliary|text|organisation-providing-info-environment} // Employment legislation information provider (PART)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-300-Contract-Signatory) or (OPT-201-Organization-TouchPoint == OPT-300-Contract-Signatory)]} #{auxiliary|text|organisation-signing-contract} // Contract Signatory organisation (SettledContract)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Financing) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Financing)]} #{auxiliary|text|organisation-financing} // Financing Organisation (LotResult)
-			{ND-Organization[(OPT-200-Organization-Company == OPT-301-LotResult-Paying) or (OPT-201-Organization-TouchPoint == OPT-301-LotResult-Paying)]} #{auxiliary|text|organisation-paying} // Paying Organisation (LotResult)
 			0 {ND-Organization[(OPT-200-Organization-Company == OPT-300-Tenderer) or (OPT-201-Organization-TouchPoint == OPT-300-Tenderer)]} #{auxiliary|text|organisation-tenderer} // Tenderer Organisation (Tenderer)
 			{ND-Organization[(OPT-200-Organization-Company == OPT-301-Tenderer-SubCont) or (OPT-201-Organization-TouchPoint == OPT-301-Tenderer-SubCont)]} #{auxiliary|text|organisation-subcontractor} // Subcontractor Organisation (SubContractor)
 			0 {ND-Organization[OPT-302-Organization != '']} #{auxiliary|text|beneficial-owner} // Beneficial Owner
@@ -194,6 +188,7 @@
 		{BT-02-notice} #{field|name|BT-02-notice}: #{BT-02-notice} // Notice type
 		{OPP-070-notice} #{field|name|OPP-070-notice}: ${OPP-070-notice} // Notice subtype
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/X01.efx b/view-templates/X01.efx
index 66f137bc1..3baf64f15 100644
--- a/view-templates/X01.efx
+++ b/view-templates/X01.efx
@@ -13,10 +13,14 @@
 		{OPP-113-Business-European} #{name|OPP-113}: ${OPP-113-Business-European} // Date of registration
 	4 {ND-Root} #{auxiliary|text|publication-gazette} // 9.4 Publication in the official gazette
 		{OPP-120-Business} #{name|OPP-120}: ${OPP-120-Business} // Name of publication
-		{OPP-121-Business} #{name|OPP-121}: ${OPP-121-Business} // Title of the announcement: A company is born
+		{OPP-121-Business} #{name|OPP-121}: ${OPP-121-Business} // Title of the announcement
 		{OPP-122-Business} #{name|OPP-122}: ${OPP-122-Business} // URL of the announcement
 		{OPP-123-Business} #{name|OPP-123}: ${OPP-123-Business} // Date of publication of the announcement
-	5 {OPP-130-Business} #{name|OPP-130}: ${OPP-130-Business} // 9.5 Additional information
+	5 {ND-Root[OPP-130-Business is present]} #{name|OPP-130}: ${OPP-130-Business} // 9.5 Additional information
+10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
+	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
+	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
+	{BT-762-notice} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
 		{BT-701-notice} #{field|name|BT-701-notice}: ${BT-701-notice} - ${BT-757-notice} // Notice identifier / version
@@ -25,6 +29,7 @@
 		{OPP-070-notice} #{field|name|OPP-070-notice}: ${OPP-070-notice} // Notice subtype
 		{OPP-131-Business} #{name|OPP-131}: ${OPP-131-Business} // Sender's email address
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/X02.efx b/view-templates/X02.efx
index 0085f1278..961eb091c 100644
--- a/view-templates/X02.efx
+++ b/view-templates/X02.efx
@@ -26,10 +26,14 @@
 		{OPP-113-Business-European} #{name|OPP-113}: ${OPP-113-Business-European} // Date of registration
 	4 {ND-Root} #{auxiliary|text|publication-gazette} // 9.4 Publication in the official gazette
 		{OPP-120-Business} #{name|OPP-120}: ${OPP-120-Business} // Name of publication
-		{OPP-121-Business} #{name|OPP-121}: ${OPP-121-Business} // Title of the announcement: A company is born
+		{OPP-121-Business} #{name|OPP-121}: ${OPP-121-Business} // Title of the announcement
 		{OPP-122-Business} #{name|OPP-122}: ${OPP-122-Business} // URL of the announcement
 		{OPP-123-Business} #{name|OPP-123}: ${OPP-123-Business} // Date of publication of the announcement
-	5 {OPP-130-Business} #{name|OPP-130}: ${OPP-130-Business} // 9.5 Additional information
+	5 {ND-Root[OPP-130-Business is present]} #{name|OPP-130}: ${OPP-130-Business} // 9.5 Additional information
+10 {ND-Root[BT-758-notice is present]} #{auxiliary|text|change} // 10. Change
+	{BT-758-notice} #{field|name|BT-758-notice}: ${BT-758-notice} // Change Notice Version Identifier
+	{BT-140-notice} #{field|name|BT-140-notice}: #{BT-140-notice} // Change Reason Code
+	{BT-762-notice} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
 		{BT-701-notice} #{field|name|BT-701-notice}: ${BT-701-notice} - ${BT-757-notice} // Notice identifier / version
@@ -38,6 +42,7 @@
 		{OPP-070-notice} #{field|name|OPP-070-notice}: ${OPP-070-notice} // Notice subtype
 		{OPP-131-Business} #{name|OPP-131}: ${OPP-131-Business} // Sender's email address
 		{BT-05(a)-notice} #{field|name|BT-05(a)-notice}: ${BT-05(a)-notice} ${BT-05(b)-notice} // Notice dispatch date and time
+		{BT-803(d)-notice} #{field|name|BT-803(d)-notice}: ${BT-803(d)-notice} ${BT-803(t)-notice} // Notice dispatch date (eSender)
 		{BT-702(a)-notice} #{field|name|BT-702(a)-notice}: #{BT-702(a)-notice} #{BT-702(b)-notice} // Languages in which this notice is officially available
 	2 {ND-Root} #{auxiliary|text|publication-information} // 11.2 Publication information
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
diff --git a/view-templates/summary.efx b/view-templates/summary.efx
index 5353c1456..da9c55ba4 100644
--- a/view-templates/summary.efx
+++ b/view-templates/summary.efx
@@ -67,6 +67,18 @@
 6 {ND-Root[(BT-13713-LotResult is present)]} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} ${BT-161-NoticeResult/@currencyID} // Notice Value (Value of all contracts awarded in this procedure)
 	0 {ND-NoticeResult[BT-161-NoticeResult == -1]} #{field|name|BT-161-NoticeResult}: #{auxiliary|text|unpublished} // Notice Value (Value of all contracts awarded in this procedure) (unpublished)
+	0 {ND-NoticeResultGroupFA[BT-556-NoticeResult != 'unpublished']} #{auxiliary|text|group-framework-value}: ${BT-556-NoticeResult} // Value of the framework agreements in this group of lots
+		0 {ND-NoticeResultGroupFA} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-556-NoticeResult return BT-1375-Procedure[BT-330-Procedure == $gloid] } // Lots included: LOT-0001, LOT-0003
+		0 {BT-156-NoticeResult[BT-156-NoticeResult != -1]} #{field|name|BT-156-NoticeResult}: ${format-number(BT-156-NoticeResult, '###,##0.##')} ${BT-156-NoticeResult/@currencyID} // Maximum value of the framework agreements in this group of lots
+		0 {BT-156-NoticeResult[BT-156-NoticeResult == -1]} #{field|name|BT-156-NoticeResult}:#{auxiliary|text|unpublished} // Maximum value of the framework agreements in this group of lots (unpublished)
+			{ND-GroupMaximumValueUnpublish} #{field|name|BT-197(BT-156)-NoticeResult}: #{BT-197(BT-156)-NoticeResult} // Unpublished Justification Code
+			{ND-GroupMaximumValueUnpublish[BT-196(BT-156)-NoticeResult is present]} #{field|name|BT-196(BT-156)-NoticeResult}: ${BT-196(BT-156)-NoticeResult} // Unpublished Justification Description
+			{ND-GroupMaximumValueUnpublish[BT-198(BT-156)-NoticeResult is present]} #{field|name|BT-198(BT-156)-NoticeResult}: ${BT-198(BT-156)-NoticeResult} // Unpublished Access Date
+		0 {BT-1561-NoticeResult[BT-1561-NoticeResult != -1]} #{field|name|BT-1561-NoticeResult}: ${format-number(BT-1561-NoticeResult, '###,##0.##')} ${BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID} // Re-estimated value of the framework agreements within a group of lots
+		0 {BT-1561-NoticeResult[BT-1561-NoticeResult == -1]} #{field|name|BT-1561-NoticeResult}: #{auxiliary|text|unpublished} // Re-estimated value of the framework agreements within a group of lots (unpublished)
+			{ND-GroupReestimatedValueUnpublish} #{field|name|BT-197(BT-1561)-NoticeResult}: #{BT-197(BT-1561)-NoticeResult} // Unpublished Justification Code
+			{ND-GroupReestimatedValueUnpublish[BT-196(BT-1561)-NoticeResult is present]} #{field|name|BT-196(BT-1561)-NoticeResult}: ${BT-196(BT-1561)-NoticeResult} // Unpublished Justification Description
+			{ND-GroupReestimatedValueUnpublish[BT-198(BT-1561)-NoticeResult is present]} #{field|name|BT-198(BT-1561)-NoticeResult}: ${BT-198(BT-1561)-NoticeResult} // Unpublished Access Date
 	0 {ND-NoticeResultGroupFA[BT-556-NoticeResult == 'unpublished']} #{auxiliary|text|group-framework-value}: #{auxiliary|text|unpublished} // Value of the framework agreements in this group of lots (unpublished)
 		0 {ND-NoticeResultGroupFA} #{field|name|BT-1375-Procedure}: ${for text:$gloid in BT-556-NoticeResult return BT-1375-Procedure[BT-330-Procedure == $gloid] } // Lots included: LOT-0001, LOT-0003
 		0 {BT-156-NoticeResult[BT-156-NoticeResult != -1]} #{field|name|BT-156-NoticeResult}: ${format-number(BT-156-NoticeResult, '###,##0.##')} ${BT-156-NoticeResult[BT-156-NoticeResult/@currencyID != 'unpublished']/@currencyID} // Maximum value of the framework agreements in this group of lots