diff --git a/view-templates/1.efx b/view-templates/1.efx
index 229e18357..f9a73ab0c 100644
--- a/view-templates/1.efx
+++ b/view-templates/1.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{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
@@ -69,17 +69,16 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 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
 		{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
diff --git a/view-templates/10.efx b/view-templates/10.efx
index 12d3c54c9..1ddea1ecc 100644
--- a/view-templates/10.efx
+++ b/view-templates/10.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{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
@@ -79,7 +79,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -135,13 +134,12 @@
 				{BT-747-Lot} #{field|name|BT-747-Lot}: #{BT-747-Lot} // Selection Criterion Type
 				{ND-SelectionCriteria[BT-749-Lot is present]} #{field|name|BT-749-Lot}: ${BT-749-Lot} // Selection Criterion Name
 				{ND-SelectionCriteria[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
 				{BT-7531-Lot} #{BT-7531-Lot}: ${format-number(BT-752-Lot-WeightNumber, '###,##0.###,###,###')} // Number Weight
 				{BT-7532-Lot} #{BT-7532-Lot}: ${format-number(BT-752-Lot-ThresholdNumber, '###,##0.###,###,###')} // Number Threshold
 			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-51-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.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
@@ -186,13 +184,13 @@
 				{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} #{field|name|BT-769-Lot}: #{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-751-Lot[BT-75-Lot is present]} #{field|name|BT-75-Lot}: ${BT-75-Lot} // Financial Guarantee Description
 				{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
 				{BT-98-Lot} #{field|name|BT-98-Lot}: ${OPA-98-Lot-Number} #{code|name|${concat('duration-unit.', 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
 				{BT-771-Lot} #{BT-771-Lot} // Late Tenderer Information
 				{ND-LateTendererInformation[BT-772-Lot is present]} #{field|name|BT-772-Lot}: ${BT-772-Lot} // Late Tenderer Information Description
-			0 {ND-LotTenderingTerms[(BT-736-Lot is present) or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot is present) or (BT-93-Lot is present) 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
+			0 {ND-LotTenderingTerms[(BT-736-Lot is present) or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot is present) or (BT-93-Lot is present) 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-681-Lot is present)]} #{auxiliary|text|contract-terms}: // Terms of contract
 				{BT-736-Lot} #{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.
@@ -225,8 +223,8 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // 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
@@ -278,10 +276,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
@@ -295,3 +293,7 @@
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
 		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
 		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
+} // 11.2 Publication information
+		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
+		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
+		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
diff --git a/view-templates/11.efx b/view-templates/11.efx
index 682dced1e..2b231e920 100644
--- a/view-templates/11.efx
+++ b/view-templates/11.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{BT-10-Procedure-Buyer} #{field|name|BT-10-Procedure-Buyer}: #value // Activity of the contracting authority
 		{BT-610-Procedure-Buyer} #{field|name|BT-610-Procedure-Buyer}: #{BT-610-Procedure-Buyer} // Activity Entity
 2 {ND-Root} #{auxiliary|text|procedure} // 2. Procedure
@@ -80,7 +80,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -136,13 +135,12 @@
 				{BT-747-Lot} #{field|name|BT-747-Lot}: #{BT-747-Lot} // Selection Criterion Type
 				{ND-SelectionCriteria[BT-749-Lot is present]} #{field|name|BT-749-Lot}: ${BT-749-Lot} // Selection Criterion Name
 				{ND-SelectionCriteria[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
 				{BT-7531-Lot} #{BT-7531-Lot}: ${format-number(BT-752-Lot-WeightNumber, '###,##0.###,###,###')} // Number Weight
 				{BT-7532-Lot} #{BT-7532-Lot}: ${format-number(BT-752-Lot-ThresholdNumber, '###,##0.###,###,###')} // Number Threshold
 			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-51-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.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
@@ -187,7 +185,7 @@
 				{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} #{field|name|BT-769-Lot}: #{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-751-Lot[BT-75-Lot is present]} #{field|name|BT-75-Lot}: ${BT-75-Lot} // Financial Guarantee Description
 				{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
 				{BT-98-Lot} #{field|name|BT-98-Lot}: ${OPA-98-Lot-Number} #{code|name|${concat('duration-unit.', 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
@@ -226,8 +224,8 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // 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
@@ -279,10 +277,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
@@ -296,3 +294,7 @@
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
 		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
 		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
+n} // 11.2 Publication information
+		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
+		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
+		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
diff --git a/view-templates/12.efx b/view-templates/12.efx
index fd98e2fb9..6303ab839 100644
--- a/view-templates/12.efx
+++ b/view-templates/12.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{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
@@ -79,7 +79,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -134,13 +133,12 @@
 				{BT-747-Lot} #{field|name|BT-747-Lot}: #{BT-747-Lot} // Selection Criterion Type
 				{ND-SelectionCriteria[BT-749-Lot is present]} #{field|name|BT-749-Lot}: ${BT-749-Lot} // Selection Criterion Name
 				{ND-SelectionCriteria[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
 				{BT-7531-Lot} #{BT-7531-Lot}: ${format-number(BT-752-Lot-WeightNumber, '###,##0.###,###,###')} // Number Weight
 				{BT-7532-Lot} #{BT-7532-Lot}: ${format-number(BT-752-Lot-ThresholdNumber, '###,##0.###,###,###')} // Number Threshold
 			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-51-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.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
@@ -185,7 +183,7 @@
 				{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} #{field|name|BT-769-Lot}: #{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-751-Lot[BT-75-Lot is present]} #{field|name|BT-75-Lot}: ${BT-75-Lot} // Financial Guarantee Description
 				{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
 				{BT-98-Lot} #{field|name|BT-98-Lot}: ${OPA-98-Lot-Number} #{code|name|${concat('duration-unit.', 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
@@ -224,8 +222,8 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // 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
@@ -277,10 +275,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
@@ -294,3 +292,7 @@
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
 		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
 		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
+ // 11.2 Publication information
+		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
+		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
+		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
diff --git a/view-templates/13.efx b/view-templates/13.efx
index 2b4a54d39..b7dee7b21 100644
--- a/view-templates/13.efx
+++ b/view-templates/13.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{BT-10-Procedure-Buyer} #{field|name|BT-10-Procedure-Buyer}: #value // Activity of the contracting authority
 		{BT-610-Procedure-Buyer} #{field|name|BT-610-Procedure-Buyer}: #{BT-610-Procedure-Buyer} // Activity Entity
 2 {ND-Root} #{auxiliary|text|procedure} // 2. Procedure
@@ -80,7 +80,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -135,13 +134,12 @@
 				{BT-747-Lot} #{field|name|BT-747-Lot}: #{BT-747-Lot} // Selection Criterion Type
 				{ND-SelectionCriteria[BT-749-Lot is present]} #{field|name|BT-749-Lot}: ${BT-749-Lot} // Selection Criterion Name
 				{ND-SelectionCriteria[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
 				{BT-7531-Lot} #{BT-7531-Lot}: ${format-number(BT-752-Lot-WeightNumber, '###,##0.###,###,###')} // Number Weight
 				{BT-7532-Lot} #{BT-7532-Lot}: ${format-number(BT-752-Lot-ThresholdNumber, '###,##0.###,###,###')} // Number Threshold
 			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-51-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.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
@@ -186,7 +184,7 @@
 				{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} #{field|name|BT-769-Lot}: #{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-751-Lot[BT-75-Lot is present]} #{field|name|BT-75-Lot}: ${BT-75-Lot} // Financial Guarantee Description
 				{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
 				{BT-98-Lot} #{field|name|BT-98-Lot}: ${OPA-98-Lot-Number} #{code|name|${concat('duration-unit.', 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
@@ -225,8 +223,8 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // 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
@@ -278,10 +276,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
@@ -295,3 +293,7 @@
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
 		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
 		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
+} // 11.2 Publication information
+		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
+		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
+		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
diff --git a/view-templates/14.efx b/view-templates/14.efx
index 1dd8d2af0..299212110 100644
--- a/view-templates/14.efx
+++ b/view-templates/14.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // 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
 		{BT-610-Procedure-Buyer} #{field|name|BT-610-Procedure-Buyer}: #{BT-610-Procedure-Buyer} // Activity Entity
@@ -76,7 +76,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -127,10 +126,9 @@
 				{BT-747-Lot} #{field|name|BT-747-Lot}: #{BT-747-Lot} // Selection Criterion Type
 				{ND-SelectionCriteria[BT-749-Lot is present]} #{field|name|BT-749-Lot}: ${BT-749-Lot} // Selection Criterion Name
 				{ND-SelectionCriteria[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-51-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.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
@@ -174,7 +172,7 @@
 				{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} #{field|name|BT-769-Lot}: #{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-751-Lot[BT-75-Lot is present]} #{field|name|BT-75-Lot}: ${BT-75-Lot} // Financial Guarantee Description
 				{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
 				{BT-98-Lot} #{field|name|BT-98-Lot}: ${OPA-98-Lot-Number} #{code|name|${concat('duration-unit.', 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
@@ -206,8 +204,8 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // 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
@@ -257,10 +255,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
@@ -274,3 +272,7 @@
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
 		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
 		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
+ information
+		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
+		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
+		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
diff --git a/view-templates/15.efx b/view-templates/15.efx
index 5d3314e35..af3911fff 100644
--- a/view-templates/15.efx
+++ b/view-templates/15.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{BT-10-Procedure-Buyer} #{field|name|BT-10-Procedure-Buyer}: #value // Activity of the contracting authority
 		{BT-610-Procedure-Buyer} #{field|name|BT-610-Procedure-Buyer}: #{BT-610-Procedure-Buyer} // Activity Entity
 2 {ND-Root} #{auxiliary|text|procedure} // 2. Procedure
@@ -46,7 +46,6 @@
 			{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)
 		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
@@ -98,7 +97,6 @@
 				{BT-747-Lot} #{field|name|BT-747-Lot}: #{BT-747-Lot} // Selection Criterion Type
 				{ND-SelectionCriteria[BT-749-Lot is present]} #{field|name|BT-749-Lot}: ${BT-749-Lot} // Selection Criterion Name
 				{ND-SelectionCriteria[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
 				{BT-7531-Lot} #{BT-7531-Lot}: ${format-number(BT-752-Lot-WeightNumber, '###,##0.###,###,###')} // Number Weight
 				{BT-7532-Lot} #{BT-7532-Lot}: ${format-number(BT-752-Lot-ThresholdNumber, '###,##0.###,###,###')} // Number Threshold
@@ -135,7 +133,7 @@
 				{ND-NonEsubmission[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 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-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-751-Lot[BT-75-Lot is present]} #{field|name|BT-75-Lot}: ${BT-75-Lot} // Financial Guarantee Description
 				{BT-98-Lot} #{field|name|BT-98-Lot}: ${OPA-98-Lot-Number} #{code|name|${concat('duration-unit.', 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
 				{BT-771-Lot} #{BT-771-Lot} // Late Tenderer Information
@@ -162,8 +160,8 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // 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
@@ -215,10 +213,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
@@ -232,3 +230,6 @@
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
 		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
 		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
+me|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
+		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
+		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
diff --git a/view-templates/16.efx b/view-templates/16.efx
index ad8d17e58..227d43327 100644
--- a/view-templates/16.efx
+++ b/view-templates/16.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{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
@@ -81,7 +81,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -139,13 +138,12 @@
 				{BT-747-Lot} #{field|name|BT-747-Lot}: #{BT-747-Lot} // Selection Criterion Type
 				{ND-SelectionCriteria[BT-749-Lot is present]} #{field|name|BT-749-Lot}: ${BT-749-Lot} // Selection Criterion Name
 				{ND-SelectionCriteria[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
 				{BT-7531-Lot} #{BT-7531-Lot}: ${format-number(BT-752-Lot-WeightNumber, '###,##0.###,###,###')} // Number Weight
 				{BT-7532-Lot} #{BT-7532-Lot}: ${format-number(BT-752-Lot-ThresholdNumber, '###,##0.###,###,###')} // Number Threshold
 			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-51-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
@@ -190,7 +188,7 @@
 				{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} #{field|name|BT-769-Lot}: #{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-751-Lot[BT-75-Lot is present]} #{field|name|BT-75-Lot}: ${BT-75-Lot} // Financial Guarantee Description
 				{BT-1311(d)-Lot} #{field|name|BT-1311(d)-Lot}: ${BT-1311(d)-Lot} ${BT-1311(t)-Lot} // Deadline for receipt of requests to participate
 				{BT-131(d)-Lot} #{field|name|BT-131(d)-Lot}: ${BT-131(d)-Lot} ${BT-131(t)-Lot} // Deadline for receipt of tenders
 				{BT-98-Lot} #{field|name|BT-98-Lot}: ${OPA-98-Lot-Number} #{code|name|${concat('duration-unit.', BT-98-Lot/@unitCode)}} // Deadline until which the tender must remain valid
@@ -234,8 +232,8 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // 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
@@ -287,10 +285,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
@@ -304,3 +302,6 @@
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
 		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
 		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
+ation number
+		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
+		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
diff --git a/view-templates/17.efx b/view-templates/17.efx
index 67d6f098e..f960288a3 100644
--- a/view-templates/17.efx
+++ b/view-templates/17.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{BT-10-Procedure-Buyer} #{field|name|BT-10-Procedure-Buyer}: #value // Activity of the contracting authority
 		{BT-610-Procedure-Buyer} #{field|name|BT-610-Procedure-Buyer}: #{BT-610-Procedure-Buyer} // Activity Entity
 2 {ND-Root} #{auxiliary|text|procedure} // 2. Procedure
@@ -82,7 +82,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -140,13 +139,12 @@
 				{BT-747-Lot} #{field|name|BT-747-Lot}: #{BT-747-Lot} // Selection Criterion Type
 				{ND-SelectionCriteria[BT-749-Lot is present]} #{field|name|BT-749-Lot}: ${BT-749-Lot} // Selection Criterion Name
 				{ND-SelectionCriteria[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
 				{BT-7531-Lot} #{BT-7531-Lot}: ${format-number(BT-752-Lot-WeightNumber, '###,##0.###,###,###')} // Number Weight
 				{BT-7532-Lot} #{BT-7532-Lot}: ${format-number(BT-752-Lot-ThresholdNumber, '###,##0.###,###,###')} // Number Threshold
 			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-51-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.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
@@ -190,7 +188,7 @@
 				{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} #{field|name|BT-769-Lot}: #{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-751-Lot[BT-75-Lot is present]} #{field|name|BT-75-Lot}: ${BT-75-Lot} // Financial Guarantee Description
 				{BT-1311(d)-Lot} #{field|name|BT-1311(d)-Lot}: ${BT-1311(d)-Lot} ${BT-1311(t)-Lot} // Deadline for receipt of requests to participate
 				{BT-131(d)-Lot} #{field|name|BT-131(d)-Lot}: ${BT-131(d)-Lot} ${BT-131(t)-Lot} // Deadline for receipt of tenders
 				{BT-98-Lot} #{field|name|BT-98-Lot}: ${OPA-98-Lot-Number} #{code|name|${concat('duration-unit.', BT-98-Lot/@unitCode)}} // Deadline until which the tender must remain valid
@@ -234,8 +232,8 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // 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
@@ -287,10 +285,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
@@ -304,3 +302,7 @@
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
 		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
 		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
+formation} // 11.2 Publication information
+		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
+		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
+		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
diff --git a/view-templates/18.efx b/view-templates/18.efx
index 29e5044c9..cfdab1bf5 100644
--- a/view-templates/18.efx
+++ b/view-templates/18.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // 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
 		{BT-610-Procedure-Buyer} #{field|name|BT-610-Procedure-Buyer}: #{BT-610-Procedure-Buyer} // Activity Entity
@@ -83,7 +83,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -140,13 +139,12 @@
 				{BT-747-Lot} #{field|name|BT-747-Lot}: #{BT-747-Lot} // Selection Criterion Type
 				{ND-SelectionCriteria[BT-749-Lot is present]} #{field|name|BT-749-Lot}: ${BT-749-Lot} // Selection Criterion Name
 				{ND-SelectionCriteria[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
 				{BT-7531-Lot} #{BT-7531-Lot}: ${format-number(BT-752-Lot-WeightNumber, '###,##0.###,###,###')} // Number Weight
 				{BT-7532-Lot} #{BT-7532-Lot}: ${format-number(BT-752-Lot-ThresholdNumber, '###,##0.###,###,###')} // Number Threshold
 			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-51-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.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
@@ -191,7 +189,7 @@
 				{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} #{field|name|BT-769-Lot}: #{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-751-Lot[BT-75-Lot is present]} #{field|name|BT-75-Lot}: ${BT-75-Lot} // Financial Guarantee Description
 				{BT-1311(d)-Lot} #{field|name|BT-1311(d)-Lot}: ${BT-1311(d)-Lot} ${BT-1311(t)-Lot} // Deadline for receipt of requests to participate
 				{BT-131(d)-Lot} #{field|name|BT-131(d)-Lot}: ${BT-131(d)-Lot} ${BT-131(t)-Lot} // Deadline for receipt of tenders
 				{BT-98-Lot} #{field|name|BT-98-Lot}: ${OPA-98-Lot-Number} #{code|name|${concat('duration-unit.', BT-98-Lot/@unitCode)}} // Deadline until which the tender must remain valid
@@ -235,8 +233,8 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // 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
@@ -288,10 +286,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
@@ -305,3 +303,7 @@
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
 		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
 		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
+nformation} // 11.2 Publication information
+		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
+		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
+		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
diff --git a/view-templates/19.efx b/view-templates/19.efx
index 694c25e95..1688ff085 100644
--- a/view-templates/19.efx
+++ b/view-templates/19.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // 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
 		{BT-610-Procedure-Buyer} #{field|name|BT-610-Procedure-Buyer}: #{BT-610-Procedure-Buyer} // Activity Entity
@@ -77,7 +77,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -134,7 +133,6 @@
 				{BT-747-Lot} #{field|name|BT-747-Lot}: #{BT-747-Lot} // Selection Criterion Type
 				{ND-SelectionCriteria[BT-749-Lot is present]} #{field|name|BT-749-Lot}: ${BT-749-Lot} // Selection Criterion Name
 				{ND-SelectionCriteria[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
 		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
@@ -176,7 +174,7 @@
 				{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} #{field|name|BT-769-Lot}: #{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-751-Lot[BT-75-Lot is present]} #{field|name|BT-75-Lot}: ${BT-75-Lot} // Financial Guarantee Description
 				{BT-1311(d)-Lot} #{field|name|BT-1311(d)-Lot}: ${BT-1311(d)-Lot} ${BT-1311(t)-Lot} // Deadline for receipt of requests to participate
 				{BT-131(d)-Lot} #{field|name|BT-131(d)-Lot}: ${BT-131(d)-Lot} ${BT-131(t)-Lot} // Deadline for receipt of tenders
 				{BT-98-Lot} #{field|name|BT-98-Lot}: ${OPA-98-Lot-Number} #{code|name|${concat('duration-unit.', BT-98-Lot/@unitCode)}} // Deadline until which the tender must remain valid
@@ -209,8 +207,8 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // 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
@@ -260,10 +258,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
@@ -277,3 +275,7 @@
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
 		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
 		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
+on information
+		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
+		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
+		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
diff --git a/view-templates/2.efx b/view-templates/2.efx
index 5208bfd6d..3b1466b9c 100644
--- a/view-templates/2.efx
+++ b/view-templates/2.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{BT-10-Procedure-Buyer} #{field|name|BT-10-Procedure-Buyer}: #value // Activity of the contracting authority
 		{BT-610-Procedure-Buyer} #{field|name|BT-610-Procedure-Buyer}: #{BT-610-Procedure-Buyer} // Activity Entity
 2 {ND-Root} #{auxiliary|text|procedure} // 2. Procedure
@@ -70,10 +70,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
diff --git a/view-templates/20.efx b/view-templates/20.efx
index db3596946..533e03c1a 100644
--- a/view-templates/20.efx
+++ b/view-templates/20.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{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
@@ -79,7 +79,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -136,13 +135,12 @@
 				{BT-747-Lot} #{field|name|BT-747-Lot}: #{BT-747-Lot} // Selection Criterion Type
 				{ND-SelectionCriteria[BT-749-Lot is present]} #{field|name|BT-749-Lot}: ${BT-749-Lot} // Selection Criterion Name
 				{ND-SelectionCriteria[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
 				{BT-7531-Lot} #{BT-7531-Lot}: ${format-number(BT-752-Lot-WeightNumber, '###,##0.###,###,###')} // Number Weight
 				{BT-7532-Lot} #{BT-7532-Lot}: ${format-number(BT-752-Lot-ThresholdNumber, '###,##0.###,###,###')} // Number Threshold
 			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-51-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
@@ -187,7 +185,7 @@
 				{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} #{field|name|BT-769-Lot}: #{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-751-Lot[BT-75-Lot is present]} #{field|name|BT-75-Lot}: ${BT-75-Lot} // Financial Guarantee Description
 				{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
 				{BT-1311(d)-Lot} #{field|name|BT-1311(d)-Lot}: ${BT-1311(d)-Lot} ${BT-1311(t)-Lot} // Deadline for receipt of requests to participate
 				{BT-131(d)-Lot} #{field|name|BT-131(d)-Lot}: ${BT-131(d)-Lot} ${BT-131(t)-Lot} // Deadline for receipt of tenders
@@ -232,8 +230,8 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // 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
@@ -285,10 +283,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
@@ -302,3 +300,7 @@
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
 		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
 		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
+rmation} // 11.2 Publication information
+		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
+		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
+		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
diff --git a/view-templates/21.efx b/view-templates/21.efx
index 3c8d2a6a7..09cf584d6 100644
--- a/view-templates/21.efx
+++ b/view-templates/21.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{BT-10-Procedure-Buyer} #{field|name|BT-10-Procedure-Buyer}: #value // Activity of the contracting authority
 		{BT-610-Procedure-Buyer} #{field|name|BT-610-Procedure-Buyer}: #{BT-610-Procedure-Buyer} // Activity Entity
 2 {ND-Root} #{auxiliary|text|procedure} // 2. Procedure
@@ -80,7 +80,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -137,13 +136,12 @@
 				{BT-747-Lot} #{field|name|BT-747-Lot}: #{BT-747-Lot} // Selection Criterion Type
 				{ND-SelectionCriteria[BT-749-Lot is present]} #{field|name|BT-749-Lot}: ${BT-749-Lot} // Selection Criterion Name
 				{ND-SelectionCriteria[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
 				{BT-7531-Lot} #{BT-7531-Lot}: ${format-number(BT-752-Lot-WeightNumber, '###,##0.###,###,###')} // Number Weight
 				{BT-7532-Lot} #{BT-7532-Lot}: ${format-number(BT-752-Lot-ThresholdNumber, '###,##0.###,###,###')} // Number Threshold
 			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-51-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.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
@@ -187,7 +185,7 @@
 				{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} #{field|name|BT-769-Lot}: #{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-751-Lot[BT-75-Lot is present]} #{field|name|BT-75-Lot}: ${BT-75-Lot} // Financial Guarantee Description
 				{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
 				{BT-1311(d)-Lot} #{field|name|BT-1311(d)-Lot}: ${BT-1311(d)-Lot} ${BT-1311(t)-Lot} // Deadline for receipt of requests to participate
 				{BT-131(d)-Lot} #{field|name|BT-131(d)-Lot}: ${BT-131(d)-Lot} ${BT-131(t)-Lot} // Deadline for receipt of tenders
@@ -232,8 +230,8 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // 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
@@ -285,10 +283,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
@@ -302,3 +300,7 @@
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
 		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
 		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
+rmation} // 11.2 Publication information
+		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
+		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
+		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
diff --git a/view-templates/22.efx b/view-templates/22.efx
index b2267bc42..0262b12f8 100644
--- a/view-templates/22.efx
+++ b/view-templates/22.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 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
@@ -77,7 +77,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -134,13 +133,12 @@
 				{BT-747-Lot} #{field|name|BT-747-Lot}: #{BT-747-Lot} // Selection Criterion Type
 				{ND-SelectionCriteria[BT-749-Lot is present]} #{field|name|BT-749-Lot}: ${BT-749-Lot} // Selection Criterion Name
 				{ND-SelectionCriteria[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
 				{BT-7531-Lot} #{BT-7531-Lot}: ${format-number(BT-752-Lot-WeightNumber, '###,##0.###,###,###')} // Number Weight
 				{BT-7532-Lot} #{BT-7532-Lot}: ${format-number(BT-752-Lot-ThresholdNumber, '###,##0.###,###,###')} // Number Threshold
 			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-51-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.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
@@ -184,7 +182,7 @@
 				{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} #{field|name|BT-769-Lot}: #{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-751-Lot[BT-75-Lot is present]} #{field|name|BT-75-Lot}: ${BT-75-Lot} // Financial Guarantee Description
 				{BT-1311(d)-Lot} #{field|name|BT-1311(d)-Lot}: ${BT-1311(d)-Lot} ${BT-1311(t)-Lot} // Deadline for receipt of requests to participate
 				{BT-131(d)-Lot} #{field|name|BT-131(d)-Lot}: ${BT-131(d)-Lot} ${BT-131(t)-Lot} // Deadline for receipt of tenders
 				{BT-98-Lot} #{field|name|BT-98-Lot}: ${OPA-98-Lot-Number} #{code|name|${concat('duration-unit.', BT-98-Lot/@unitCode)}} // Deadline until which the tender must remain valid
@@ -220,8 +218,8 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // 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
@@ -273,10 +271,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
@@ -290,3 +288,7 @@
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
 		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
 		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
+11.2 Publication information
+		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
+		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
+		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
diff --git a/view-templates/23.efx b/view-templates/23.efx
index 731560bdc..53f90ccb4 100644
--- a/view-templates/23.efx
+++ b/view-templates/23.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{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
@@ -72,7 +72,6 @@
 			{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
@@ -109,13 +108,12 @@
 				{BT-747-Lot} #{field|name|BT-747-Lot}: #{BT-747-Lot} // Selection Criterion Type
 				{ND-SelectionCriteria[BT-749-Lot is present]} #{field|name|BT-749-Lot}: ${BT-749-Lot} // Selection Criterion Name
 				{ND-SelectionCriteria[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
 				{BT-7531-Lot} #{BT-7531-Lot}: ${format-number(BT-752-Lot-WeightNumber, '###,##0.###,###,###')} // Number Weight
 				{BT-7532-Lot} #{BT-7532-Lot}: ${format-number(BT-752-Lot-ThresholdNumber, '###,##0.###,###,###')} // Number Threshold
 			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-51-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.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
@@ -176,8 +174,8 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // 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
@@ -229,10 +227,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
@@ -246,3 +244,6 @@
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
 		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
 		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
+ield|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
+		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
+		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
diff --git a/view-templates/24.efx b/view-templates/24.efx
index f4dc66548..10e0b2b3f 100644
--- a/view-templates/24.efx
+++ b/view-templates/24.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{BT-10-Procedure-Buyer} #{field|name|BT-10-Procedure-Buyer}: #value // Activity of the contracting authority
 		{BT-610-Procedure-Buyer} #{field|name|BT-610-Procedure-Buyer}: #{BT-610-Procedure-Buyer} // Activity Entity
 2 {ND-Root} #{auxiliary|text|procedure} // 2. Procedure
@@ -73,7 +73,6 @@
 			{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
@@ -110,13 +109,12 @@
 				{BT-747-Lot} #{field|name|BT-747-Lot}: #{BT-747-Lot} // Selection Criterion Type
 				{ND-SelectionCriteria[BT-749-Lot is present]} #{field|name|BT-749-Lot}: ${BT-749-Lot} // Selection Criterion Name
 				{ND-SelectionCriteria[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
 				{BT-7531-Lot} #{BT-7531-Lot}: ${format-number(BT-752-Lot-WeightNumber, '###,##0.###,###,###')} // Number Weight
 				{BT-7532-Lot} #{BT-7532-Lot}: ${format-number(BT-752-Lot-ThresholdNumber, '###,##0.###,###,###')} // Number Threshold
 			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-51-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.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
@@ -177,8 +175,8 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // 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
@@ -230,10 +228,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
@@ -247,3 +245,6 @@
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
 		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
 		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
+field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
+		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
+		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
diff --git a/view-templates/25.efx b/view-templates/25.efx
index e1f088645..83f422747 100644
--- a/view-templates/25.efx
+++ b/view-templates/25.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{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
@@ -13,6 +13,9 @@
 		{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
+			{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-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
@@ -59,41 +62,65 @@
 		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
+					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
+					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
+					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-539-LotsGroup == 'unpublished' ]} #{field|name|BT-539-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Type (unpublished)
 					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
 					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
 					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup != 'unpublished']} #{field|name|BT-734-LotsGroup}: ${BT-734-LotsGroup} // Criterion Name
+					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup == 'unpublished']} #{field|name|BT-734-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup != 'unpublished']} #{field|name|BT-540-LotsGroup}: ${BT-540-LotsGroup} // Award Criterion Description
+					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup == 'unpublished']} #{field|name|BT-540-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup != 'unpublished']} #{BT-5421-LotsGroup}: ${format-number(BT-541-LotsGroup-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup == 'unpublished']} ${BT-5421-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Weight (unpublished) / Award Criterion Number
 					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup != 'unpublished']} #{BT-5422-LotsGroup}: ${format-number(BT-541-LotsGroup-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup == 'unpublished']} ${BT-5422-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup != 'unpublished']} #{BT-5423-LotsGroup}: ${format-number(BT-541-LotsGroup-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup == 'unpublished']} ${BT-5423-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup != 'unpublished']} #{field|name|BT-543-LotsGroup}: ${BT-543-LotsGroup} // Award Criteria Complicated
+				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup == 'unpublished']} #{field|name|BT-543-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup != 'unpublished']} #{field|name|BT-733-LotsGroup}: ${BT-733-LotsGroup} // Award Criteria Order Justification
+				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-198(BT-733)-LotsGroup is present]} #{field|name|BT-198(BT-733)-LotsGroup}: ${BT-198(BT-733)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup == 'unpublished']} #{field|name|BT-733-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Order Justification (unpublished)
 				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
@@ -107,7 +134,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -148,41 +174,65 @@
 		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
+					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
+					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
+					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-539-Lot == 'unpublished']} #{field|name|BT-539-Lot}: #{auxiliary|text|unpublished} // Type (unpublished)
 					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
 					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
 					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot != 'unpublished']} #{field|name|BT-734-Lot}: ${BT-734-Lot} // Criterion Name
+					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot == 'unpublished']} #{field|name|BT-734-Lot}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot != 'unpublished']} #{field|name|BT-540-Lot}: ${BT-540-Lot} // Award Criterion Description
+					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot == 'unpublished']} #{field|name|BT-540-Lot}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot != 'unpublished']} #{BT-5421-Lot}: ${format-number(BT-541-Lot-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Weight / Award Criterion Number (unpublished)
 					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot != 'unpublished']} #{BT-5422-Lot}: ${format-number(BT-541-Lot-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot != 'unpublished']} #{BT-5423-Lot}: ${format-number(BT-541-Lot-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot != 'unpublished']} #{field|name|BT-543-Lot}: ${BT-543-Lot} // Award Criteria Complicated
+				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot == 'unpublished']} #{field|name|BT-543-Lot}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot != 'unpublished']} #{field|name|BT-733-Lot}: ${BT-733-Lot} // Justification for not indicating the weighing of the award criteria
+				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriteria[BT-198(BT-733)-Lot is present]} #{field|name|BT-198(BT-733)-Lot}: ${BT-198(BT-733)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot == 'unpublished']} #{field|name|BT-733-Lot}: #{auxiliary|text|unpublished} // Justification for not indicating the weighing of the award criteria (unpublished)
 				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
@@ -207,32 +257,50 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // eSender
 6 {ND-NoticeResult} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-161-NoticeResult/@currencyID)}} // Notice Value (Value of all contracts awarded in this procedure)
+		{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-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 {BT-118-NoticeResult[BT-118-NoticeResult != -1]} #{field|name|BT-118-NoticeResult}: ${format-number(BT-118-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-118-NoticeResult/@currencyID)}} // The maximum value of the framework agreement(s) in this notice
+		{ND-NoticeMaximumValueUnpublish} #{field|name|BT-197(BT-118)-NoticeResult}: #{BT-197(BT-118)-NoticeResult} // Unpublished Justification Code
+		{ND-NoticeMaximumValueUnpublish[BT-196(BT-118)-NoticeResult is present]} #{field|name|BT-196(BT-118)-NoticeResult}: ${BT-196(BT-118)-NoticeResult} // Unpublished Justification Description
+		{ND-NoticeMaximumValueUnpublish[BT-198(BT-118)-NoticeResult is present]} #{field|name|BT-198(BT-118)-NoticeResult}: ${BT-198(BT-118)-NoticeResult} // Unpublished Access Date
 	0 {BT-118-NoticeResult[BT-118-NoticeResult == -1]} #{field|name|BT-118-NoticeResult}: #{auxiliary|text|unpublished} // The maximum value of the framework agreement(s) in this notice (unpublished)
 		{ND-NoticeMaximumValueUnpublish} #{field|name|BT-197(BT-118)-NoticeResult}: #{BT-197(BT-118)-NoticeResult} // Unpublished Justification Code
 		{ND-NoticeMaximumValueUnpublish[BT-196(BT-118)-NoticeResult is present]} #{field|name|BT-196(BT-118)-NoticeResult}: ${BT-196(BT-118)-NoticeResult} // Unpublished Justification Description
 		{ND-NoticeMaximumValueUnpublish[BT-198(BT-118)-NoticeResult is present]} #{field|name|BT-198(BT-118)-NoticeResult}: ${BT-198(BT-118)-NoticeResult} // Unpublished Access Date
 	0 {BT-1118-NoticeResult[BT-1118-NoticeResult != -1]} #{field|name|BT-1118-NoticeResult}: ${format-number(BT-1118-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-1118-NoticeResult/@currencyID)}} // The approximate value of the framework agreements in this notice
+		{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 {BT-1118-NoticeResult[BT-1118-NoticeResult == -1]} #{field|name|BT-1118-NoticeResult}: #{auxiliary|text|unpublished} // The approximate value of the framework agreements in this notice (unpublished)
 		{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
+		{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
+		{ND-GroupMaximalValueIdentifierUnpublish[BT-198(BT-556)-NoticeResult is present]} #{field|name|BT-198(BT-556)-NoticeResult}: ${BT-198(BT-556)-NoticeResult} // Unpublished Access Date
 		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.##')} #{code|name|${concat('currency.', BT-156-NoticeResult/@currencyID)}} // Maximum value of the framework agreements in this group of lots
+			{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-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.##')} #{code|name|${concat('currency.', BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Re-estimated value of the framework agreements within a group of lots
+			{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 {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
@@ -243,27 +311,42 @@
 		{ND-GroupMaximalValueIdentifierUnpublish[BT-198(BT-556)-NoticeResult is present]} #{field|name|BT-198(BT-556)-NoticeResult}: ${BT-198(BT-556)-NoticeResult} // Unpublished Access Date
 		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.##')} #{code|name|${concat('currency.', BT-156-NoticeResult[BT-156-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Maximum value of the framework agreements in this group of lots
+			{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-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.##')} #{code|name|${concat('currency.', BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Re-estimated value of the framework agreements within a group of lots
+			{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 {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-DirectAward} #{auxiliary|text|direct-award}: // Direct award
 		0 {BT-136-Procedure[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
+			{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
 		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
 		0 {ND-DirectAward[BT-135-Procedure != 'unpublished']} #{field|name|BT-135-Procedure}: ${BT-135-Procedure} // Other justification
+			{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-135-Procedure == 'unpublished']} #{field|name|BT-135-Procedure}: #{auxiliary|text|unpublished} // Other justification (unpublished)
 			{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 {BT-1252-Procedure[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
+			{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
 		0 {BT-1252-Procedure[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
@@ -271,63 +354,93 @@
 	1 {ND-LotResult} #{field|name|BT-13713-LotResult}: ${BT-13713-LotResult} // 6.1 Result Lot Identifier (LOT-XXXX)
 		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.##')} #{code|name|${concat('currency.', BT-709-LotResult/@currencyID)}} // Framework Maximum Value
+				{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-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.##')} #{code|name|${concat('currency.', BT-660-LotResult/@currencyID)}} // Framework Re-estimated Value
+				{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
 			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
+		2 {ND-LotResult[BT-02-notice in ('veat','can-modif') or ((BT-142-LotResult in ('selec-w','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:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-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:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the 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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $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 == $tpa1]) return $orgid1) == 1]} #{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 == $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 $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[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the tendering party for this Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $org2} // Names of non-leaders for this Winner
+				{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 == $tpa1]) return $orgid1) == 1]} #{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 == $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:$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:$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:$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 $orgname2} // Subcontractor names
+				{OPT-320-LotResult[count(for text:$tender1 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 == $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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-720-Tender[BT-720-Tender[OPT-321-Tender == $tender3] != -1]/@currencyID )}} // Value of the tender
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-1711-Tender is present] == $tender1]) > 0]} #{field|name|BT-1711-Tender}: #{code|name|${if (some indicator:$tranked in (for text:$tender2 in OPT-320-LotResult return BT-1711-Tender[OPT-321-Tender == $tender2]) satisfies $tranked == TRUE) then 'indicator.true' else 'indicator.false'}} // 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('applicability.',BT-773-Tender[OPT-321-Tender == $tender2])}} // Subcontracting
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-730-Tender is present and (BT-195(BT-730)-Tender is not present or BT-730-Tender == TRUE)] == $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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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 OPT-321-Tender[OPT-321-Tender[BT-195(BT-730)-Tender is present and BT-730-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID)}} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{auxiliary|text|unpublished} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-731-Tender is present and (BT-195(BT-731)-Tender is not present or BT-731-Tender == TRUE)] == $tender1]) > 0)]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk == 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-195(BT-731)-Tender is present and BT-731-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-555-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-555-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] == -1]) > 0]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // 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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies ($desc1 != '' and $desc1 != 'unpublished')]} #{field|name|BT-554-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-554-Tender[OPT-321-Tender == $tender2] return $desc2} // Subcontracting Description
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-554)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
@@ -346,12 +459,21 @@
 		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
+					{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 {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
+				{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 {BT-635-LotResult[BT-635-LotResult != -1]} #{field|name|BT-635-LotResult}: ${BT-635-LotResult} // 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 {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
@@ -361,13 +483,22 @@
 				{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
+					{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-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
+					{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
+						{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 {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
@@ -377,17 +508,26 @@
 					{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
+						{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 {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 {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.##')} #{code|name|${concat('currency.', BT-710-LotResult[BT-710-LotResult/@currencyID != 'unpublished']/@currencyID)}} // Tender Value Lowest
+					{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-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.##')} #{code|name|${concat('currency.', BT-711-LotResult[BT-711-LotResult/@currencyID != 'unpublished']/@currencyID)}} // Tender Value highest
+					{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 {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
@@ -397,11 +537,6 @@
 					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
 	1 {ND-LotTender[OPT-322-LotResult is not present]} #{field|name|BT-13713-LotResult}: ${BT-13714-Tender} // 6.1 Result Lot Identifier (LOT-XXXX) DAP/VEAT notices
-		0 {BT-13714-Tender[count(for text:$tender1 in BT-13714-Tender return BT-13713-LotResult[BT-13713-LotResult[BT-709-LotResult is present or BT-660-LotResult is present] == $tender1]) > 0] } #{auxiliary|text|framework-agreement} // --- TODO --- 0 {ND-LotResultFAValues} #{auxiliary|text|framework-agreement}: // Framework agreement
-			{BT-13714-Tender[count(for text:$tender1 in BT-13714-Tender return number:BT-709-LotResult[BT-709-LotResult[BT-13713-LotResult == $tender1] != -1]) > 0] } #{field|name|BT-709-LotResult}: ${for text:$tender2 in BT-13714-Tender, number:$value in BT-709-LotResult[BT-13713-LotResult == $tender2] return format-number($value, '###,##0.##')} // Framework Maximum Value
-			{BT-13714-Tender[count(for text:$tender1 in BT-13714-Tender return number:BT-709-LotResult[BT-709-LotResult[BT-13713-LotResult == $tender1] == -1]) > 0] } #{field|name|BT-709-LotResult}: #{auxiliary|text|unpublished} // Framework Maximum Value (unpublished)
-			{BT-13714-Tender[count(for text:$tender1 in BT-13714-Tender return number:BT-660-LotResult[BT-660-LotResult[BT-13713-LotResult == $tender1] != -1]) > 0] } #{field|name|BT-660-LotResult}: ${for text:$tender2 in BT-13714-Tender, number:$value in BT-660-LotResult[BT-13713-LotResult == $tender2] return format-number($value, '###,##0.##')} // Framework Re-estimated Value
-			{BT-13714-Tender[count(for text:$tender1 in BT-13714-Tender return number:BT-660-LotResult[BT-660-LotResult[BT-13713-LotResult == $tender1] == -1]) > 0] } #{field|name|BT-660-LotResult}: #{auxiliary|text|unpublished} // Framework Re-estimated Value (unpublished)
 		2 {ND-LotTender} #{auxiliary|text|winner-info} // 6.1.2. Winning tenders
 			0 {ND-LotTender} #{auxiliary|text|winner}: // Winner
 				{ND-LotTender[count(for text:$tpa1 in OPT-310-Tender, text:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-Tenderer}: ${for text:$tpa2 in OPT-310-Tender, text:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the tendering party for this Winner
@@ -414,21 +549,70 @@
 				{ND-LotTender} #{field|name|BT-3201-Tender}: ${BT-3201-Tender} // Tender identifier
 				{ND-LotTender} #{field|name|BT-13714-Tender}: ${BT-13714-Tender} // Identifier of lot or group of lots
 				0 {ND-LotTender[BT-720-Tender != -1]} #{field|name|BT-720-Tender}: ${format-number(BT-720-Tender, '###,##0.##')} #{code|name|${concat('currency.', BT-720-Tender[BT-720-Tender != -1]/@currencyID)}} // Value of the tender
+					{BT-197(BT-720)-Tender} #{field|name|BT-197(BT-720)-Tender}: #{BT-197(BT-720)-Tender} // Unpublished Justification Code
+					{ND-WinningTenderValueUnpublish[BT-196(BT-720)-Tender is present]} #{field|name|BT-196(BT-720)-Tender}: ${BT-196(BT-720)-Tender} // Unpublished Justification Description
+					{BT-198(BT-720)-Tender} #{field|name|BT-198(BT-720)-Tender}: ${BT-198(BT-720)-Tender} // Unpublished Access Date
 				0 {ND-LotTender[BT-720-Tender == -1]} #{field|name|BT-720-Tender}: #{auxiliary|text|unpublished} // Value of the tender (unpublished)
+					{BT-197(BT-720)-Tender} #{field|name|BT-197(BT-720)-Tender}: #{BT-197(BT-720)-Tender} // Unpublished Justification Code
+					{ND-WinningTenderValueUnpublish[BT-196(BT-720)-Tender is present]} #{field|name|BT-196(BT-720)-Tender}: ${BT-196(BT-720)-Tender} // Unpublished Justification Description
+					{BT-198(BT-720)-Tender} #{field|name|BT-198(BT-720)-Tender}: ${BT-198(BT-720)-Tender} // Unpublished Access Date
 				0 {ND-LotTender[BT-1711-Tender == TRUE]} #{field|name|BT-1711-Tender} // Tender Ranked
 				0 {ND-LotTender[BT-171-Tender != -1]} #{field|name|BT-171-Tender}: ${string(BT-171-Tender)} // Tender Rank
+					{BT-197(BT-171)-Tender} #{field|name|BT-197(BT-171)-Tender}: #{BT-197(BT-171)-Tender} // Unpublished Justification Code
+					{ND-TenderRankUnpublish[BT-196(BT-171)-Tender is present]} #{field|name|BT-196(BT-171)-Tender}: ${BT-196(BT-171)-Tender} // Unpublished Justification Description
+					{BT-198(BT-171)-Tender} #{field|name|BT-198(BT-171)-Tender}: ${BT-198(BT-171)-Tender} // Unpublished Access Date
 				0 {ND-LotTender[BT-171-Tender == -1]} #{field|name|BT-171-Tender}: #{auxiliary|text|unpublished} // Tender Rank (unpublished)
-				0 {ND-LotTender[BT-773-Tender != 'unpublished']} #{field|name|BT-773-Tender}: #{code|name|${concat('applicability.',BT-773-Tender)}}  // Subcontracting  
-				0 {ND-LotTender[BT-773-Tender == 'unpublished']} #{field|name|BT-773-Tender}: #{auxiliary|text|unpublished} // Subcontracting (unpublished)
-				0 {ND-LotTender[BT-195(BT-730)-Tender is not present]} #{field|name|BT-730-Tender}: #{code|name|${if (BT-730-Tender == 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 {ND-LotTender[BT-553-Tender != -1]} #{field|name|BT-553-Tender}: ${format-number(BT-553-Tender, '###,##0.##')} #{code|name|${concat('currency.', BT-553-Tender/@currencyID)}} // Estimated value of the part of the contract that the contractor will subcontract to third parties
-				0 {ND-LotTender[BT-553-Tender == -1]} #{field|name|BT-553-Tender}: #{auxiliary|text|unpublished} // Estimated value of the part of the contract that the contractor will subcontract to third parties (unpublished)
-				0 {ND-LotTender[BT-195(BT-731)-Tender is not present]} #{field|name|BT-731-Tender}: #{code|name|${if (BT-731-Tender == 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 {ND-LotTender[BT-195(BT-731)-Tender is present]} #{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)
-				0 {ND-LotTender[BT-555-Tender != -1]} #{field|name|BT-555-Tender}: ${format-number(BT-555-Tender, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
-				0 {ND-LotTender[BT-555-Tender == -1]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
-				0 {ND-LotTender[(BT-554-Tender != '' and BT-554-Tender != 'unpublished')]} #{field|name|BT-554-Tender}: ${BT-554-Tender} // Subcontracting Description
-				0 {ND-LotTender[BT-554-Tender == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
+					{BT-197(BT-171)-Tender} #{field|name|BT-197(BT-171)-Tender}: #{BT-197(BT-171)-Tender} // Unpublished Justification Code
+					{ND-TenderRankUnpublish[BT-196(BT-171)-Tender is present]} #{field|name|BT-196(BT-171)-Tender}: ${BT-196(BT-171)-Tender} // Unpublished Justification Description
+					{BT-198(BT-171)-Tender} #{field|name|BT-198(BT-171)-Tender}: ${BT-198(BT-171)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-773-Tender != 'unpublished']} #{field|name|BT-773-Tender}: #{code|name|${concat('applicability.',BT-773-Tender)}}  // Subcontracting  
+					{BT-197(BT-773)-Tender} #{field|name|BT-197(BT-773)-Tender}: #{BT-197(BT-773)-Tender} // Unpublished Justification Code
+					{BT-773-Tender[BT-196(BT-773)-Tender is present]} #{field|name|BT-196(BT-773)-Tender}: ${BT-196(BT-773)-Tender} // Unpublished Justification Description
+					{BT-198(BT-773)-Tender} #{field|name|BT-198(BT-773)-Tender}: ${BT-198(BT-773)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-773-Tender == 'unpublished']} #{field|name|BT-773-Tender}: #{auxiliary|text|unpublished} // Subcontracting (unpublished)
+					{BT-197(BT-773)-Tender} #{field|name|BT-197(BT-773)-Tender}: #{BT-197(BT-773)-Tender} // Unpublished Justification Code
+					{BT-773-Tender[BT-196(BT-773)-Tender is present]} #{field|name|BT-196(BT-773)-Tender}: ${BT-196(BT-773)-Tender} // Unpublished Justification Description
+					{BT-198(BT-773)-Tender} #{field|name|BT-198(BT-773)-Tender}: ${BT-198(BT-773)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-730-Tender is present and (BT-195(BT-730)-Tender is not present or BT-730-Tender == TRUE)]} #{field|name|BT-730-Tender}: #{code|name|${if (BT-730-Tender == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
+					{BT-197(BT-730)-Tender} #{field|name|BT-197(BT-730)-Tender}: #{BT-197(BT-730)-Tender} // Unpublished Justification Code
+					{BT-730-Tender[BT-196(BT-730)-Tender is present]} #{field|name|BT-196(BT-730)-Tender}: ${BT-196(BT-730)-Tender} // Unpublished Justification Description
+					{BT-198(BT-730)-Tender} #{field|name|BT-198(BT-730)-Tender}: ${BT-198(BT-730)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-195(BT-730)-Tender is present and BT-730-Tender == FALSE]} #{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)
+					{BT-197(BT-730)-Tender} #{field|name|BT-197(BT-730)-Tender}: #{BT-197(BT-730)-Tender} // Unpublished Justification Code
+					{BT-730-Tender[BT-196(BT-730)-Tender is present]} #{field|name|BT-196(BT-730)-Tender}: ${BT-196(BT-730)-Tender} // Unpublished Justification Description
+					{BT-198(BT-730)-Tender} #{field|name|BT-198(BT-730)-Tender}: ${BT-198(BT-730)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-553-Tender != -1]} #{field|name|BT-553-Tender}: ${format-number(BT-553-Tender, '###,##0.##')} #{code|name|${concat('currency.', BT-553-Tender/@currencyID)}} // Estimated value of the part of the contract that the contractor will subcontract to third parties
+					{BT-197(BT-553)-Tender} #{field|name|BT-197(BT-553)-Tender}: #{BT-197(BT-553)-Tender} // Unpublished Justification Code
+					{BT-553-Tender[BT-196(BT-553)-Tender is present]} #{field|name|BT-196(BT-553)-Tender}: ${BT-196(BT-553)-Tender} // Unpublished Justification Description
+					{BT-198(BT-553)-Tender} #{field|name|BT-198(BT-553)-Tender}: ${BT-198(BT-553)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-553-Tender == -1]} #{field|name|BT-553-Tender}: #{auxiliary|text|unpublished} // Estimated value of the part of the contract that the contractor will subcontract to third parties (unpublished)
+					{BT-197(BT-553)-Tender} #{field|name|BT-197(BT-553)-Tender}: #{BT-197(BT-553)-Tender} // Unpublished Justification Code
+					{BT-553-Tender[BT-196(BT-553)-Tender is present]} #{field|name|BT-196(BT-553)-Tender}: ${BT-196(BT-553)-Tender} // Unpublished Justification Description
+					{BT-198(BT-553)-Tender} #{field|name|BT-198(BT-553)-Tender}: ${BT-198(BT-553)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-731-Tender is present and (BT-195(BT-731)-Tender is not present or BT-731-Tender == TRUE)]} #{field|name|BT-731-Tender}: #{code|name|${if (BT-731-Tender == 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
+					{BT-197(BT-731)-Tender} #{field|name|BT-197(BT-731)-Tender}: #{BT-197(BT-731)-Tender} // Unpublished Justification Code
+					{BT-731-Tender[BT-196(BT-731)-Tender is present]} #{field|name|BT-196(BT-731)-Tender}: ${BT-196(BT-731)-Tender} // Unpublished Justification Description
+					{BT-198(BT-731)-Tender} #{field|name|BT-198(BT-731)-Tender}: ${BT-198(BT-731)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-195(BT-731)-Tender is present and BT-731-Tender == FALSE]} #{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)
+					{BT-197(BT-731)-Tender} #{field|name|BT-197(BT-731)-Tender}: #{BT-197(BT-731)-Tender} // Unpublished Justification Code
+					{BT-731-Tender[BT-196(BT-731)-Tender is present]} #{field|name|BT-196(BT-731)-Tender}: ${BT-196(BT-731)-Tender} // Unpublished Justification Description
+					{BT-198(BT-731)-Tender} #{field|name|BT-198(BT-731)-Tender}: ${BT-198(BT-731)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-555-Tender != -1]} #{field|name|BT-555-Tender}: ${format-number(BT-555-Tender, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+					{BT-197(BT-555)-Tender} #{field|name|BT-197(BT-555)-Tender}: #{BT-197(BT-555)-Tender} // Unpublished Justification Code
+					{BT-555-Tender[BT-196(BT-555)-Tender is present]} #{field|name|BT-196(BT-555)-Tender}: ${BT-196(BT-555)-Tender} // Unpublished Justification Description
+					{BT-198(BT-555)-Tender} #{field|name|BT-198(BT-555)-Tender}: ${BT-198(BT-555)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-555-Tender == -1]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
+					{BT-197(BT-555)-Tender} #{field|name|BT-197(BT-555)-Tender}: #{BT-197(BT-555)-Tender} // Unpublished Justification Code
+					{BT-555-Tender[BT-196(BT-555)-Tender is present]} #{field|name|BT-196(BT-555)-Tender}: ${BT-196(BT-555)-Tender} // Unpublished Justification Description
+					{BT-198(BT-555)-Tender} #{field|name|BT-198(BT-555)-Tender}: ${BT-198(BT-555)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[(BT-554-Tender != '' and BT-554-Tender != 'unpublished')]} #{field|name|BT-554-Tender}: ${BT-554-Tender} // Subcontracting Description
+					{BT-197(BT-554)-Tender} #{field|name|BT-197(BT-554)-Tender}: #{BT-197(BT-554)-Tender} // Unpublished Justification Code
+					{ND-SubcontractedContract[BT-196(BT-554)-Tender is present]} #{field|name|BT-196(BT-554)-Tender}: ${BT-196(BT-554)-Tender} // Unpublished Justification Description
+					{BT-198(BT-554)-Tender} #{field|name|BT-198(BT-554)-Tender}: ${BT-198(BT-554)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-554-Tender == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
+					{BT-197(BT-554)-Tender} #{field|name|BT-197(BT-554)-Tender}: #{BT-197(BT-554)-Tender} // Unpublished Justification Code
+					{ND-SubcontractedContract[BT-196(BT-554)-Tender is present]} #{field|name|BT-196(BT-554)-Tender}: ${BT-196(BT-554)-Tender} // Unpublished Justification Description
+					{BT-198(BT-554)-Tender} #{field|name|BT-198(BT-554)-Tender}: ${BT-198(BT-554)-Tender} // Unpublished Access Date
 				0 {OPT-321-Tender} #{auxiliary|text|contract-information}: // Contract info for this tender
 					0 {OPT-321-Tender} #{field|name|BT-150-Contract}: ${for text:$tender in OPT-321-Tender return BT-150-Contract[BT-3202-Contract == $tender]} // Contract identifier
 					0 {OPT-321-Tender} #{field|name|BT-721-Contract}: ${for text:$tender in OPT-321-Tender return BT-721-Contract[BT-3202-Contract == $tender]} // Contract title
@@ -508,10 +692,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
diff --git a/view-templates/26.efx b/view-templates/26.efx
index f6bff894c..ffc402cdd 100644
--- a/view-templates/26.efx
+++ b/view-templates/26.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{BT-10-Procedure-Buyer} #{field|name|BT-10-Procedure-Buyer}: #value // Activity of the contracting authority
 		{BT-610-Procedure-Buyer} #{field|name|BT-610-Procedure-Buyer}: #{BT-610-Procedure-Buyer} // Activity Entity
 2 {ND-Root} #{auxiliary|text|procedure} // 2. Procedure
@@ -14,6 +14,9 @@
 		{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
+			{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-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
@@ -60,41 +63,65 @@
 		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
+					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
+					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
+					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-539-LotsGroup == 'unpublished' ]} #{field|name|BT-539-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Type (unpublished)
 					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
 					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
 					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup != 'unpublished']} #{field|name|BT-734-LotsGroup}: ${BT-734-LotsGroup} // Criterion Name
+					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup == 'unpublished']} #{field|name|BT-734-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup != 'unpublished']} #{field|name|BT-540-LotsGroup}: ${BT-540-LotsGroup} // Award Criterion Description
+					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup == 'unpublished']} #{field|name|BT-540-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup != 'unpublished']} #{BT-5421-LotsGroup}: ${format-number(BT-541-LotsGroup-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup == 'unpublished']} ${BT-5421-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Weight (unpublished) / Award Criterion Number
 					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup != 'unpublished']} #{BT-5422-LotsGroup}: ${format-number(BT-541-LotsGroup-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup == 'unpublished']} ${BT-5422-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup != 'unpublished']} #{BT-5423-LotsGroup}: ${format-number(BT-541-LotsGroup-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup == 'unpublished']} ${BT-5423-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup != 'unpublished']} #{field|name|BT-543-LotsGroup}: ${BT-543-LotsGroup} // Award Criteria Complicated
+				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup == 'unpublished']} #{field|name|BT-543-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup != 'unpublished']} #{field|name|BT-733-LotsGroup}: ${BT-733-LotsGroup} // Award Criteria Order Justification
+				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-198(BT-733)-LotsGroup is present]} #{field|name|BT-198(BT-733)-LotsGroup}: ${BT-198(BT-733)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup == 'unpublished']} #{field|name|BT-733-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Order Justification (unpublished)
 				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
@@ -108,7 +135,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -149,41 +175,65 @@
 		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
+					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
+					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
+					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-539-Lot == 'unpublished']} #{field|name|BT-539-Lot}: #{auxiliary|text|unpublished} // Type (unpublished)
 					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
 					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
 					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot != 'unpublished']} #{field|name|BT-734-Lot}: ${BT-734-Lot} // Criterion Name
+					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot == 'unpublished']} #{field|name|BT-734-Lot}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot != 'unpublished']} #{field|name|BT-540-Lot}: ${BT-540-Lot} // Award Criterion Description
+					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot == 'unpublished']} #{field|name|BT-540-Lot}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot != 'unpublished']} #{BT-5421-Lot}: ${format-number(BT-541-Lot-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Weight / Award Criterion Number (unpublished)
 					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot != 'unpublished']} #{BT-5422-Lot}: ${format-number(BT-541-Lot-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot != 'unpublished']} #{BT-5423-Lot}: ${format-number(BT-541-Lot-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot != 'unpublished']} #{field|name|BT-543-Lot}: ${BT-543-Lot} // Award Criteria Complicated
+				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot == 'unpublished']} #{field|name|BT-543-Lot}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot != 'unpublished']} #{field|name|BT-733-Lot}: ${BT-733-Lot} // Justification for not indicating the weighing of the award criteria
+				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriteria[BT-198(BT-733)-Lot is present]} #{field|name|BT-198(BT-733)-Lot}: ${BT-198(BT-733)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot == 'unpublished']} #{field|name|BT-733-Lot}: #{auxiliary|text|unpublished} // Justification for not indicating the weighing of the award criteria (unpublished)
 				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
@@ -208,32 +258,50 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // eSender
 6 {ND-NoticeResult} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-161-NoticeResult/@currencyID)}} // Notice Value (Value of all contracts awarded in this procedure)
+		{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-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 {BT-118-NoticeResult[BT-118-NoticeResult != -1]} #{field|name|BT-118-NoticeResult}: ${format-number(BT-118-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-118-NoticeResult/@currencyID)}} // The maximum value of the framework agreement(s) in this notice
+		{ND-NoticeMaximumValueUnpublish} #{field|name|BT-197(BT-118)-NoticeResult}: #{BT-197(BT-118)-NoticeResult} // Unpublished Justification Code
+		{ND-NoticeMaximumValueUnpublish[BT-196(BT-118)-NoticeResult is present]} #{field|name|BT-196(BT-118)-NoticeResult}: ${BT-196(BT-118)-NoticeResult} // Unpublished Justification Description
+		{ND-NoticeMaximumValueUnpublish[BT-198(BT-118)-NoticeResult is present]} #{field|name|BT-198(BT-118)-NoticeResult}: ${BT-198(BT-118)-NoticeResult} // Unpublished Access Date
 	0 {BT-118-NoticeResult[BT-118-NoticeResult == -1]} #{field|name|BT-118-NoticeResult}: #{auxiliary|text|unpublished} // The maximum value of the framework agreement(s) in this notice (unpublished)
 		{ND-NoticeMaximumValueUnpublish} #{field|name|BT-197(BT-118)-NoticeResult}: #{BT-197(BT-118)-NoticeResult} // Unpublished Justification Code
 		{ND-NoticeMaximumValueUnpublish[BT-196(BT-118)-NoticeResult is present]} #{field|name|BT-196(BT-118)-NoticeResult}: ${BT-196(BT-118)-NoticeResult} // Unpublished Justification Description
 		{ND-NoticeMaximumValueUnpublish[BT-198(BT-118)-NoticeResult is present]} #{field|name|BT-198(BT-118)-NoticeResult}: ${BT-198(BT-118)-NoticeResult} // Unpublished Access Date
 	0 {BT-1118-NoticeResult[BT-1118-NoticeResult != -1]} #{field|name|BT-1118-NoticeResult}: ${format-number(BT-1118-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-1118-NoticeResult/@currencyID)}} // The approximate value of the framework agreements in this notice
+		{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 {BT-1118-NoticeResult[BT-1118-NoticeResult == -1]} #{field|name|BT-1118-NoticeResult}: #{auxiliary|text|unpublished} // The approximate value of the framework agreements in this notice (unpublished)
 		{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
+		{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
+		{ND-GroupMaximalValueIdentifierUnpublish[BT-198(BT-556)-NoticeResult is present]} #{field|name|BT-198(BT-556)-NoticeResult}: ${BT-198(BT-556)-NoticeResult} // Unpublished Access Date
 		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.##')} #{code|name|${concat('currency.', BT-156-NoticeResult/@currencyID)}} // Maximum value of the framework agreements in this group of lots
+			{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-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.##')} #{code|name|${concat('currency.', BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Re-estimated value of the framework agreements within a group of lots
+			{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 {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
@@ -244,27 +312,42 @@
 		{ND-GroupMaximalValueIdentifierUnpublish[BT-198(BT-556)-NoticeResult is present]} #{field|name|BT-198(BT-556)-NoticeResult}: ${BT-198(BT-556)-NoticeResult} // Unpublished Access Date
 		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.##')} #{code|name|${concat('currency.', BT-156-NoticeResult[BT-156-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Maximum value of the framework agreements in this group of lots
+			{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-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.##')} #{code|name|${concat('currency.', BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Re-estimated value of the framework agreements within a group of lots
+			{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 {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-DirectAward} #{auxiliary|text|direct-award}: // Direct award
 		0 {BT-136-Procedure[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
+			{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
 		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
 		0 {ND-DirectAward[BT-135-Procedure != 'unpublished']} #{field|name|BT-135-Procedure}: ${BT-135-Procedure} // Other justification
+			{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-135-Procedure == 'unpublished']} #{field|name|BT-135-Procedure}: #{auxiliary|text|unpublished} // Other justification (unpublished)
 			{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 {BT-1252-Procedure[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
+			{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
 		0 {BT-1252-Procedure[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
@@ -272,63 +355,93 @@
 	1 {ND-LotResult} #{field|name|BT-13713-LotResult}: ${BT-13713-LotResult} // 6.1 Result Lot Identifier (LOT-XXXX)
 		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.##')} #{code|name|${concat('currency.', BT-709-LotResult/@currencyID)}} // Framework Maximum Value
+				{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-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.##')} #{code|name|${concat('currency.', BT-660-LotResult/@currencyID)}} // Framework Re-estimated Value
+				{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
 			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
+		2 {ND-LotResult[BT-02-notice in ('veat','can-modif') or ((BT-142-LotResult in ('selec-w','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:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-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:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the 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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $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 == $tpa1]) return $orgid1) == 1]} #{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 == $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 $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[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the tendering party for this Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $org2} // Names of non-leaders for this Winner
+				{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 == $tpa1]) return $orgid1) == 1]} #{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 == $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:$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:$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:$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 $orgname2} // Subcontractor names
+				{OPT-320-LotResult[count(for text:$tender1 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 == $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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-720-Tender[BT-720-Tender[OPT-321-Tender == $tender3] != -1]/@currencyID )}} // Value of the tender
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-1711-Tender is present] == $tender1]) > 0]} #{field|name|BT-1711-Tender}: #{code|name|${if (some indicator:$tranked in (for text:$tender2 in OPT-320-LotResult return BT-1711-Tender[OPT-321-Tender == $tender2]) satisfies $tranked == TRUE) then 'indicator.true' else 'indicator.false'}} // 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('applicability.',BT-773-Tender[OPT-321-Tender == $tender2])}} // Subcontracting
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-730-Tender is present and (BT-195(BT-730)-Tender is not present or BT-730-Tender == TRUE)] == $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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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 OPT-321-Tender[OPT-321-Tender[BT-195(BT-730)-Tender is present and BT-730-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID)}} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{auxiliary|text|unpublished} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-731-Tender is present and (BT-195(BT-731)-Tender is not present or BT-731-Tender == TRUE)] == $tender1]) > 0)]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk == 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-195(BT-731)-Tender is present and BT-731-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-555-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-555-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] == -1]) > 0]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // 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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies ($desc1 != '' and $desc1 != 'unpublished')]} #{field|name|BT-554-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-554-Tender[OPT-321-Tender == $tender2] return $desc2} // Subcontracting Description
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-554)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
@@ -352,12 +465,21 @@
 		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
+					{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 {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
+				{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 {BT-635-LotResult[BT-635-LotResult != -1]} #{field|name|BT-635-LotResult}: ${BT-635-LotResult} // 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 {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
@@ -367,13 +489,22 @@
 				{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
+					{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-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
+					{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
+						{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 {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
@@ -383,17 +514,26 @@
 					{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
+						{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 {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 {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.##')} #{code|name|${concat('currency.', BT-710-LotResult[BT-710-LotResult/@currencyID != 'unpublished']/@currencyID)}} // Tender Value Lowest
+					{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-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.##')} #{code|name|${concat('currency.', BT-711-LotResult[BT-711-LotResult/@currencyID != 'unpublished']/@currencyID)}} // Tender Value highest
+					{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 {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
@@ -403,11 +543,6 @@
 					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
 	1 {ND-LotTender[OPT-322-LotResult is not present]} #{field|name|BT-13713-LotResult}: ${BT-13714-Tender} // 6.1 Result Lot Identifier (LOT-XXXX) DAP/VEAT notices
-		0 {BT-13714-Tender[count(for text:$tender1 in BT-13714-Tender return BT-13713-LotResult[BT-13713-LotResult[BT-709-LotResult is present or BT-660-LotResult is present] == $tender1]) > 0] } #{auxiliary|text|framework-agreement} // --- TODO --- 0 {ND-LotResultFAValues} #{auxiliary|text|framework-agreement}: // Framework agreement
-			{BT-13714-Tender[count(for text:$tender1 in BT-13714-Tender return number:BT-709-LotResult[BT-709-LotResult[BT-13713-LotResult == $tender1] != -1]) > 0] } #{field|name|BT-709-LotResult}: ${for text:$tender2 in BT-13714-Tender, number:$value in BT-709-LotResult[BT-13713-LotResult == $tender2] return format-number($value, '###,##0.##')} // Framework Maximum Value
-			{BT-13714-Tender[count(for text:$tender1 in BT-13714-Tender return number:BT-709-LotResult[BT-709-LotResult[BT-13713-LotResult == $tender1] == -1]) > 0] } #{field|name|BT-709-LotResult}: #{auxiliary|text|unpublished} // Framework Maximum Value (unpublished)
-			{BT-13714-Tender[count(for text:$tender1 in BT-13714-Tender return number:BT-660-LotResult[BT-660-LotResult[BT-13713-LotResult == $tender1] != -1]) > 0] } #{field|name|BT-660-LotResult}: ${for text:$tender2 in BT-13714-Tender, number:$value in BT-660-LotResult[BT-13713-LotResult == $tender2] return format-number($value, '###,##0.##')} // Framework Re-estimated Value
-			{BT-13714-Tender[count(for text:$tender1 in BT-13714-Tender return number:BT-660-LotResult[BT-660-LotResult[BT-13713-LotResult == $tender1] == -1]) > 0] } #{field|name|BT-660-LotResult}: #{auxiliary|text|unpublished} // Framework Re-estimated Value (unpublished)
 		2 {ND-LotTender} #{auxiliary|text|winner-info} // 6.1.2. Winning tenders
 			0 {ND-LotTender} #{auxiliary|text|winner}: // Winner
 				{ND-LotTender[count(for text:$tpa1 in OPT-310-Tender, text:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-Tenderer}: ${for text:$tpa2 in OPT-310-Tender, text:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the tendering party for this Winner
@@ -420,21 +555,70 @@
 				{ND-LotTender} #{field|name|BT-3201-Tender}: ${BT-3201-Tender} // Tender identifier
 				{ND-LotTender} #{field|name|BT-13714-Tender}: ${BT-13714-Tender} // Identifier of lot or group of lots
 				0 {ND-LotTender[BT-720-Tender != -1]} #{field|name|BT-720-Tender}: ${format-number(BT-720-Tender, '###,##0.##')} #{code|name|${concat('currency.', BT-720-Tender[BT-720-Tender != -1]/@currencyID)}} // Value of the tender
+					{BT-197(BT-720)-Tender} #{field|name|BT-197(BT-720)-Tender}: #{BT-197(BT-720)-Tender} // Unpublished Justification Code
+					{ND-WinningTenderValueUnpublish[BT-196(BT-720)-Tender is present]} #{field|name|BT-196(BT-720)-Tender}: ${BT-196(BT-720)-Tender} // Unpublished Justification Description
+					{BT-198(BT-720)-Tender} #{field|name|BT-198(BT-720)-Tender}: ${BT-198(BT-720)-Tender} // Unpublished Access Date
 				0 {ND-LotTender[BT-720-Tender == -1]} #{field|name|BT-720-Tender}: #{auxiliary|text|unpublished} // Value of the tender (unpublished)
+					{BT-197(BT-720)-Tender} #{field|name|BT-197(BT-720)-Tender}: #{BT-197(BT-720)-Tender} // Unpublished Justification Code
+					{ND-WinningTenderValueUnpublish[BT-196(BT-720)-Tender is present]} #{field|name|BT-196(BT-720)-Tender}: ${BT-196(BT-720)-Tender} // Unpublished Justification Description
+					{BT-198(BT-720)-Tender} #{field|name|BT-198(BT-720)-Tender}: ${BT-198(BT-720)-Tender} // Unpublished Access Date
 				0 {ND-LotTender[BT-1711-Tender == TRUE]} #{field|name|BT-1711-Tender} // Tender Ranked
 				0 {ND-LotTender[BT-171-Tender != -1]} #{field|name|BT-171-Tender}: ${string(BT-171-Tender)} // Tender Rank
+					{BT-197(BT-171)-Tender} #{field|name|BT-197(BT-171)-Tender}: #{BT-197(BT-171)-Tender} // Unpublished Justification Code
+					{ND-TenderRankUnpublish[BT-196(BT-171)-Tender is present]} #{field|name|BT-196(BT-171)-Tender}: ${BT-196(BT-171)-Tender} // Unpublished Justification Description
+					{BT-198(BT-171)-Tender} #{field|name|BT-198(BT-171)-Tender}: ${BT-198(BT-171)-Tender} // Unpublished Access Date
 				0 {ND-LotTender[BT-171-Tender == -1]} #{field|name|BT-171-Tender}: #{auxiliary|text|unpublished} // Tender Rank (unpublished)
-				0 {ND-LotTender[BT-773-Tender != 'unpublished']} #{field|name|BT-773-Tender}: #{code|name|${concat('applicability.',BT-773-Tender)}}  // Subcontracting  
-				0 {ND-LotTender[BT-773-Tender == 'unpublished']} #{field|name|BT-773-Tender}: #{auxiliary|text|unpublished} // Subcontracting (unpublished)
-				0 {ND-LotTender[BT-195(BT-730)-Tender is not present]} #{field|name|BT-730-Tender}: #{code|name|${if (BT-730-Tender == 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 {ND-LotTender[BT-553-Tender != -1]} #{field|name|BT-553-Tender}: ${format-number(BT-553-Tender, '###,##0.##')} #{code|name|${concat('currency.', BT-553-Tender/@currencyID)}} // Estimated value of the part of the contract that the contractor will subcontract to third parties
-				0 {ND-LotTender[BT-553-Tender == -1]} #{field|name|BT-553-Tender}: #{auxiliary|text|unpublished} // Estimated value of the part of the contract that the contractor will subcontract to third parties (unpublished)
-				0 {ND-LotTender[BT-195(BT-731)-Tender is not present]} #{field|name|BT-731-Tender}: #{code|name|${if (BT-731-Tender == 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 {ND-LotTender[BT-195(BT-731)-Tender is present]} #{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)
-				0 {ND-LotTender[BT-555-Tender != -1]} #{field|name|BT-555-Tender}: ${format-number(BT-555-Tender, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
-				0 {ND-LotTender[BT-555-Tender == -1]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
-				0 {ND-LotTender[(BT-554-Tender != '' and BT-554-Tender != 'unpublished')]} #{field|name|BT-554-Tender}: ${BT-554-Tender} // Subcontracting Description
-				0 {ND-LotTender[BT-554-Tender == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
+					{BT-197(BT-171)-Tender} #{field|name|BT-197(BT-171)-Tender}: #{BT-197(BT-171)-Tender} // Unpublished Justification Code
+					{ND-TenderRankUnpublish[BT-196(BT-171)-Tender is present]} #{field|name|BT-196(BT-171)-Tender}: ${BT-196(BT-171)-Tender} // Unpublished Justification Description
+					{BT-198(BT-171)-Tender} #{field|name|BT-198(BT-171)-Tender}: ${BT-198(BT-171)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-773-Tender != 'unpublished']} #{field|name|BT-773-Tender}: #{code|name|${concat('applicability.',BT-773-Tender)}}  // Subcontracting  
+					{BT-197(BT-773)-Tender} #{field|name|BT-197(BT-773)-Tender}: #{BT-197(BT-773)-Tender} // Unpublished Justification Code
+					{BT-773-Tender[BT-196(BT-773)-Tender is present]} #{field|name|BT-196(BT-773)-Tender}: ${BT-196(BT-773)-Tender} // Unpublished Justification Description
+					{BT-198(BT-773)-Tender} #{field|name|BT-198(BT-773)-Tender}: ${BT-198(BT-773)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-773-Tender == 'unpublished']} #{field|name|BT-773-Tender}: #{auxiliary|text|unpublished} // Subcontracting (unpublished)
+					{BT-197(BT-773)-Tender} #{field|name|BT-197(BT-773)-Tender}: #{BT-197(BT-773)-Tender} // Unpublished Justification Code
+					{BT-773-Tender[BT-196(BT-773)-Tender is present]} #{field|name|BT-196(BT-773)-Tender}: ${BT-196(BT-773)-Tender} // Unpublished Justification Description
+					{BT-198(BT-773)-Tender} #{field|name|BT-198(BT-773)-Tender}: ${BT-198(BT-773)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-730-Tender is present and (BT-195(BT-730)-Tender is not present or BT-730-Tender == TRUE)]} #{field|name|BT-730-Tender}: #{code|name|${if (BT-730-Tender == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
+					{BT-197(BT-730)-Tender} #{field|name|BT-197(BT-730)-Tender}: #{BT-197(BT-730)-Tender} // Unpublished Justification Code
+					{BT-730-Tender[BT-196(BT-730)-Tender is present]} #{field|name|BT-196(BT-730)-Tender}: ${BT-196(BT-730)-Tender} // Unpublished Justification Description
+					{BT-198(BT-730)-Tender} #{field|name|BT-198(BT-730)-Tender}: ${BT-198(BT-730)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-195(BT-730)-Tender is present and BT-730-Tender == FALSE]} #{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)
+					{BT-197(BT-730)-Tender} #{field|name|BT-197(BT-730)-Tender}: #{BT-197(BT-730)-Tender} // Unpublished Justification Code
+					{BT-730-Tender[BT-196(BT-730)-Tender is present]} #{field|name|BT-196(BT-730)-Tender}: ${BT-196(BT-730)-Tender} // Unpublished Justification Description
+					{BT-198(BT-730)-Tender} #{field|name|BT-198(BT-730)-Tender}: ${BT-198(BT-730)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-553-Tender != -1]} #{field|name|BT-553-Tender}: ${format-number(BT-553-Tender, '###,##0.##')} #{code|name|${concat('currency.', BT-553-Tender/@currencyID)}} // Estimated value of the part of the contract that the contractor will subcontract to third parties
+					{BT-197(BT-553)-Tender} #{field|name|BT-197(BT-553)-Tender}: #{BT-197(BT-553)-Tender} // Unpublished Justification Code
+					{BT-553-Tender[BT-196(BT-553)-Tender is present]} #{field|name|BT-196(BT-553)-Tender}: ${BT-196(BT-553)-Tender} // Unpublished Justification Description
+					{BT-198(BT-553)-Tender} #{field|name|BT-198(BT-553)-Tender}: ${BT-198(BT-553)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-553-Tender == -1]} #{field|name|BT-553-Tender}: #{auxiliary|text|unpublished} // Estimated value of the part of the contract that the contractor will subcontract to third parties (unpublished)
+					{BT-197(BT-553)-Tender} #{field|name|BT-197(BT-553)-Tender}: #{BT-197(BT-553)-Tender} // Unpublished Justification Code
+					{BT-553-Tender[BT-196(BT-553)-Tender is present]} #{field|name|BT-196(BT-553)-Tender}: ${BT-196(BT-553)-Tender} // Unpublished Justification Description
+					{BT-198(BT-553)-Tender} #{field|name|BT-198(BT-553)-Tender}: ${BT-198(BT-553)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-731-Tender is present and (BT-195(BT-731)-Tender is not present or BT-731-Tender == TRUE)]} #{field|name|BT-731-Tender}: #{code|name|${if (BT-731-Tender == 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
+					{BT-197(BT-731)-Tender} #{field|name|BT-197(BT-731)-Tender}: #{BT-197(BT-731)-Tender} // Unpublished Justification Code
+					{BT-731-Tender[BT-196(BT-731)-Tender is present]} #{field|name|BT-196(BT-731)-Tender}: ${BT-196(BT-731)-Tender} // Unpublished Justification Description
+					{BT-198(BT-731)-Tender} #{field|name|BT-198(BT-731)-Tender}: ${BT-198(BT-731)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-195(BT-731)-Tender is present and BT-731-Tender == FALSE]} #{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)
+					{BT-197(BT-731)-Tender} #{field|name|BT-197(BT-731)-Tender}: #{BT-197(BT-731)-Tender} // Unpublished Justification Code
+					{BT-731-Tender[BT-196(BT-731)-Tender is present]} #{field|name|BT-196(BT-731)-Tender}: ${BT-196(BT-731)-Tender} // Unpublished Justification Description
+					{BT-198(BT-731)-Tender} #{field|name|BT-198(BT-731)-Tender}: ${BT-198(BT-731)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-555-Tender != -1]} #{field|name|BT-555-Tender}: ${format-number(BT-555-Tender, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+					{BT-197(BT-555)-Tender} #{field|name|BT-197(BT-555)-Tender}: #{BT-197(BT-555)-Tender} // Unpublished Justification Code
+					{BT-555-Tender[BT-196(BT-555)-Tender is present]} #{field|name|BT-196(BT-555)-Tender}: ${BT-196(BT-555)-Tender} // Unpublished Justification Description
+					{BT-198(BT-555)-Tender} #{field|name|BT-198(BT-555)-Tender}: ${BT-198(BT-555)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-555-Tender == -1]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
+					{BT-197(BT-555)-Tender} #{field|name|BT-197(BT-555)-Tender}: #{BT-197(BT-555)-Tender} // Unpublished Justification Code
+					{BT-555-Tender[BT-196(BT-555)-Tender is present]} #{field|name|BT-196(BT-555)-Tender}: ${BT-196(BT-555)-Tender} // Unpublished Justification Description
+					{BT-198(BT-555)-Tender} #{field|name|BT-198(BT-555)-Tender}: ${BT-198(BT-555)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[(BT-554-Tender != '' and BT-554-Tender != 'unpublished')]} #{field|name|BT-554-Tender}: ${BT-554-Tender} // Subcontracting Description
+					{BT-197(BT-554)-Tender} #{field|name|BT-197(BT-554)-Tender}: #{BT-197(BT-554)-Tender} // Unpublished Justification Code
+					{ND-SubcontractedContract[BT-196(BT-554)-Tender is present]} #{field|name|BT-196(BT-554)-Tender}: ${BT-196(BT-554)-Tender} // Unpublished Justification Description
+					{BT-198(BT-554)-Tender} #{field|name|BT-198(BT-554)-Tender}: ${BT-198(BT-554)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-554-Tender == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
+					{BT-197(BT-554)-Tender} #{field|name|BT-197(BT-554)-Tender}: #{BT-197(BT-554)-Tender} // Unpublished Justification Code
+					{ND-SubcontractedContract[BT-196(BT-554)-Tender is present]} #{field|name|BT-196(BT-554)-Tender}: ${BT-196(BT-554)-Tender} // Unpublished Justification Description
+					{BT-198(BT-554)-Tender} #{field|name|BT-198(BT-554)-Tender}: ${BT-198(BT-554)-Tender} // Unpublished Access Date
 				0 {OPT-321-Tender} #{auxiliary|text|contract-information}: // Contract info for this tender
 					0 {OPT-321-Tender} #{field|name|BT-150-Contract}: ${for text:$tender in OPT-321-Tender return BT-150-Contract[BT-3202-Contract == $tender]} // Contract identifier
 					0 {OPT-321-Tender} #{field|name|BT-721-Contract}: ${for text:$tender in OPT-321-Tender return BT-721-Contract[BT-3202-Contract == $tender]} // Contract title
@@ -514,10 +698,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
diff --git a/view-templates/27.efx b/view-templates/27.efx
index ae60c9f0f..f369e9db1 100644
--- a/view-templates/27.efx
+++ b/view-templates/27.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // 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
 		{BT-610-Procedure-Buyer} #{field|name|BT-610-Procedure-Buyer}: #{BT-610-Procedure-Buyer} // Activity Entity
@@ -15,6 +15,9 @@
 		{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
+			{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-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
@@ -61,41 +64,65 @@
 		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
+					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
+					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
+					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-539-LotsGroup == 'unpublished' ]} #{field|name|BT-539-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Type (unpublished)
 					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
 					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
 					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup != 'unpublished']} #{field|name|BT-734-LotsGroup}: ${BT-734-LotsGroup} // Criterion Name
+					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup == 'unpublished']} #{field|name|BT-734-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup != 'unpublished']} #{field|name|BT-540-LotsGroup}: ${BT-540-LotsGroup} // Award Criterion Description
+					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup == 'unpublished']} #{field|name|BT-540-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup != 'unpublished']} #{BT-5421-LotsGroup}: ${format-number(BT-541-LotsGroup-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup == 'unpublished']} ${BT-5421-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Weight (unpublished) / Award Criterion Number
 					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup != 'unpublished']} #{BT-5422-LotsGroup}: ${format-number(BT-541-LotsGroup-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup == 'unpublished']} ${BT-5422-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup != 'unpublished']} #{BT-5423-LotsGroup}: ${format-number(BT-541-LotsGroup-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup == 'unpublished']} ${BT-5423-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup != 'unpublished']} #{field|name|BT-543-LotsGroup}: ${BT-543-LotsGroup} // Award Criteria Complicated
+				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup == 'unpublished']} #{field|name|BT-543-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup != 'unpublished']} #{field|name|BT-733-LotsGroup}: ${BT-733-LotsGroup} // Award Criteria Order Justification
+				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-198(BT-733)-LotsGroup is present]} #{field|name|BT-198(BT-733)-LotsGroup}: ${BT-198(BT-733)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup == 'unpublished']} #{field|name|BT-733-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Order Justification (unpublished)
 				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
@@ -109,7 +136,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -149,41 +175,65 @@
 		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
+					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
+					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
+					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-539-Lot == 'unpublished']} #{field|name|BT-539-Lot}: #{auxiliary|text|unpublished} // Type (unpublished)
 					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
 					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
 					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot != 'unpublished']} #{field|name|BT-734-Lot}: ${BT-734-Lot} // Criterion Name
+					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot == 'unpublished']} #{field|name|BT-734-Lot}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot != 'unpublished']} #{field|name|BT-540-Lot}: ${BT-540-Lot} // Award Criterion Description
+					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot == 'unpublished']} #{field|name|BT-540-Lot}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot != 'unpublished']} #{BT-5421-Lot}: ${format-number(BT-541-Lot-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Weight / Award Criterion Number (unpublished)
 					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot != 'unpublished']} #{BT-5422-Lot}: ${format-number(BT-541-Lot-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot != 'unpublished']} #{BT-5423-Lot}: ${format-number(BT-541-Lot-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot != 'unpublished']} #{field|name|BT-543-Lot}: ${BT-543-Lot} // Award Criteria Complicated
+				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot == 'unpublished']} #{field|name|BT-543-Lot}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot != 'unpublished']} #{field|name|BT-733-Lot}: ${BT-733-Lot} // Justification for not indicating the weighing of the award criteria
+				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriteria[BT-198(BT-733)-Lot is present]} #{field|name|BT-198(BT-733)-Lot}: ${BT-198(BT-733)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot == 'unpublished']} #{field|name|BT-733-Lot}: #{auxiliary|text|unpublished} // Justification for not indicating the weighing of the award criteria (unpublished)
 				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
@@ -208,32 +258,50 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // eSender
 6 {ND-NoticeResult} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-161-NoticeResult/@currencyID)}} // Notice Value (Value of all contracts awarded in this procedure)
+		{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-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 {BT-118-NoticeResult[BT-118-NoticeResult != -1]} #{field|name|BT-118-NoticeResult}: ${format-number(BT-118-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-118-NoticeResult/@currencyID)}} // The maximum value of the framework agreement(s) in this notice
+		{ND-NoticeMaximumValueUnpublish} #{field|name|BT-197(BT-118)-NoticeResult}: #{BT-197(BT-118)-NoticeResult} // Unpublished Justification Code
+		{ND-NoticeMaximumValueUnpublish[BT-196(BT-118)-NoticeResult is present]} #{field|name|BT-196(BT-118)-NoticeResult}: ${BT-196(BT-118)-NoticeResult} // Unpublished Justification Description
+		{ND-NoticeMaximumValueUnpublish[BT-198(BT-118)-NoticeResult is present]} #{field|name|BT-198(BT-118)-NoticeResult}: ${BT-198(BT-118)-NoticeResult} // Unpublished Access Date
 	0 {BT-118-NoticeResult[BT-118-NoticeResult == -1]} #{field|name|BT-118-NoticeResult}: #{auxiliary|text|unpublished} // The maximum value of the framework agreement(s) in this notice (unpublished)
 		{ND-NoticeMaximumValueUnpublish} #{field|name|BT-197(BT-118)-NoticeResult}: #{BT-197(BT-118)-NoticeResult} // Unpublished Justification Code
 		{ND-NoticeMaximumValueUnpublish[BT-196(BT-118)-NoticeResult is present]} #{field|name|BT-196(BT-118)-NoticeResult}: ${BT-196(BT-118)-NoticeResult} // Unpublished Justification Description
 		{ND-NoticeMaximumValueUnpublish[BT-198(BT-118)-NoticeResult is present]} #{field|name|BT-198(BT-118)-NoticeResult}: ${BT-198(BT-118)-NoticeResult} // Unpublished Access Date
 	0 {BT-1118-NoticeResult[BT-1118-NoticeResult != -1]} #{field|name|BT-1118-NoticeResult}: ${format-number(BT-1118-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-1118-NoticeResult/@currencyID)}} // The approximate value of the framework agreements in this notice
+		{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 {BT-1118-NoticeResult[BT-1118-NoticeResult == -1]} #{field|name|BT-1118-NoticeResult}: #{auxiliary|text|unpublished} // The approximate value of the framework agreements in this notice (unpublished)
 		{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
+		{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
+		{ND-GroupMaximalValueIdentifierUnpublish[BT-198(BT-556)-NoticeResult is present]} #{field|name|BT-198(BT-556)-NoticeResult}: ${BT-198(BT-556)-NoticeResult} // Unpublished Access Date
 		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.##')} #{code|name|${concat('currency.', BT-156-NoticeResult/@currencyID)}} // Maximum value of the framework agreements in this group of lots
+			{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-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.##')} #{code|name|${concat('currency.', BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Re-estimated value of the framework agreements within a group of lots
+			{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 {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
@@ -244,27 +312,42 @@
 		{ND-GroupMaximalValueIdentifierUnpublish[BT-198(BT-556)-NoticeResult is present]} #{field|name|BT-198(BT-556)-NoticeResult}: ${BT-198(BT-556)-NoticeResult} // Unpublished Access Date
 		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.##')} #{code|name|${concat('currency.', BT-156-NoticeResult[BT-156-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Maximum value of the framework agreements in this group of lots
+			{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-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.##')} #{code|name|${concat('currency.', BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Re-estimated value of the framework agreements within a group of lots
+			{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 {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-DirectAward} #{auxiliary|text|direct-award}: // Direct award
 		0 {BT-136-Procedure[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
+			{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
 		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
 		0 {ND-DirectAward[BT-135-Procedure != 'unpublished']} #{field|name|BT-135-Procedure}: ${BT-135-Procedure} // Other justification
+			{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-135-Procedure == 'unpublished']} #{field|name|BT-135-Procedure}: #{auxiliary|text|unpublished} // Other justification (unpublished)
 			{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 {BT-1252-Procedure[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
+			{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
 		0 {BT-1252-Procedure[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
@@ -272,63 +355,93 @@
 	1 {ND-LotResult} #{field|name|BT-13713-LotResult}: ${BT-13713-LotResult} // 6.1 Result Lot Identifier (LOT-XXXX)
 		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.##')} #{code|name|${concat('currency.', BT-709-LotResult/@currencyID)}} // Framework Maximum Value
+				{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-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.##')} #{code|name|${concat('currency.', BT-660-LotResult/@currencyID)}} // Framework Re-estimated Value
+				{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
 			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
+		2 {ND-LotResult[BT-02-notice in ('veat','can-modif') or ((BT-142-LotResult in ('selec-w','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:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-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:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the 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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $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 == $tpa1]) return $orgid1) == 1]} #{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 == $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 $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[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the tendering party for this Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $org2} // Names of non-leaders for this Winner
+				{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 == $tpa1]) return $orgid1) == 1]} #{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 == $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:$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:$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:$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 $orgname2} // Subcontractor names
+				{OPT-320-LotResult[count(for text:$tender1 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 == $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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-720-Tender[BT-720-Tender[OPT-321-Tender == $tender3] != -1]/@currencyID )}} // Value of the tender
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-1711-Tender is present] == $tender1]) > 0]} #{field|name|BT-1711-Tender}: #{code|name|${if (some indicator:$tranked in (for text:$tender2 in OPT-320-LotResult return BT-1711-Tender[OPT-321-Tender == $tender2]) satisfies $tranked == TRUE) then 'indicator.true' else 'indicator.false'}} // 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('applicability.',BT-773-Tender[OPT-321-Tender == $tender2])}} // Subcontracting
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-730-Tender is present and (BT-195(BT-730)-Tender is not present or BT-730-Tender == TRUE)] == $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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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 OPT-321-Tender[OPT-321-Tender[BT-195(BT-730)-Tender is present and BT-730-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID)}} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{auxiliary|text|unpublished} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-731-Tender is present and (BT-195(BT-731)-Tender is not present or BT-731-Tender == TRUE)] == $tender1]) > 0)]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk == 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-195(BT-731)-Tender is present and BT-731-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-555-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-555-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] == -1]) > 0]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // 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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies ($desc1 != '' and $desc1 != 'unpublished')]} #{field|name|BT-554-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-554-Tender[OPT-321-Tender == $tender2] return $desc2} // Subcontracting Description
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-554)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
@@ -352,12 +465,21 @@
 		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
+					{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 {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
+				{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 {BT-635-LotResult[BT-635-LotResult != -1]} #{field|name|BT-635-LotResult}: ${BT-635-LotResult} // 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 {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
@@ -367,13 +489,22 @@
 				{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
+					{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-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
+					{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
+						{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 {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
@@ -383,17 +514,26 @@
 					{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
+						{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 {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 {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.##')} #{code|name|${concat('currency.', BT-710-LotResult[BT-710-LotResult/@currencyID != 'unpublished']/@currencyID)}} // Tender Value Lowest
+					{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-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.##')} #{code|name|${concat('currency.', BT-711-LotResult[BT-711-LotResult/@currencyID != 'unpublished']/@currencyID)}} // Tender Value highest
+					{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 {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
@@ -403,11 +543,6 @@
 					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
 	1 {ND-LotTender[OPT-322-LotResult is not present]} #{field|name|BT-13713-LotResult}: ${BT-13714-Tender} // 6.1 Result Lot Identifier (LOT-XXXX) DAP/VEAT notices
-		0 {BT-13714-Tender[count(for text:$tender1 in BT-13714-Tender return BT-13713-LotResult[BT-13713-LotResult[BT-709-LotResult is present or BT-660-LotResult is present] == $tender1]) > 0] } #{auxiliary|text|framework-agreement} // --- TODO --- 0 {ND-LotResultFAValues} #{auxiliary|text|framework-agreement}: // Framework agreement
-			{BT-13714-Tender[count(for text:$tender1 in BT-13714-Tender return number:BT-709-LotResult[BT-709-LotResult[BT-13713-LotResult == $tender1] != -1]) > 0] } #{field|name|BT-709-LotResult}: ${for text:$tender2 in BT-13714-Tender, number:$value in BT-709-LotResult[BT-13713-LotResult == $tender2] return format-number($value, '###,##0.##')} // Framework Maximum Value
-			{BT-13714-Tender[count(for text:$tender1 in BT-13714-Tender return number:BT-709-LotResult[BT-709-LotResult[BT-13713-LotResult == $tender1] == -1]) > 0] } #{field|name|BT-709-LotResult}: #{auxiliary|text|unpublished} // Framework Maximum Value (unpublished)
-			{BT-13714-Tender[count(for text:$tender1 in BT-13714-Tender return number:BT-660-LotResult[BT-660-LotResult[BT-13713-LotResult == $tender1] != -1]) > 0] } #{field|name|BT-660-LotResult}: ${for text:$tender2 in BT-13714-Tender, number:$value in BT-660-LotResult[BT-13713-LotResult == $tender2] return format-number($value, '###,##0.##')} // Framework Re-estimated Value
-			{BT-13714-Tender[count(for text:$tender1 in BT-13714-Tender return number:BT-660-LotResult[BT-660-LotResult[BT-13713-LotResult == $tender1] == -1]) > 0] } #{field|name|BT-660-LotResult}: #{auxiliary|text|unpublished} // Framework Re-estimated Value (unpublished)
 		2 {ND-LotTender} #{auxiliary|text|winner-info} // 6.1.2. Winning tenders
 			0 {ND-LotTender} #{auxiliary|text|winner}: // Winner
 				{ND-LotTender[count(for text:$tpa1 in OPT-310-Tender, text:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-Tenderer}: ${for text:$tpa2 in OPT-310-Tender, text:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the tendering party for this Winner
@@ -420,21 +555,70 @@
 				{ND-LotTender} #{field|name|BT-3201-Tender}: ${BT-3201-Tender} // Tender identifier
 				{ND-LotTender} #{field|name|BT-13714-Tender}: ${BT-13714-Tender} // Identifier of lot or group of lots
 				0 {ND-LotTender[BT-720-Tender != -1]} #{field|name|BT-720-Tender}: ${format-number(BT-720-Tender, '###,##0.##')} #{code|name|${concat('currency.', BT-720-Tender[BT-720-Tender != -1]/@currencyID)}} // Value of the tender
+					{BT-197(BT-720)-Tender} #{field|name|BT-197(BT-720)-Tender}: #{BT-197(BT-720)-Tender} // Unpublished Justification Code
+					{ND-WinningTenderValueUnpublish[BT-196(BT-720)-Tender is present]} #{field|name|BT-196(BT-720)-Tender}: ${BT-196(BT-720)-Tender} // Unpublished Justification Description
+					{BT-198(BT-720)-Tender} #{field|name|BT-198(BT-720)-Tender}: ${BT-198(BT-720)-Tender} // Unpublished Access Date
 				0 {ND-LotTender[BT-720-Tender == -1]} #{field|name|BT-720-Tender}: #{auxiliary|text|unpublished} // Value of the tender (unpublished)
+					{BT-197(BT-720)-Tender} #{field|name|BT-197(BT-720)-Tender}: #{BT-197(BT-720)-Tender} // Unpublished Justification Code
+					{ND-WinningTenderValueUnpublish[BT-196(BT-720)-Tender is present]} #{field|name|BT-196(BT-720)-Tender}: ${BT-196(BT-720)-Tender} // Unpublished Justification Description
+					{BT-198(BT-720)-Tender} #{field|name|BT-198(BT-720)-Tender}: ${BT-198(BT-720)-Tender} // Unpublished Access Date
 				0 {ND-LotTender[BT-1711-Tender == TRUE]} #{field|name|BT-1711-Tender} // Tender Ranked
 				0 {ND-LotTender[BT-171-Tender != -1]} #{field|name|BT-171-Tender}: ${string(BT-171-Tender)} // Tender Rank
+					{BT-197(BT-171)-Tender} #{field|name|BT-197(BT-171)-Tender}: #{BT-197(BT-171)-Tender} // Unpublished Justification Code
+					{ND-TenderRankUnpublish[BT-196(BT-171)-Tender is present]} #{field|name|BT-196(BT-171)-Tender}: ${BT-196(BT-171)-Tender} // Unpublished Justification Description
+					{BT-198(BT-171)-Tender} #{field|name|BT-198(BT-171)-Tender}: ${BT-198(BT-171)-Tender} // Unpublished Access Date
 				0 {ND-LotTender[BT-171-Tender == -1]} #{field|name|BT-171-Tender}: #{auxiliary|text|unpublished} // Tender Rank (unpublished)
-				0 {ND-LotTender[BT-773-Tender != 'unpublished']} #{field|name|BT-773-Tender}: #{code|name|${concat('applicability.',BT-773-Tender)}}  // Subcontracting  
-				0 {ND-LotTender[BT-773-Tender == 'unpublished']} #{field|name|BT-773-Tender}: #{auxiliary|text|unpublished} // Subcontracting (unpublished)
-				0 {ND-LotTender[BT-195(BT-730)-Tender is not present]} #{field|name|BT-730-Tender}: #{code|name|${if (BT-730-Tender == 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 {ND-LotTender[BT-553-Tender != -1]} #{field|name|BT-553-Tender}: ${format-number(BT-553-Tender, '###,##0.##')} #{code|name|${concat('currency.', BT-553-Tender/@currencyID)}} // Estimated value of the part of the contract that the contractor will subcontract to third parties
-				0 {ND-LotTender[BT-553-Tender == -1]} #{field|name|BT-553-Tender}: #{auxiliary|text|unpublished} // Estimated value of the part of the contract that the contractor will subcontract to third parties (unpublished)
-				0 {ND-LotTender[BT-195(BT-731)-Tender is not present]} #{field|name|BT-731-Tender}: #{code|name|${if (BT-731-Tender == 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 {ND-LotTender[BT-195(BT-731)-Tender is present]} #{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)
-				0 {ND-LotTender[BT-555-Tender != -1]} #{field|name|BT-555-Tender}: ${format-number(BT-555-Tender, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
-				0 {ND-LotTender[BT-555-Tender == -1]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
-				0 {ND-LotTender[(BT-554-Tender != '' and BT-554-Tender != 'unpublished')]} #{field|name|BT-554-Tender}: ${BT-554-Tender} // Subcontracting Description
-				0 {ND-LotTender[BT-554-Tender == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
+					{BT-197(BT-171)-Tender} #{field|name|BT-197(BT-171)-Tender}: #{BT-197(BT-171)-Tender} // Unpublished Justification Code
+					{ND-TenderRankUnpublish[BT-196(BT-171)-Tender is present]} #{field|name|BT-196(BT-171)-Tender}: ${BT-196(BT-171)-Tender} // Unpublished Justification Description
+					{BT-198(BT-171)-Tender} #{field|name|BT-198(BT-171)-Tender}: ${BT-198(BT-171)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-773-Tender != 'unpublished']} #{field|name|BT-773-Tender}: #{code|name|${concat('applicability.',BT-773-Tender)}}  // Subcontracting  
+					{BT-197(BT-773)-Tender} #{field|name|BT-197(BT-773)-Tender}: #{BT-197(BT-773)-Tender} // Unpublished Justification Code
+					{BT-773-Tender[BT-196(BT-773)-Tender is present]} #{field|name|BT-196(BT-773)-Tender}: ${BT-196(BT-773)-Tender} // Unpublished Justification Description
+					{BT-198(BT-773)-Tender} #{field|name|BT-198(BT-773)-Tender}: ${BT-198(BT-773)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-773-Tender == 'unpublished']} #{field|name|BT-773-Tender}: #{auxiliary|text|unpublished} // Subcontracting (unpublished)
+					{BT-197(BT-773)-Tender} #{field|name|BT-197(BT-773)-Tender}: #{BT-197(BT-773)-Tender} // Unpublished Justification Code
+					{BT-773-Tender[BT-196(BT-773)-Tender is present]} #{field|name|BT-196(BT-773)-Tender}: ${BT-196(BT-773)-Tender} // Unpublished Justification Description
+					{BT-198(BT-773)-Tender} #{field|name|BT-198(BT-773)-Tender}: ${BT-198(BT-773)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-730-Tender is present and (BT-195(BT-730)-Tender is not present or BT-730-Tender == TRUE)]} #{field|name|BT-730-Tender}: #{code|name|${if (BT-730-Tender == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
+					{BT-197(BT-730)-Tender} #{field|name|BT-197(BT-730)-Tender}: #{BT-197(BT-730)-Tender} // Unpublished Justification Code
+					{BT-730-Tender[BT-196(BT-730)-Tender is present]} #{field|name|BT-196(BT-730)-Tender}: ${BT-196(BT-730)-Tender} // Unpublished Justification Description
+					{BT-198(BT-730)-Tender} #{field|name|BT-198(BT-730)-Tender}: ${BT-198(BT-730)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-195(BT-730)-Tender is present and BT-730-Tender == FALSE]} #{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)
+					{BT-197(BT-730)-Tender} #{field|name|BT-197(BT-730)-Tender}: #{BT-197(BT-730)-Tender} // Unpublished Justification Code
+					{BT-730-Tender[BT-196(BT-730)-Tender is present]} #{field|name|BT-196(BT-730)-Tender}: ${BT-196(BT-730)-Tender} // Unpublished Justification Description
+					{BT-198(BT-730)-Tender} #{field|name|BT-198(BT-730)-Tender}: ${BT-198(BT-730)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-553-Tender != -1]} #{field|name|BT-553-Tender}: ${format-number(BT-553-Tender, '###,##0.##')} #{code|name|${concat('currency.', BT-553-Tender/@currencyID)}} // Estimated value of the part of the contract that the contractor will subcontract to third parties
+					{BT-197(BT-553)-Tender} #{field|name|BT-197(BT-553)-Tender}: #{BT-197(BT-553)-Tender} // Unpublished Justification Code
+					{BT-553-Tender[BT-196(BT-553)-Tender is present]} #{field|name|BT-196(BT-553)-Tender}: ${BT-196(BT-553)-Tender} // Unpublished Justification Description
+					{BT-198(BT-553)-Tender} #{field|name|BT-198(BT-553)-Tender}: ${BT-198(BT-553)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-553-Tender == -1]} #{field|name|BT-553-Tender}: #{auxiliary|text|unpublished} // Estimated value of the part of the contract that the contractor will subcontract to third parties (unpublished)
+					{BT-197(BT-553)-Tender} #{field|name|BT-197(BT-553)-Tender}: #{BT-197(BT-553)-Tender} // Unpublished Justification Code
+					{BT-553-Tender[BT-196(BT-553)-Tender is present]} #{field|name|BT-196(BT-553)-Tender}: ${BT-196(BT-553)-Tender} // Unpublished Justification Description
+					{BT-198(BT-553)-Tender} #{field|name|BT-198(BT-553)-Tender}: ${BT-198(BT-553)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-731-Tender is present and (BT-195(BT-731)-Tender is not present or BT-731-Tender == TRUE)]} #{field|name|BT-731-Tender}: #{code|name|${if (BT-731-Tender == 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
+					{BT-197(BT-731)-Tender} #{field|name|BT-197(BT-731)-Tender}: #{BT-197(BT-731)-Tender} // Unpublished Justification Code
+					{BT-731-Tender[BT-196(BT-731)-Tender is present]} #{field|name|BT-196(BT-731)-Tender}: ${BT-196(BT-731)-Tender} // Unpublished Justification Description
+					{BT-198(BT-731)-Tender} #{field|name|BT-198(BT-731)-Tender}: ${BT-198(BT-731)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-195(BT-731)-Tender is present and BT-731-Tender == FALSE]} #{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)
+					{BT-197(BT-731)-Tender} #{field|name|BT-197(BT-731)-Tender}: #{BT-197(BT-731)-Tender} // Unpublished Justification Code
+					{BT-731-Tender[BT-196(BT-731)-Tender is present]} #{field|name|BT-196(BT-731)-Tender}: ${BT-196(BT-731)-Tender} // Unpublished Justification Description
+					{BT-198(BT-731)-Tender} #{field|name|BT-198(BT-731)-Tender}: ${BT-198(BT-731)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-555-Tender != -1]} #{field|name|BT-555-Tender}: ${format-number(BT-555-Tender, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+					{BT-197(BT-555)-Tender} #{field|name|BT-197(BT-555)-Tender}: #{BT-197(BT-555)-Tender} // Unpublished Justification Code
+					{BT-555-Tender[BT-196(BT-555)-Tender is present]} #{field|name|BT-196(BT-555)-Tender}: ${BT-196(BT-555)-Tender} // Unpublished Justification Description
+					{BT-198(BT-555)-Tender} #{field|name|BT-198(BT-555)-Tender}: ${BT-198(BT-555)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-555-Tender == -1]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
+					{BT-197(BT-555)-Tender} #{field|name|BT-197(BT-555)-Tender}: #{BT-197(BT-555)-Tender} // Unpublished Justification Code
+					{BT-555-Tender[BT-196(BT-555)-Tender is present]} #{field|name|BT-196(BT-555)-Tender}: ${BT-196(BT-555)-Tender} // Unpublished Justification Description
+					{BT-198(BT-555)-Tender} #{field|name|BT-198(BT-555)-Tender}: ${BT-198(BT-555)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[(BT-554-Tender != '' and BT-554-Tender != 'unpublished')]} #{field|name|BT-554-Tender}: ${BT-554-Tender} // Subcontracting Description
+					{BT-197(BT-554)-Tender} #{field|name|BT-197(BT-554)-Tender}: #{BT-197(BT-554)-Tender} // Unpublished Justification Code
+					{ND-SubcontractedContract[BT-196(BT-554)-Tender is present]} #{field|name|BT-196(BT-554)-Tender}: ${BT-196(BT-554)-Tender} // Unpublished Justification Description
+					{BT-198(BT-554)-Tender} #{field|name|BT-198(BT-554)-Tender}: ${BT-198(BT-554)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-554-Tender == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
+					{BT-197(BT-554)-Tender} #{field|name|BT-197(BT-554)-Tender}: #{BT-197(BT-554)-Tender} // Unpublished Justification Code
+					{ND-SubcontractedContract[BT-196(BT-554)-Tender is present]} #{field|name|BT-196(BT-554)-Tender}: ${BT-196(BT-554)-Tender} // Unpublished Justification Description
+					{BT-198(BT-554)-Tender} #{field|name|BT-198(BT-554)-Tender}: ${BT-198(BT-554)-Tender} // Unpublished Access Date
 				0 {OPT-321-Tender} #{auxiliary|text|contract-information}: // Contract info for this tender
 					0 {OPT-321-Tender} #{field|name|BT-150-Contract}: ${for text:$tender in OPT-321-Tender return BT-150-Contract[BT-3202-Contract == $tender]} // Contract identifier
 					0 {OPT-321-Tender} #{field|name|BT-721-Contract}: ${for text:$tender in OPT-321-Tender return BT-721-Contract[BT-3202-Contract == $tender]} // Contract title
@@ -514,10 +698,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
diff --git a/view-templates/28.efx b/view-templates/28.efx
index bf94240c4..dc0e7e7a8 100644
--- a/view-templates/28.efx
+++ b/view-templates/28.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // 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
 		{BT-610-Procedure-Buyer} #{field|name|BT-610-Procedure-Buyer}: #{BT-610-Procedure-Buyer} // Activity Entity
@@ -15,6 +15,9 @@
 		{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
+			{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-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
@@ -59,41 +62,65 @@
 		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
+					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
+					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
+					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-539-LotsGroup == 'unpublished' ]} #{field|name|BT-539-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Type (unpublished)
 					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
 					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
 					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup != 'unpublished']} #{field|name|BT-734-LotsGroup}: ${BT-734-LotsGroup} // Criterion Name
+					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup == 'unpublished']} #{field|name|BT-734-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup != 'unpublished']} #{field|name|BT-540-LotsGroup}: ${BT-540-LotsGroup} // Award Criterion Description
+					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup == 'unpublished']} #{field|name|BT-540-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup != 'unpublished']} #{BT-5421-LotsGroup}: ${format-number(BT-541-LotsGroup-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup == 'unpublished']} ${BT-5421-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Weight (unpublished) / Award Criterion Number
 					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup != 'unpublished']} #{BT-5422-LotsGroup}: ${format-number(BT-541-LotsGroup-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup == 'unpublished']} ${BT-5422-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup != 'unpublished']} #{BT-5423-LotsGroup}: ${format-number(BT-541-LotsGroup-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup == 'unpublished']} ${BT-5423-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup != 'unpublished']} #{field|name|BT-543-LotsGroup}: ${BT-543-LotsGroup} // Award Criteria Complicated
+				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup == 'unpublished']} #{field|name|BT-543-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup != 'unpublished']} #{field|name|BT-733-LotsGroup}: ${BT-733-LotsGroup} // Award Criteria Order Justification
+				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-198(BT-733)-LotsGroup is present]} #{field|name|BT-198(BT-733)-LotsGroup}: ${BT-198(BT-733)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup == 'unpublished']} #{field|name|BT-733-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Order Justification (unpublished)
 				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
@@ -107,7 +134,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -148,41 +174,65 @@
 		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
+					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
+					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
+					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-539-Lot == 'unpublished']} #{field|name|BT-539-Lot}: #{auxiliary|text|unpublished} // Type (unpublished)
 					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
 					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
 					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot != 'unpublished']} #{field|name|BT-734-Lot}: ${BT-734-Lot} // Criterion Name
+					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot == 'unpublished']} #{field|name|BT-734-Lot}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot != 'unpublished']} #{field|name|BT-540-Lot}: ${BT-540-Lot} // Award Criterion Description
+					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot == 'unpublished']} #{field|name|BT-540-Lot}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot != 'unpublished']} #{BT-5421-Lot}: ${format-number(BT-541-Lot-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Weight / Award Criterion Number (unpublished)
 					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot != 'unpublished']} #{BT-5422-Lot}: ${format-number(BT-541-Lot-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot != 'unpublished']} #{BT-5423-Lot}: ${format-number(BT-541-Lot-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot != 'unpublished']} #{field|name|BT-543-Lot}: ${BT-543-Lot} // Award Criteria Complicated
+				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot == 'unpublished']} #{field|name|BT-543-Lot}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot != 'unpublished']} #{field|name|BT-733-Lot}: ${BT-733-Lot} // Justification for not indicating the weighing of the award criteria
+				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriteria[BT-198(BT-733)-Lot is present]} #{field|name|BT-198(BT-733)-Lot}: ${BT-198(BT-733)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot == 'unpublished']} #{field|name|BT-733-Lot}: #{auxiliary|text|unpublished} // Justification for not indicating the weighing of the award criteria (unpublished)
 				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
@@ -200,36 +250,265 @@
 			{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[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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // eSender
 6 {ND-NoticeResult} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-161-NoticeResult/@currencyID)}} // Notice Value (Value of all contracts awarded in this procedure)
+		{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-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 {BT-136-Procedure[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
+			{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
 		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
 		0 {ND-DirectAward[BT-135-Procedure != 'unpublished']} #{field|name|BT-135-Procedure}: ${BT-135-Procedure} // Other justification
+			{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-135-Procedure == 'unpublished']} #{field|name|BT-135-Procedure}: #{auxiliary|text|unpublished} // Other justification (unpublished)
 			{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 {BT-1252-Procedure[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
+			{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
 		0 {BT-1252-Procedure[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 ?
+			{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-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
+			{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 {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.##')} #{code|name|${concat('currency.', BT-709-LotResult/@currencyID)}} // Framework Maximum Value
+				{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-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.##')} #{code|name|${concat('currency.', BT-660-LotResult/@currencyID)}} // Framework Re-estimated Value
+				{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
+			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 in ('veat','can-modif') or ((BT-142-LotResult in ('selec-w','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:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the tendering party for this Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $org2} // Names of non-leaders for this Winner
+				{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 == $tpa1]) return $orgid1) == 1]} #{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 == $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:$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:$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:$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 $orgname2} // Subcontractor names
+				{OPT-320-LotResult[count(for text:$tender1 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 == $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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-720-Tender[BT-720-Tender[OPT-321-Tender == $tender3] != -1]/@currencyID )}} // Value of the tender
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
+				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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
+				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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-162-Tender[OPT-321-Tender == $tender3]/@currencyID)}} // Concession Revenue User
+						{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-162)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-162)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-162)-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-162)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-162)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-162)-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-162)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-162)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-162)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
+					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)
+						{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-162)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-162)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-162)-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-162)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-162)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-162)-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-162)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-162)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-162)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
+					0 {OPT-320-LotResult[some number:$revenue1 in (for text:$tender1 in OPT-320-LotResult return BT-160-Tender[OPT-321-Tender == $tender1]) satisfies $revenue1 != -1]} #{field|name|BT-160-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$revenue2 in BT-160-Tender[OPT-321-Tender == $tender2] return format-number($revenue2, '###,##0.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.',BT-160-Tender[OPT-321-Tender == $tender3]/@currencyID)}} // Concession Revenue Buyer (Tender)
+						{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-160)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-160)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-160)-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-160)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-160)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-160)-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-160)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-160)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-160)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
+					0 {OPT-320-LotResult[some number:$revenue1 in (for text:$tender1 in OPT-320-LotResult return BT-160-Tender[OPT-321-Tender == $tender1]) satisfies $revenue1 == -1]} #{field|name|BT-160-Tender}: #{auxiliary|text|unpublished} // Concession Revenue Buyer (Tender) (unpublished)
+						{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-160)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-160)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-160)-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-160)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-160)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-160)-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-160)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-160)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-160)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
+					0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return BT-163-Tender[BT-163-Tender[OPT-321-Tender == $tender1] != 'unpublished'])>0]} #{field|name|BT-163-Tender}: ${for text:$tender in OPT-320-LotResult, text:$description in BT-163-Tender[OPT-321-Tender == $tender] return $description} // Concession Value Description (Tender)
+						{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[count(for text:$tender1 in OPT-320-LotResult return BT-163-Tender[BT-163-Tender[OPT-321-Tender == $tender1] == 'unpublished'])>0]} #{field|name|BT-163-Tender}: #{auxiliary|text|unpublished} // Concession Value Description (Tender) (unpublished)
+						{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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 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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('country.', BT-191-Tender[OPT-321-Tender == $tender2])}} // Country Origin
+					{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}: #{code|name|${for text:$tender1 in OPT-320-LotResult return concat('non-publication-justification.', 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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('applicability.',BT-773-Tender[OPT-321-Tender == $tender2])}} // Subcontracting
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-730-Tender is present and (BT-195(BT-730)-Tender is not present or BT-730-Tender == TRUE)] == $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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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 OPT-321-Tender[OPT-321-Tender[BT-195(BT-730)-Tender is present and BT-730-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID)}} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{auxiliary|text|unpublished} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-731-Tender is present and (BT-195(BT-731)-Tender is not present or BT-731-Tender == TRUE)] == $tender1]) > 0)]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk == 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-195(BT-731)-Tender is present and BT-731-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
+				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-555-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-555-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
+				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] == -1]) > 0]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // 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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
+				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies ($desc1 != '' and $desc1 != 'unpublished')]} #{field|name|BT-554-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-554-Tender[OPT-321-Tender == $tender2] return $desc2} // Subcontracting Description
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-554)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
+				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-554)-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 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}: #{code|name|${for text:$tender2 in OPT-320-LotResult, text:$name in BT-722-Contract[BT-3202-Contract == $tender2] return concat('eu-programme.', $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
+		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
+					{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 {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
+				{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 {BT-635-LotResult[BT-635-LotResult != -1]} #{field|name|BT-635-LotResult}: ${BT-635-LotResult} // 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 {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
+					{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-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
+					{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
+						{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 {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
+						{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 {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 {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.##')} #{code|name|${concat('currency.', BT-710-LotResult[BT-710-LotResult/@currencyID != 'unpublished']/@currencyID)}} // Tender Value Lowest
+					{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-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.##')} #{code|name|${concat('currency.', BT-711-LotResult[BT-711-LotResult/@currencyID != 'unpublished']/@currencyID)}} // Tender Value highest
+					{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 {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 {ND-StrategicProcurementInformationLotResult} #{field|name|BT-735-LotResult}: #{BT-735-LotResult} // 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
 	1 {ND-LotTender[OPT-322-LotResult is not present]} #{field|name|BT-13713-LotResult}: ${BT-13714-Tender} // 6.1 Result Lot Identifier (LOT-XXXX) DAP/VEAT notices
-		0 {BT-13714-Tender[count(for text:$tender1 in BT-13714-Tender return BT-13713-LotResult[BT-13713-LotResult[BT-709-LotResult is present or BT-660-LotResult is present] == $tender1]) > 0] } #{auxiliary|text|framework-agreement} // --- TODO --- 0 {ND-LotResultFAValues} #{auxiliary|text|framework-agreement}: // Framework agreement
-			{BT-13714-Tender[count(for text:$tender1 in BT-13714-Tender return number:BT-709-LotResult[BT-709-LotResult[BT-13713-LotResult == $tender1] != -1]) > 0] } #{field|name|BT-709-LotResult}: ${for text:$tender2 in BT-13714-Tender, number:$value in BT-709-LotResult[BT-13713-LotResult == $tender2] return format-number($value, '###,##0.##')} // Framework Maximum Value
-			{BT-13714-Tender[count(for text:$tender1 in BT-13714-Tender return number:BT-709-LotResult[BT-709-LotResult[BT-13713-LotResult == $tender1] == -1]) > 0] } #{field|name|BT-709-LotResult}: #{auxiliary|text|unpublished} // Framework Maximum Value (unpublished)
-			{BT-13714-Tender[count(for text:$tender1 in BT-13714-Tender return number:BT-660-LotResult[BT-660-LotResult[BT-13713-LotResult == $tender1] != -1]) > 0] } #{field|name|BT-660-LotResult}: ${for text:$tender2 in BT-13714-Tender, number:$value in BT-660-LotResult[BT-13713-LotResult == $tender2] return format-number($value, '###,##0.##')} // Framework Re-estimated Value
-			{BT-13714-Tender[count(for text:$tender1 in BT-13714-Tender return number:BT-660-LotResult[BT-660-LotResult[BT-13713-LotResult == $tender1] == -1]) > 0] } #{field|name|BT-660-LotResult}: #{auxiliary|text|unpublished} // Framework Re-estimated Value (unpublished)
 		2 {ND-LotTender} #{auxiliary|text|winner-info} // 6.1.2. Winning tenders
 			0 {ND-LotTender} #{auxiliary|text|winner}: // Winner
 				{ND-LotTender[count(for text:$tpa1 in OPT-310-Tender, text:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-Tenderer}: ${for text:$tpa2 in OPT-310-Tender, text:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the tendering party for this Winner
@@ -242,53 +521,85 @@
 				{ND-LotTender} #{field|name|BT-3201-Tender}: ${BT-3201-Tender} // Tender identifier
 				{ND-LotTender} #{field|name|BT-13714-Tender}: ${BT-13714-Tender} // Identifier of lot or group of lots
 				0 {ND-LotTender[BT-720-Tender != -1]} #{field|name|BT-720-Tender}: ${format-number(BT-720-Tender, '###,##0.##')} #{code|name|${concat('currency.', BT-720-Tender[BT-720-Tender != -1]/@currencyID)}} // Value of the tender
+					{BT-197(BT-720)-Tender} #{field|name|BT-197(BT-720)-Tender}: #{BT-197(BT-720)-Tender} // Unpublished Justification Code
+					{ND-WinningTenderValueUnpublish[BT-196(BT-720)-Tender is present]} #{field|name|BT-196(BT-720)-Tender}: ${BT-196(BT-720)-Tender} // Unpublished Justification Description
+					{BT-198(BT-720)-Tender} #{field|name|BT-198(BT-720)-Tender}: ${BT-198(BT-720)-Tender} // Unpublished Access Date
 				0 {ND-LotTender[BT-720-Tender == -1]} #{field|name|BT-720-Tender}: #{auxiliary|text|unpublished} // Value of the tender (unpublished)
-				0 {ND-LotTender[BT-1711-Tender == TRUE]} #{field|name|BT-1711-Tender} // Tender Ranked
+					{BT-197(BT-720)-Tender} #{field|name|BT-197(BT-720)-Tender}: #{BT-197(BT-720)-Tender} // Unpublished Justification Code
+					{ND-WinningTenderValueUnpublish[BT-196(BT-720)-Tender is present]} #{field|name|BT-196(BT-720)-Tender}: ${BT-196(BT-720)-Tender} // Unpublished Justification Description
+					{BT-198(BT-720)-Tender} #{field|name|BT-198(BT-720)-Tender}: ${BT-198(BT-720)-Tender} // Unpublished Access Date
 				0 {ND-LotTender[BT-160-Tender is present or BT-162-Tender is present or BT-163-Tender is present]} #{auxiliary|text|concession-value}  // Concession value (Tender)
 					0 {BT-162-Tender[BT-162-Tender != -1]} #{field|name|BT-162-Tender}: ${format-number(BT-162-Tender, '###,##0.##')} #{code|name|${concat('currency.', BT-162-Tender/@currencyID)}} // Concession Revenue User
+						{BT-197(BT-162)-Tender} #{field|name|BT-197(BT-162)-Tender}: #{BT-197(BT-162)-Tender} // Unpublished Justification Code
+						{BT-162-Tender[BT-196(BT-162)-Tender is present]} #{field|name|BT-196(BT-162)-Tender}: ${BT-196(BT-162)-Tender} // Unpublished Justification Description
+						{BT-198(BT-162)-Tender} #{field|name|BT-198(BT-162)-Tender}: ${BT-198(BT-162)-Tender} // Unpublished Access Date
 					0 {BT-162-Tender[BT-162-Tender == -1]} #{field|name|BT-162-Tender}: #{auxiliary|text|unpublished} // Concession Revenue User (unpublished)
-						{BT-197(BT-162)-Tender} #{field|name|BT-197(BT-162)-Tender}: #{code|name|${concat('non-publication-justification.', BT-197(BT-162)-Tender)}} // Unpublished Justification Code
+						{BT-197(BT-162)-Tender} #{field|name|BT-197(BT-162)-Tender}: #{BT-197(BT-162)-Tender} // Unpublished Justification Code
 						{BT-162-Tender[BT-196(BT-162)-Tender is present]} #{field|name|BT-196(BT-162)-Tender}: ${BT-196(BT-162)-Tender} // Unpublished Justification Description
 						{BT-198(BT-162)-Tender} #{field|name|BT-198(BT-162)-Tender}: ${BT-198(BT-162)-Tender} // Unpublished Access Date
 					0 {BT-160-Tender[BT-160-Tender != -1]} #{field|name|BT-160-Tender}: ${format-number(BT-160-Tender, '###,##0.##')} #{code|name|${concat('currency.', BT-160-Tender/@currencyID)}} // Concession Revenue Buyer
+						{BT-197(BT-160)-Tender} #{field|name|BT-197(BT-160)-Tender}: #{BT-197(BT-160)-Tender} // Unpublished Justification Code
+						{BT-160-Tender[BT-196(BT-160)-Tender is present]} #{field|name|BT-196(BT-160)-Tender}: ${BT-196(BT-160)-Tender} // Unpublished Justification Description
+						{BT-198(BT-160)-Tender} #{field|name|BT-198(BT-160)-Tender}: ${BT-198(BT-160)-Tender} // Unpublished Access Date
 					0 {BT-160-Tender[BT-160-Tender == -1]} #{field|name|BT-160-Tender}: #{auxiliary|text|unpublished} // Concession Revenue Buyer (unpublished)
-						{BT-197(BT-160)-Tender} #{field|name|BT-197(BT-160)-Tender}: #{code|name|${concat('non-publication-justification.', BT-197(BT-160)-Tender)}} // Unpublished Justification Code
+						{BT-197(BT-160)-Tender} #{field|name|BT-197(BT-160)-Tender}: #{BT-197(BT-160)-Tender} // Unpublished Justification Code
 						{BT-160-Tender[BT-196(BT-160)-Tender is present]} #{field|name|BT-196(BT-160)-Tender}: ${BT-196(BT-160)-Tender} // Unpublished Justification Description
 						{BT-198(BT-160)-Tender} #{field|name|BT-198(BT-160)-Tender}: ${BT-198(BT-160)-Tender} // Unpublished Access Date
-					0 {BT-163-Tender[BT-163-Tender != 'unpublished']} #{field|name|BT-163-Tender}: ${BT-163-Tender} // Concession Value Description (Tender)
-					0 {BT-163-Tender[BT-163-Tender == 'unpublished']} #{field|name|BT-163-Tender}: #{auxiliary|text|unpublished} // Concession Value Description (Tender) (unpublished)
-						{BT-197(BT-163)-Tender} #{field|name|BT-197(BT-163)-Tender}: #{code|name|${concat('non-publication-justification.', BT-197(BT-163)-Tender)}} // Unpublished Justification Code
-						{ND-LotTender[BT-196(BT-163)-Tender is present]} #{field|name|BT-196(BT-163)-Tender}: ${BT-196(BT-163)-Tender} // Unpublished Justification Description
+					0 {ND-ConcessionRevenue[BT-163-Tender != 'unpublished']} #{field|name|BT-163-Tender}: ${BT-163-Tender} // Concession Value Description (Tender)
+						{BT-197(BT-163)-Tender} #{field|name|BT-197(BT-163)-Tender}: #{BT-197(BT-163)-Tender} // Unpublished Justification Code
+						{ND-ConcessionRevenue[BT-196(BT-163)-Tender is present]} #{field|name|BT-196(BT-163)-Tender}: ${BT-196(BT-163)-Tender} // Unpublished Justification Description
+						{BT-198(BT-163)-Tender} #{field|name|BT-198(BT-163)-Tender}: ${BT-198(BT-163)-Tender} // Unpublished Access Date
+					0 {ND-ConcessionRevenue[BT-163-Tender == 'unpublished']} #{field|name|BT-163-Tender}: #{auxiliary|text|unpublished} // Concession Value Description (Tender) (unpublished)
+						{BT-197(BT-163)-Tender} #{field|name|BT-197(BT-163)-Tender}: #{BT-197(BT-163)-Tender} // Unpublished Justification Code
+						{ND-ConcessionRevenue[BT-196(BT-163)-Tender is present]} #{field|name|BT-196(BT-163)-Tender}: ${BT-196(BT-163)-Tender} // Unpublished Justification Description
 						{BT-198(BT-163)-Tender} #{field|name|BT-198(BT-163)-Tender}: ${BT-198(BT-163)-Tender} // Unpublished Access Date
-				0 {ND-LotTender[BT-773-Tender != 'unpublished']} #{field|name|BT-773-Tender}: #{code|name|${concat('applicability.',BT-773-Tender)}}  // Subcontracting  
-				0 {ND-LotTender[BT-773-Tender == 'unpublished']} #{field|name|BT-773-Tender}: #{auxiliary|text|unpublished} // Subcontracting (unpublished)
-					{BT-197(BT-773)-Tender} #{field|name|BT-197(BT-773)-Tender}: #{code|name|${concat('non-publication-justification.', BT-197(BT-773)-Tender)}} // Unpublished Justification Code
+				0 {ND-SubcontractedContract[BT-773-Tender != 'unpublished']} #{field|name|BT-773-Tender}: #{code|name|${concat('applicability.',BT-773-Tender)}}  // Subcontracting  
+					{BT-197(BT-773)-Tender} #{field|name|BT-197(BT-773)-Tender}: #{BT-197(BT-773)-Tender} // Unpublished Justification Code
+					{BT-773-Tender[BT-196(BT-773)-Tender is present]} #{field|name|BT-196(BT-773)-Tender}: ${BT-196(BT-773)-Tender} // Unpublished Justification Description
+					{BT-198(BT-773)-Tender} #{field|name|BT-198(BT-773)-Tender}: ${BT-198(BT-773)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-773-Tender == 'unpublished']} #{field|name|BT-773-Tender}: #{auxiliary|text|unpublished} // Subcontracting (unpublished)
+					{BT-197(BT-773)-Tender} #{field|name|BT-197(BT-773)-Tender}: #{BT-197(BT-773)-Tender} // Unpublished Justification Code
 					{BT-773-Tender[BT-196(BT-773)-Tender is present]} #{field|name|BT-196(BT-773)-Tender}: ${BT-196(BT-773)-Tender} // Unpublished Justification Description
 					{BT-198(BT-773)-Tender} #{field|name|BT-198(BT-773)-Tender}: ${BT-198(BT-773)-Tender} // Unpublished Access Date
-				0 {ND-LotTender[BT-195(BT-730)-Tender is not present]} #{field|name|BT-730-Tender}: #{code|name|${if (BT-730-Tender == 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 {ND-LotTender[BT-195(BT-730)-Tender is present]} #{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)
-					{BT-197(BT-730)-Tender} #{field|name|BT-197(BT-730)-Tender}: #{code|name|${concat('non-publication-justification.', BT-197(BT-730)-Tender)}} // Unpublished Justification Code
+				0 {ND-SubcontractedContract[BT-730-Tender is present and (BT-195(BT-730)-Tender is not present or BT-730-Tender == TRUE)]} #{field|name|BT-730-Tender}: #{code|name|${if (BT-730-Tender == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
+					{BT-197(BT-730)-Tender} #{field|name|BT-197(BT-730)-Tender}: #{BT-197(BT-730)-Tender} // Unpublished Justification Code
 					{BT-730-Tender[BT-196(BT-730)-Tender is present]} #{field|name|BT-196(BT-730)-Tender}: ${BT-196(BT-730)-Tender} // Unpublished Justification Description
 					{BT-198(BT-730)-Tender} #{field|name|BT-198(BT-730)-Tender}: ${BT-198(BT-730)-Tender} // Unpublished Access Date
-				0 {ND-LotTender[BT-553-Tender != -1]} #{field|name|BT-553-Tender}: ${format-number(BT-553-Tender, '###,##0.##')} #{code|name|${concat('currency.', BT-553-Tender/@currencyID)}} // Estimated value of the part of the contract that the contractor will subcontract to third parties
-				0 {ND-LotTender[BT-553-Tender == -1]} #{field|name|BT-553-Tender}: #{auxiliary|text|unpublished} // Estimated value of the part of the contract that the contractor will subcontract to third parties (unpublished)
-					{BT-197(BT-553)-Tender} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${concat('non-publication-justification.', BT-197(BT-553)-Tender)}} // Unpublished Justification Code
+				0 {ND-SubcontractedContract[BT-195(BT-730)-Tender is present and BT-730-Tender == FALSE]} #{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)
+					{BT-197(BT-730)-Tender} #{field|name|BT-197(BT-730)-Tender}: #{BT-197(BT-730)-Tender} // Unpublished Justification Code
+					{BT-730-Tender[BT-196(BT-730)-Tender is present]} #{field|name|BT-196(BT-730)-Tender}: ${BT-196(BT-730)-Tender} // Unpublished Justification Description
+					{BT-198(BT-730)-Tender} #{field|name|BT-198(BT-730)-Tender}: ${BT-198(BT-730)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-553-Tender != -1]} #{field|name|BT-553-Tender}: ${format-number(BT-553-Tender, '###,##0.##')} #{code|name|${concat('currency.', BT-553-Tender/@currencyID)}} // Estimated value of the part of the contract that the contractor will subcontract to third parties
+					{BT-197(BT-553)-Tender} #{field|name|BT-197(BT-553)-Tender}: #{BT-197(BT-553)-Tender} // Unpublished Justification Code
 					{BT-553-Tender[BT-196(BT-553)-Tender is present]} #{field|name|BT-196(BT-553)-Tender}: ${BT-196(BT-553)-Tender} // Unpublished Justification Description
 					{BT-198(BT-553)-Tender} #{field|name|BT-198(BT-553)-Tender}: ${BT-198(BT-553)-Tender} // Unpublished Access Date
-				0 {ND-LotTender[BT-195(BT-731)-Tender is not present]} #{field|name|BT-731-Tender}: #{code|name|${if (BT-731-Tender == 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 {ND-LotTender[BT-195(BT-731)-Tender is present]} #{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)
-					{BT-197(BT-731)-Tender} #{field|name|BT-197(BT-731)-Tender}: #{code|name|${concat('non-publication-justification.', BT-197(BT-731)-Tender)}} // Unpublished Justification Code
+				0 {ND-SubcontractedContract[BT-553-Tender == -1]} #{field|name|BT-553-Tender}: #{auxiliary|text|unpublished} // Estimated value of the part of the contract that the contractor will subcontract to third parties (unpublished)
+					{BT-197(BT-553)-Tender} #{field|name|BT-197(BT-553)-Tender}: #{BT-197(BT-553)-Tender} // Unpublished Justification Code
+					{BT-553-Tender[BT-196(BT-553)-Tender is present]} #{field|name|BT-196(BT-553)-Tender}: ${BT-196(BT-553)-Tender} // Unpublished Justification Description
+					{BT-198(BT-553)-Tender} #{field|name|BT-198(BT-553)-Tender}: ${BT-198(BT-553)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-731-Tender is present and (BT-195(BT-731)-Tender is not present or BT-731-Tender == TRUE)]} #{field|name|BT-731-Tender}: #{code|name|${if (BT-731-Tender == 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
+					{BT-197(BT-731)-Tender} #{field|name|BT-197(BT-731)-Tender}: #{BT-197(BT-731)-Tender} // Unpublished Justification Code
 					{BT-731-Tender[BT-196(BT-731)-Tender is present]} #{field|name|BT-196(BT-731)-Tender}: ${BT-196(BT-731)-Tender} // Unpublished Justification Description
 					{BT-198(BT-731)-Tender} #{field|name|BT-198(BT-731)-Tender}: ${BT-198(BT-731)-Tender} // Unpublished Access Date
-				0 {ND-LotTender[BT-555-Tender != -1]} #{field|name|BT-555-Tender}: ${format-number(BT-555-Tender, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
-				0 {ND-LotTender[BT-555-Tender == -1]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
-					{BT-197(BT-555)-Tender} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${concat('non-publication-justification.', BT-197(BT-555)-Tender)}} // Unpublished Justification Code
+				0 {ND-SubcontractedContract[BT-195(BT-731)-Tender is present and BT-731-Tender == FALSE]} #{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)
+					{BT-197(BT-731)-Tender} #{field|name|BT-197(BT-731)-Tender}: #{BT-197(BT-731)-Tender} // Unpublished Justification Code
+					{BT-731-Tender[BT-196(BT-731)-Tender is present]} #{field|name|BT-196(BT-731)-Tender}: ${BT-196(BT-731)-Tender} // Unpublished Justification Description
+					{BT-198(BT-731)-Tender} #{field|name|BT-198(BT-731)-Tender}: ${BT-198(BT-731)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-555-Tender != -1]} #{field|name|BT-555-Tender}: ${format-number(BT-555-Tender, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+					{BT-197(BT-555)-Tender} #{field|name|BT-197(BT-555)-Tender}: #{BT-197(BT-555)-Tender} // Unpublished Justification Code
+					{BT-555-Tender[BT-196(BT-555)-Tender is present]} #{field|name|BT-196(BT-555)-Tender}: ${BT-196(BT-555)-Tender} // Unpublished Justification Description
+					{BT-198(BT-555)-Tender} #{field|name|BT-198(BT-555)-Tender}: ${BT-198(BT-555)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-555-Tender == -1]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
+					{BT-197(BT-555)-Tender} #{field|name|BT-197(BT-555)-Tender}: #{BT-197(BT-555)-Tender} // Unpublished Justification Code
 					{BT-555-Tender[BT-196(BT-555)-Tender is present]} #{field|name|BT-196(BT-555)-Tender}: ${BT-196(BT-555)-Tender} // Unpublished Justification Description
 					{BT-198(BT-555)-Tender} #{field|name|BT-198(BT-555)-Tender}: ${BT-198(BT-555)-Tender} // Unpublished Access Date
-				0 {ND-LotTender[(BT-554-Tender != '' and BT-554-Tender != 'unpublished')]} #{field|name|BT-554-Tender}: ${BT-554-Tender} // Subcontracting Description
-				0 {ND-LotTender[BT-554-Tender == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
-					{BT-197(BT-554)-Tender} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${concat('non-publication-justification.', BT-197(BT-554)-Tender)}} // Unpublished Justification Code
-					{BT-554-Tender[BT-196(BT-554)-Tender is present]} #{field|name|BT-196(BT-554)-Tender}: ${BT-196(BT-554)-Tender} // Unpublished Justification Description
+				0 {ND-SubcontractedContract[(BT-554-Tender != '' and BT-554-Tender != 'unpublished')]} #{field|name|BT-554-Tender}: ${BT-554-Tender} // Subcontracting Description
+					{BT-197(BT-554)-Tender} #{field|name|BT-197(BT-554)-Tender}: #{BT-197(BT-554)-Tender} // Unpublished Justification Code
+					{ND-SubcontractedContract[BT-196(BT-554)-Tender is present]} #{field|name|BT-196(BT-554)-Tender}: ${BT-196(BT-554)-Tender} // Unpublished Justification Description
+					{BT-198(BT-554)-Tender} #{field|name|BT-198(BT-554)-Tender}: ${BT-198(BT-554)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-554-Tender == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
+					{BT-197(BT-554)-Tender} #{field|name|BT-197(BT-554)-Tender}: #{BT-197(BT-554)-Tender} // Unpublished Justification Code
+					{ND-SubcontractedContract[BT-196(BT-554)-Tender is present]} #{field|name|BT-196(BT-554)-Tender}: ${BT-196(BT-554)-Tender} // Unpublished Justification Description
 					{BT-198(BT-554)-Tender} #{field|name|BT-198(BT-554)-Tender}: ${BT-198(BT-554)-Tender} // Unpublished Access Date
 				0 {OPT-321-Tender} #{auxiliary|text|contract-information}: // Contract info for this tender
 					0 {OPT-321-Tender} #{field|name|BT-150-Contract}: ${for text:$tender in OPT-321-Tender return BT-150-Contract[BT-3202-Contract == $tender]} // Contract identifier
@@ -367,10 +678,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
diff --git a/view-templates/29.efx b/view-templates/29.efx
index 9d04717ff..dec691485 100644
--- a/view-templates/29.efx
+++ b/view-templates/29.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{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
@@ -13,21 +13,33 @@
 		{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
+			{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-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 {BT-106-Procedure[BT-106-Procedure != '0']} #{field|name|BT-106-Procedure}: #{code|name|${concat('indicator.',BT-106-Procedure)}} // The procedure is accelerated. (true/false)
+			{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
+			{BT-106-Procedure[BT-198(BT-106)-Procedure is present]} #{field|name|BT-198(BT-106)-Procedure}: ${BT-198(BT-106)-Procedure} // Unpublished Access Date
 		0 {BT-106-Procedure[BT-106-Procedure == '0']} #{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
 			{BT-106-Procedure[BT-198(BT-106)-Procedure is present]} #{field|name|BT-198(BT-106)-Procedure}: ${BT-198(BT-106)-Procedure} // Unpublished Access Date
 		0 {ND-ProcedureProcurementScope[BT-1351-Procedure != 'unpublished']} #{field|name|BT-1351-Procedure}: ${BT-1351-Procedure} // Justification for the accelerated procedure
+			{BT-197(BT-1351)-Procedure} #{field|name|BT-197(BT-1351)-Procedure}: #{BT-197(BT-1351)-Procedure} // Unpublished Justification Code
+			{ND-ProcedureProcurementScope[BT-196(BT-1351)-Procedure is present]} #{field|name|BT-196(BT-1351)-Procedure}: ${BT-196(BT-1351)-Procedure} // Unpublished Justification Description
+			{ND-ProcedureProcurementScope[BT-198(BT-1351)-Procedure is present]} #{field|name|BT-198(BT-1351)-Procedure}: ${BT-198(BT-1351)-Procedure} // Unpublished Access Date
 		0 {ND-ProcedureProcurementScope[BT-1351-Procedure == 'unpublished']} #{field|name|BT-1351-Procedure}: #{auxiliary|text|unpublished} // Justification for the accelerated procedure (unpublished)
 			{BT-197(BT-1351)-Procedure} #{field|name|BT-197(BT-1351)-Procedure}: #{BT-197(BT-1351)-Procedure} // Unpublished Justification Code
 			{ND-ProcedureProcurementScope[BT-196(BT-1351)-Procedure is present]} #{field|name|BT-196(BT-1351)-Procedure}: ${BT-196(BT-1351)-Procedure} // Unpublished Justification Description
 			{ND-ProcedureProcurementScope[BT-198(BT-1351)-Procedure is present]} #{field|name|BT-198(BT-1351)-Procedure}: ${BT-198(BT-1351)-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
+			{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
 		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
@@ -81,41 +93,65 @@
 		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
+					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
+					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
+					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-539-LotsGroup == 'unpublished' ]} #{field|name|BT-539-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Type (unpublished)
 					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
 					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
 					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup != 'unpublished']} #{field|name|BT-734-LotsGroup}: ${BT-734-LotsGroup} // Criterion Name
+					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup == 'unpublished']} #{field|name|BT-734-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup != 'unpublished']} #{field|name|BT-540-LotsGroup}: ${BT-540-LotsGroup} // Award Criterion Description
+					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup == 'unpublished']} #{field|name|BT-540-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup != 'unpublished']} #{BT-5421-LotsGroup}: ${format-number(BT-541-LotsGroup-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup == 'unpublished']} ${BT-5421-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Weight (unpublished) / Award Criterion Number
 					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup != 'unpublished']} #{BT-5422-LotsGroup}: ${format-number(BT-541-LotsGroup-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup == 'unpublished']} ${BT-5422-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup != 'unpublished']} #{BT-5423-LotsGroup}: ${format-number(BT-541-LotsGroup-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup == 'unpublished']} ${BT-5423-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup != 'unpublished']} #{field|name|BT-543-LotsGroup}: ${BT-543-LotsGroup} // Award Criteria Complicated
+				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup == 'unpublished']} #{field|name|BT-543-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup != 'unpublished']} #{field|name|BT-733-LotsGroup}: ${BT-733-LotsGroup} // Award Criteria Order Justification
+				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-198(BT-733)-LotsGroup is present]} #{field|name|BT-198(BT-733)-LotsGroup}: ${BT-198(BT-733)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup == 'unpublished']} #{field|name|BT-733-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Order Justification (unpublished)
 				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
@@ -129,7 +165,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -176,41 +211,65 @@
 		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
+					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
+					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
+					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-539-Lot == 'unpublished']} #{field|name|BT-539-Lot}: #{auxiliary|text|unpublished} // Type (unpublished)
 					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
 					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
 					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot != 'unpublished']} #{field|name|BT-734-Lot}: ${BT-734-Lot} // Criterion Name
+					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot == 'unpublished']} #{field|name|BT-734-Lot}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot != 'unpublished']} #{field|name|BT-540-Lot}: ${BT-540-Lot} // Award Criterion Description
+					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot == 'unpublished']} #{field|name|BT-540-Lot}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot != 'unpublished']} #{BT-5421-Lot}: ${format-number(BT-541-Lot-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Weight / Award Criterion Number (unpublished)
 					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot != 'unpublished']} #{BT-5422-Lot}: ${format-number(BT-541-Lot-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot != 'unpublished']} #{BT-5423-Lot}: ${format-number(BT-541-Lot-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot != 'unpublished']} #{field|name|BT-543-Lot}: ${BT-543-Lot} // Award Criteria Complicated
+				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot == 'unpublished']} #{field|name|BT-543-Lot}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot != 'unpublished']} #{field|name|BT-733-Lot}: ${BT-733-Lot} // Justification for not indicating the weighing of the award criteria
+				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriteria[BT-198(BT-733)-Lot is present]} #{field|name|BT-198(BT-733)-Lot}: ${BT-198(BT-733)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot == 'unpublished']} #{field|name|BT-733-Lot}: #{auxiliary|text|unpublished} // Justification for not indicating the weighing of the award criteria (unpublished)
 				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
@@ -236,32 +295,50 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // eSender
 6 {ND-NoticeResult} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-161-NoticeResult/@currencyID)}} // Notice Value (Value of all contracts awarded in this procedure)
+		{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-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 {BT-118-NoticeResult[BT-118-NoticeResult != -1]} #{field|name|BT-118-NoticeResult}: ${format-number(BT-118-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-118-NoticeResult/@currencyID)}} // The maximum value of the framework agreement(s) in this notice
+		{ND-NoticeMaximumValueUnpublish} #{field|name|BT-197(BT-118)-NoticeResult}: #{BT-197(BT-118)-NoticeResult} // Unpublished Justification Code
+		{ND-NoticeMaximumValueUnpublish[BT-196(BT-118)-NoticeResult is present]} #{field|name|BT-196(BT-118)-NoticeResult}: ${BT-196(BT-118)-NoticeResult} // Unpublished Justification Description
+		{ND-NoticeMaximumValueUnpublish[BT-198(BT-118)-NoticeResult is present]} #{field|name|BT-198(BT-118)-NoticeResult}: ${BT-198(BT-118)-NoticeResult} // Unpublished Access Date
 	0 {BT-118-NoticeResult[BT-118-NoticeResult == -1]} #{field|name|BT-118-NoticeResult}: #{auxiliary|text|unpublished} // The maximum value of the framework agreement(s) in this notice (unpublished)
 		{ND-NoticeMaximumValueUnpublish} #{field|name|BT-197(BT-118)-NoticeResult}: #{BT-197(BT-118)-NoticeResult} // Unpublished Justification Code
 		{ND-NoticeMaximumValueUnpublish[BT-196(BT-118)-NoticeResult is present]} #{field|name|BT-196(BT-118)-NoticeResult}: ${BT-196(BT-118)-NoticeResult} // Unpublished Justification Description
 		{ND-NoticeMaximumValueUnpublish[BT-198(BT-118)-NoticeResult is present]} #{field|name|BT-198(BT-118)-NoticeResult}: ${BT-198(BT-118)-NoticeResult} // Unpublished Access Date
 	0 {BT-1118-NoticeResult[BT-1118-NoticeResult != -1]} #{field|name|BT-1118-NoticeResult}: ${format-number(BT-1118-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-1118-NoticeResult/@currencyID)}} // The approximate value of the framework agreements in this notice
+		{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 {BT-1118-NoticeResult[BT-1118-NoticeResult == -1]} #{field|name|BT-1118-NoticeResult}: #{auxiliary|text|unpublished} // The approximate value of the framework agreements in this notice (unpublished)
 		{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
+		{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
+		{ND-GroupMaximalValueIdentifierUnpublish[BT-198(BT-556)-NoticeResult is present]} #{field|name|BT-198(BT-556)-NoticeResult}: ${BT-198(BT-556)-NoticeResult} // Unpublished Access Date
 		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.##')} #{code|name|${concat('currency.', BT-156-NoticeResult/@currencyID)}} // Maximum value of the framework agreements in this group of lots
+			{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-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.##')} #{code|name|${concat('currency.', BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Re-estimated value of the framework agreements within a group of lots
+			{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 {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
@@ -272,106 +349,160 @@
 		{ND-GroupMaximalValueIdentifierUnpublish[BT-198(BT-556)-NoticeResult is present]} #{field|name|BT-198(BT-556)-NoticeResult}: ${BT-198(BT-556)-NoticeResult} // Unpublished Access Date
 		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.##')} #{code|name|${concat('currency.', BT-156-NoticeResult[BT-156-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Maximum value of the framework agreements in this group of lots
+			{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-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.##')} #{code|name|${concat('currency.', BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Re-estimated value of the framework agreements within a group of lots
+			{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 {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-DirectAward} #{auxiliary|text|direct-award}: // Direct award
 		0 {BT-136-Procedure[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
+			{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
 		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
 		0 {ND-DirectAward[BT-135-Procedure != 'unpublished']} #{field|name|BT-135-Procedure}: ${BT-135-Procedure} // Other justification
+			{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-135-Procedure == 'unpublished']} #{field|name|BT-135-Procedure}: #{auxiliary|text|unpublished} // Other justification (unpublished)
 			{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 {BT-1252-Procedure[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
+			{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
 		0 {BT-1252-Procedure[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 ?
+			{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-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
+			{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 {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.##')} #{code|name|${concat('currency.', BT-709-LotResult/@currencyID)}} // Framework Maximum Value
+				{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-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.##')} #{code|name|${concat('currency.', BT-660-LotResult/@currencyID)}} // Framework Re-estimated Value
+				{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
 			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
+		2 {ND-LotResult[BT-02-notice in ('veat','can-modif') or ((BT-142-LotResult in ('selec-w','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:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-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:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the 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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $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 == $tpa1]) return $orgid1) == 1]} #{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 == $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 $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[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the tendering party for this Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $org2} // Names of non-leaders for this Winner
+				{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 == $tpa1]) return $orgid1) == 1]} #{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 == $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:$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:$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:$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 $orgname2} // Subcontractor names
+				{OPT-320-LotResult[count(for text:$tender1 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 == $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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-720-Tender[BT-720-Tender[OPT-321-Tender == $tender3] != -1]/@currencyID )}} // Value of the tender
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-1711-Tender is present] == $tender1]) > 0]} #{field|name|BT-1711-Tender}: #{code|name|${if (some indicator:$tranked in (for text:$tender2 in OPT-320-LotResult return BT-1711-Tender[OPT-321-Tender == $tender2]) satisfies $tranked == TRUE) then 'indicator.true' else 'indicator.false'}} // 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-193-Tender is present] == $tender1]) > 0)]} #{field|name|BT-193-Tender}: #{code|name|${if (some indicator:$tvariant in (for text:$tender3 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender3]) satisfies $tvariant == TRUE) then 'indicator.true' else 'indicator.false'}} // 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 == 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-193-Tender is present and (BT-195(BT-193)-Tender is not present or BT-193-Tender == TRUE)] == $tender1]) > 0)]} #{field|name|BT-193-Tender}: #{code|name|${if (some indicator:$tvariant in (for text:$tender2 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender2]) satisfies $tvariant == TRUE) then 'indicator.true' else 'indicator.false'}} // The tender is a variant
+					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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-195(BT-193)-Tender is present and BT-193-Tender == FALSE] == $tender1]) > 0)]} #{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('applicability.',BT-773-Tender[OPT-321-Tender == $tender2])}} // Subcontracting
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-730-Tender is present and (BT-195(BT-730)-Tender is not present or BT-730-Tender == TRUE)] == $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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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 OPT-321-Tender[OPT-321-Tender[BT-195(BT-730)-Tender is present and BT-730-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID)}} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{auxiliary|text|unpublished} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-731-Tender is present and (BT-195(BT-731)-Tender is not present or BT-731-Tender == TRUE)] == $tender1]) > 0)]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk == 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-195(BT-731)-Tender is present and BT-731-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-555-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-555-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] == -1]) > 0]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // 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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies ($desc1 != '' and $desc1 != 'unpublished')]} #{field|name|BT-554-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-554-Tender[OPT-321-Tender == $tender2] return $desc2} // Subcontracting Description
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-554)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
@@ -396,12 +527,21 @@
 		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
+					{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 {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
+				{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 {BT-635-LotResult[BT-635-LotResult != -1]} #{field|name|BT-635-LotResult}: ${BT-635-LotResult} // 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 {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
@@ -411,13 +551,22 @@
 				{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
+					{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-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
+					{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
+						{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 {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
@@ -427,17 +576,26 @@
 					{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
+						{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 {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 {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.##')} #{code|name|${concat('currency.', BT-710-LotResult[BT-710-LotResult/@currencyID != 'unpublished']/@currencyID)}} // Tender Value Lowest
+					{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-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.##')} #{code|name|${concat('currency.', BT-711-LotResult[BT-711-LotResult/@currencyID != 'unpublished']/@currencyID)}} // Tender Value highest
+					{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 {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
@@ -516,10 +674,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
diff --git a/view-templates/3.efx b/view-templates/3.efx
index 2dee01513..d8c462489 100644
--- a/view-templates/3.efx
+++ b/view-templates/3.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // 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
 		{BT-610-Procedure-Buyer} #{field|name|BT-610-Procedure-Buyer}: #{BT-610-Procedure-Buyer} // Activity Entity
@@ -71,10 +71,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
diff --git a/view-templates/30.efx b/view-templates/30.efx
index 5cd2368b6..25ac890a2 100644
--- a/view-templates/30.efx
+++ b/view-templates/30.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{BT-10-Procedure-Buyer} #{field|name|BT-10-Procedure-Buyer}: #value // Activity of the contracting authority
 		{BT-610-Procedure-Buyer} #{field|name|BT-610-Procedure-Buyer}: #{BT-610-Procedure-Buyer} // Activity Entity
 2 {ND-Root} #{auxiliary|text|procedure} // 2. Procedure
@@ -14,21 +14,33 @@
 		{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
+			{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-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 {BT-106-Procedure[BT-106-Procedure != '0']} #{field|name|BT-106-Procedure}: #{code|name|${concat('indicator.',BT-106-Procedure)}} // The procedure is accelerated. (true/false)
+			{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
+			{BT-106-Procedure[BT-198(BT-106)-Procedure is present]} #{field|name|BT-198(BT-106)-Procedure}: ${BT-198(BT-106)-Procedure} // Unpublished Access Date
 		0 {BT-106-Procedure[BT-106-Procedure == '0']} #{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
 			{BT-106-Procedure[BT-198(BT-106)-Procedure is present]} #{field|name|BT-198(BT-106)-Procedure}: ${BT-198(BT-106)-Procedure} // Unpublished Access Date
 		0 {ND-ProcedureProcurementScope[BT-1351-Procedure != 'unpublished']} #{field|name|BT-1351-Procedure}: ${BT-1351-Procedure} // Justification for the accelerated procedure
+			{BT-197(BT-1351)-Procedure} #{field|name|BT-197(BT-1351)-Procedure}: #{BT-197(BT-1351)-Procedure} // Unpublished Justification Code
+			{ND-ProcedureProcurementScope[BT-196(BT-1351)-Procedure is present]} #{field|name|BT-196(BT-1351)-Procedure}: ${BT-196(BT-1351)-Procedure} // Unpublished Justification Description
+			{ND-ProcedureProcurementScope[BT-198(BT-1351)-Procedure is present]} #{field|name|BT-198(BT-1351)-Procedure}: ${BT-198(BT-1351)-Procedure} // Unpublished Access Date
 		0 {ND-ProcedureProcurementScope[BT-1351-Procedure == 'unpublished']} #{field|name|BT-1351-Procedure}: #{auxiliary|text|unpublished} // Justification for the accelerated procedure (unpublished)
 			{BT-197(BT-1351)-Procedure} #{field|name|BT-197(BT-1351)-Procedure}: #{BT-197(BT-1351)-Procedure} // Unpublished Justification Code
 			{ND-ProcedureProcurementScope[BT-196(BT-1351)-Procedure is present]} #{field|name|BT-196(BT-1351)-Procedure}: ${BT-196(BT-1351)-Procedure} // Unpublished Justification Description
 			{ND-ProcedureProcurementScope[BT-198(BT-1351)-Procedure is present]} #{field|name|BT-198(BT-1351)-Procedure}: ${BT-198(BT-1351)-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
+			{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
 		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
@@ -82,41 +94,65 @@
 		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
+					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
+					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
+					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-539-LotsGroup == 'unpublished' ]} #{field|name|BT-539-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Type (unpublished)
 					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
 					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
 					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup != 'unpublished']} #{field|name|BT-734-LotsGroup}: ${BT-734-LotsGroup} // Criterion Name
+					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup == 'unpublished']} #{field|name|BT-734-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup != 'unpublished']} #{field|name|BT-540-LotsGroup}: ${BT-540-LotsGroup} // Award Criterion Description
+					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup == 'unpublished']} #{field|name|BT-540-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup != 'unpublished']} #{BT-5421-LotsGroup}: ${format-number(BT-541-LotsGroup-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup == 'unpublished']} ${BT-5421-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Weight (unpublished) / Award Criterion Number
 					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup != 'unpublished']} #{BT-5422-LotsGroup}: ${format-number(BT-541-LotsGroup-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup == 'unpublished']} ${BT-5422-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup != 'unpublished']} #{BT-5423-LotsGroup}: ${format-number(BT-541-LotsGroup-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup == 'unpublished']} ${BT-5423-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup != 'unpublished']} #{field|name|BT-543-LotsGroup}: ${BT-543-LotsGroup} // Award Criteria Complicated
+				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup == 'unpublished']} #{field|name|BT-543-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup != 'unpublished']} #{field|name|BT-733-LotsGroup}: ${BT-733-LotsGroup} // Award Criteria Order Justification
+				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-198(BT-733)-LotsGroup is present]} #{field|name|BT-198(BT-733)-LotsGroup}: ${BT-198(BT-733)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup == 'unpublished']} #{field|name|BT-733-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Order Justification (unpublished)
 				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
@@ -130,7 +166,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -177,41 +212,65 @@
 		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
+					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
+					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
+					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-539-Lot == 'unpublished']} #{field|name|BT-539-Lot}: #{auxiliary|text|unpublished} // Type (unpublished)
 					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
 					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
 					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot != 'unpublished']} #{field|name|BT-734-Lot}: ${BT-734-Lot} // Criterion Name
+					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot == 'unpublished']} #{field|name|BT-734-Lot}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot != 'unpublished']} #{field|name|BT-540-Lot}: ${BT-540-Lot} // Award Criterion Description
+					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot == 'unpublished']} #{field|name|BT-540-Lot}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot != 'unpublished']} #{BT-5421-Lot}: ${format-number(BT-541-Lot-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Weight / Award Criterion Number (unpublished)
 					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot != 'unpublished']} #{BT-5422-Lot}: ${format-number(BT-541-Lot-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot != 'unpublished']} #{BT-5423-Lot}: ${format-number(BT-541-Lot-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot != 'unpublished']} #{field|name|BT-543-Lot}: ${BT-543-Lot} // Award Criteria Complicated
+				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot == 'unpublished']} #{field|name|BT-543-Lot}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot != 'unpublished']} #{field|name|BT-733-Lot}: ${BT-733-Lot} // Justification for not indicating the weighing of the award criteria
+				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriteria[BT-198(BT-733)-Lot is present]} #{field|name|BT-198(BT-733)-Lot}: ${BT-198(BT-733)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot == 'unpublished']} #{field|name|BT-733-Lot}: #{auxiliary|text|unpublished} // Justification for not indicating the weighing of the award criteria (unpublished)
 				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
@@ -237,32 +296,50 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // eSender
 6 {ND-NoticeResult} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-161-NoticeResult/@currencyID)}} // Notice Value (Value of all contracts awarded in this procedure)
+		{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-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 {BT-118-NoticeResult[BT-118-NoticeResult != -1]} #{field|name|BT-118-NoticeResult}: ${format-number(BT-118-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-118-NoticeResult/@currencyID)}} // The maximum value of the framework agreement(s) in this notice
+		{ND-NoticeMaximumValueUnpublish} #{field|name|BT-197(BT-118)-NoticeResult}: #{BT-197(BT-118)-NoticeResult} // Unpublished Justification Code
+		{ND-NoticeMaximumValueUnpublish[BT-196(BT-118)-NoticeResult is present]} #{field|name|BT-196(BT-118)-NoticeResult}: ${BT-196(BT-118)-NoticeResult} // Unpublished Justification Description
+		{ND-NoticeMaximumValueUnpublish[BT-198(BT-118)-NoticeResult is present]} #{field|name|BT-198(BT-118)-NoticeResult}: ${BT-198(BT-118)-NoticeResult} // Unpublished Access Date
 	0 {BT-118-NoticeResult[BT-118-NoticeResult == -1]} #{field|name|BT-118-NoticeResult}: #{auxiliary|text|unpublished} // The maximum value of the framework agreement(s) in this notice (unpublished)
 		{ND-NoticeMaximumValueUnpublish} #{field|name|BT-197(BT-118)-NoticeResult}: #{BT-197(BT-118)-NoticeResult} // Unpublished Justification Code
 		{ND-NoticeMaximumValueUnpublish[BT-196(BT-118)-NoticeResult is present]} #{field|name|BT-196(BT-118)-NoticeResult}: ${BT-196(BT-118)-NoticeResult} // Unpublished Justification Description
 		{ND-NoticeMaximumValueUnpublish[BT-198(BT-118)-NoticeResult is present]} #{field|name|BT-198(BT-118)-NoticeResult}: ${BT-198(BT-118)-NoticeResult} // Unpublished Access Date
 	0 {BT-1118-NoticeResult[BT-1118-NoticeResult != -1]} #{field|name|BT-1118-NoticeResult}: ${format-number(BT-1118-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-1118-NoticeResult/@currencyID)}} // The approximate value of the framework agreements in this notice
+		{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 {BT-1118-NoticeResult[BT-1118-NoticeResult == -1]} #{field|name|BT-1118-NoticeResult}: #{auxiliary|text|unpublished} // The approximate value of the framework agreements in this notice (unpublished)
 		{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
+		{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
+		{ND-GroupMaximalValueIdentifierUnpublish[BT-198(BT-556)-NoticeResult is present]} #{field|name|BT-198(BT-556)-NoticeResult}: ${BT-198(BT-556)-NoticeResult} // Unpublished Access Date
 		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.##')} #{code|name|${concat('currency.', BT-156-NoticeResult/@currencyID)}} // Maximum value of the framework agreements in this group of lots
+			{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-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.##')} #{code|name|${concat('currency.', BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Re-estimated value of the framework agreements within a group of lots
+			{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 {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
@@ -273,111 +350,168 @@
 		{ND-GroupMaximalValueIdentifierUnpublish[BT-198(BT-556)-NoticeResult is present]} #{field|name|BT-198(BT-556)-NoticeResult}: ${BT-198(BT-556)-NoticeResult} // Unpublished Access Date
 		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.##')} #{code|name|${concat('currency.', BT-156-NoticeResult[BT-156-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Maximum value of the framework agreements in this group of lots
+			{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-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.##')} #{code|name|${concat('currency.', BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Re-estimated value of the framework agreements within a group of lots
+			{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 {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-DirectAward} #{auxiliary|text|direct-award}: // Direct award
 		0 {BT-136-Procedure[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
+			{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
 		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
 		0 {ND-DirectAward[BT-135-Procedure != 'unpublished']} #{field|name|BT-135-Procedure}: ${BT-135-Procedure} // Other justification
+			{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-135-Procedure == 'unpublished']} #{field|name|BT-135-Procedure}: #{auxiliary|text|unpublished} // Other justification (unpublished)
 			{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 {BT-1252-Procedure[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
+			{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
 		0 {BT-1252-Procedure[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 ?
+			{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-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
+			{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 {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.##')} #{code|name|${concat('currency.', BT-709-LotResult/@currencyID)}} // Framework Maximum Value
+				{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-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.##')} #{code|name|${concat('currency.', BT-660-LotResult/@currencyID)}} // Framework Re-estimated Value
+				{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
 			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
+		2 {ND-LotResult[BT-02-notice in ('veat','can-modif') or ((BT-142-LotResult in ('selec-w','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:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-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:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the 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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $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 == $tpa1]) return $orgid1) == 1]} #{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 == $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 $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[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the tendering party for this Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $org2} // Names of non-leaders for this Winner
+				{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 == $tpa1]) return $orgid1) == 1]} #{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 == $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:$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:$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:$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 $orgname2} // Subcontractor names
+				{OPT-320-LotResult[count(for text:$tender1 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 == $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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-720-Tender[BT-720-Tender[OPT-321-Tender == $tender3] != -1]/@currencyID )}} // Value of the tender
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-1711-Tender is present] == $tender1]) > 0]} #{field|name|BT-1711-Tender}: #{code|name|${if (some indicator:$tranked in (for text:$tender2 in OPT-320-LotResult return BT-1711-Tender[OPT-321-Tender == $tender2]) satisfies $tranked == TRUE) then 'indicator.true' else 'indicator.false'}} // 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-193-Tender is present] == $tender1]) > 0)]} #{field|name|BT-193-Tender}: #{code|name|${if (some indicator:$tvariant in (for text:$tender3 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender3]) satisfies $tvariant == TRUE) then 'indicator.true' else 'indicator.false'}} // 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 == 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-193-Tender is present and (BT-195(BT-193)-Tender is not present or BT-193-Tender == TRUE)] == $tender1]) > 0)]} #{field|name|BT-193-Tender}: #{code|name|${if (some indicator:$tvariant in (for text:$tender2 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender2]) satisfies $tvariant == TRUE) then 'indicator.true' else 'indicator.false'}} // The tender is a variant
+					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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-195(BT-193)-Tender is present and BT-193-Tender == FALSE] == $tender1]) > 0)]} #{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('country.', BT-191-Tender[OPT-321-Tender == $tender2])}} // Country Origin
+					{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}: #{code|name|${for text:$tender1 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender1 in OPT-320-LotResult return concat('non-publication-justification.', 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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('applicability.',BT-773-Tender[OPT-321-Tender == $tender2])}} // Subcontracting
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-730-Tender is present and (BT-195(BT-730)-Tender is not present or BT-730-Tender == TRUE)] == $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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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 OPT-321-Tender[OPT-321-Tender[BT-195(BT-730)-Tender is present and BT-730-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID)}} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{auxiliary|text|unpublished} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-731-Tender is present and (BT-195(BT-731)-Tender is not present or BT-731-Tender == TRUE)] == $tender1]) > 0)]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk == 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-195(BT-731)-Tender is present and BT-731-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-555-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-555-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] == -1]) > 0]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // 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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies ($desc1 != '' and $desc1 != 'unpublished')]} #{field|name|BT-554-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-554-Tender[OPT-321-Tender == $tender2] return $desc2} // Subcontracting Description
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-554)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
@@ -402,12 +536,21 @@
 		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
+					{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 {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
+				{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 {BT-635-LotResult[BT-635-LotResult != -1]} #{field|name|BT-635-LotResult}: ${BT-635-LotResult} // 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 {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
@@ -417,13 +560,22 @@
 				{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
+					{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-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
+					{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
+						{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 {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
@@ -433,17 +585,26 @@
 					{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
+						{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 {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 {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.##')} #{code|name|${concat('currency.', BT-710-LotResult[BT-710-LotResult/@currencyID != 'unpublished']/@currencyID)}} // Tender Value Lowest
+					{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-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.##')} #{code|name|${concat('currency.', BT-711-LotResult[BT-711-LotResult/@currencyID != 'unpublished']/@currencyID)}} // Tender Value highest
+					{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 {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
@@ -522,10 +683,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
diff --git a/view-templates/31.efx b/view-templates/31.efx
index 63760eb5c..9474b09e4 100644
--- a/view-templates/31.efx
+++ b/view-templates/31.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // 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
 		{BT-610-Procedure-Buyer} #{field|name|BT-610-Procedure-Buyer}: #{BT-610-Procedure-Buyer} // Activity Entity
@@ -15,21 +15,33 @@
 		{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
+			{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-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 {BT-106-Procedure[BT-106-Procedure != '0']} #{field|name|BT-106-Procedure}: #{code|name|${concat('indicator.',BT-106-Procedure)}} // The procedure is accelerated. (true/false)
+			{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
+			{BT-106-Procedure[BT-198(BT-106)-Procedure is present]} #{field|name|BT-198(BT-106)-Procedure}: ${BT-198(BT-106)-Procedure} // Unpublished Access Date
 		0 {BT-106-Procedure[BT-106-Procedure == '0']} #{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
 			{BT-106-Procedure[BT-198(BT-106)-Procedure is present]} #{field|name|BT-198(BT-106)-Procedure}: ${BT-198(BT-106)-Procedure} // Unpublished Access Date
 		0 {ND-ProcedureProcurementScope[BT-1351-Procedure != 'unpublished']} #{field|name|BT-1351-Procedure}: ${BT-1351-Procedure} // Justification for the accelerated procedure
+			{BT-197(BT-1351)-Procedure} #{field|name|BT-197(BT-1351)-Procedure}: #{BT-197(BT-1351)-Procedure} // Unpublished Justification Code
+			{ND-ProcedureProcurementScope[BT-196(BT-1351)-Procedure is present]} #{field|name|BT-196(BT-1351)-Procedure}: ${BT-196(BT-1351)-Procedure} // Unpublished Justification Description
+			{ND-ProcedureProcurementScope[BT-198(BT-1351)-Procedure is present]} #{field|name|BT-198(BT-1351)-Procedure}: ${BT-198(BT-1351)-Procedure} // Unpublished Access Date
 		0 {ND-ProcedureProcurementScope[BT-1351-Procedure == 'unpublished']} #{field|name|BT-1351-Procedure}: #{auxiliary|text|unpublished} // Justification for the accelerated procedure (unpublished)
 			{BT-197(BT-1351)-Procedure} #{field|name|BT-197(BT-1351)-Procedure}: #{BT-197(BT-1351)-Procedure} // Unpublished Justification Code
 			{ND-ProcedureProcurementScope[BT-196(BT-1351)-Procedure is present]} #{field|name|BT-196(BT-1351)-Procedure}: ${BT-196(BT-1351)-Procedure} // Unpublished Justification Description
 			{ND-ProcedureProcurementScope[BT-198(BT-1351)-Procedure is present]} #{field|name|BT-198(BT-1351)-Procedure}: ${BT-198(BT-1351)-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
+			{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
 		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
@@ -82,41 +94,65 @@
 		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
+					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
+					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
+					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-539-LotsGroup == 'unpublished' ]} #{field|name|BT-539-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Type (unpublished)
 					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
 					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
 					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup != 'unpublished']} #{field|name|BT-734-LotsGroup}: ${BT-734-LotsGroup} // Criterion Name
+					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup == 'unpublished']} #{field|name|BT-734-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup != 'unpublished']} #{field|name|BT-540-LotsGroup}: ${BT-540-LotsGroup} // Award Criterion Description
+					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup == 'unpublished']} #{field|name|BT-540-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup != 'unpublished']} #{BT-5421-LotsGroup}: ${format-number(BT-541-LotsGroup-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup == 'unpublished']} ${BT-5421-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Weight (unpublished) / Award Criterion Number
 					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup != 'unpublished']} #{BT-5422-LotsGroup}: ${format-number(BT-541-LotsGroup-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup == 'unpublished']} ${BT-5422-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup != 'unpublished']} #{BT-5423-LotsGroup}: ${format-number(BT-541-LotsGroup-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup == 'unpublished']} ${BT-5423-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup != 'unpublished']} #{field|name|BT-543-LotsGroup}: ${BT-543-LotsGroup} // Award Criteria Complicated
+				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup == 'unpublished']} #{field|name|BT-543-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup != 'unpublished']} #{field|name|BT-733-LotsGroup}: ${BT-733-LotsGroup} // Award Criteria Order Justification
+				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-198(BT-733)-LotsGroup is present]} #{field|name|BT-198(BT-733)-LotsGroup}: ${BT-198(BT-733)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup == 'unpublished']} #{field|name|BT-733-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Order Justification (unpublished)
 				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
@@ -130,7 +166,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -176,41 +211,65 @@
 		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
+					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
+					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
+					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-539-Lot == 'unpublished']} #{field|name|BT-539-Lot}: #{auxiliary|text|unpublished} // Type (unpublished)
 					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
 					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
 					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot != 'unpublished']} #{field|name|BT-734-Lot}: ${BT-734-Lot} // Criterion Name
+					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot == 'unpublished']} #{field|name|BT-734-Lot}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot != 'unpublished']} #{field|name|BT-540-Lot}: ${BT-540-Lot} // Award Criterion Description
+					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot == 'unpublished']} #{field|name|BT-540-Lot}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot != 'unpublished']} #{BT-5421-Lot}: ${format-number(BT-541-Lot-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Weight / Award Criterion Number (unpublished)
 					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot != 'unpublished']} #{BT-5422-Lot}: ${format-number(BT-541-Lot-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot != 'unpublished']} #{BT-5423-Lot}: ${format-number(BT-541-Lot-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot != 'unpublished']} #{field|name|BT-543-Lot}: ${BT-543-Lot} // Award Criteria Complicated
+				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot == 'unpublished']} #{field|name|BT-543-Lot}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot != 'unpublished']} #{field|name|BT-733-Lot}: ${BT-733-Lot} // Justification for not indicating the weighing of the award criteria
+				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriteria[BT-198(BT-733)-Lot is present]} #{field|name|BT-198(BT-733)-Lot}: ${BT-198(BT-733)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot == 'unpublished']} #{field|name|BT-733-Lot}: #{auxiliary|text|unpublished} // Justification for not indicating the weighing of the award criteria (unpublished)
 				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
@@ -236,32 +295,50 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // eSender
 6 {ND-NoticeResult} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-161-NoticeResult/@currencyID)}} // Notice Value (Value of all contracts awarded in this procedure)
+		{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-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 {BT-118-NoticeResult[BT-118-NoticeResult != -1]} #{field|name|BT-118-NoticeResult}: ${format-number(BT-118-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-118-NoticeResult/@currencyID)}} // The maximum value of the framework agreement(s) in this notice
+		{ND-NoticeMaximumValueUnpublish} #{field|name|BT-197(BT-118)-NoticeResult}: #{BT-197(BT-118)-NoticeResult} // Unpublished Justification Code
+		{ND-NoticeMaximumValueUnpublish[BT-196(BT-118)-NoticeResult is present]} #{field|name|BT-196(BT-118)-NoticeResult}: ${BT-196(BT-118)-NoticeResult} // Unpublished Justification Description
+		{ND-NoticeMaximumValueUnpublish[BT-198(BT-118)-NoticeResult is present]} #{field|name|BT-198(BT-118)-NoticeResult}: ${BT-198(BT-118)-NoticeResult} // Unpublished Access Date
 	0 {BT-118-NoticeResult[BT-118-NoticeResult == -1]} #{field|name|BT-118-NoticeResult}: #{auxiliary|text|unpublished} // The maximum value of the framework agreement(s) in this notice (unpublished)
 		{ND-NoticeMaximumValueUnpublish} #{field|name|BT-197(BT-118)-NoticeResult}: #{BT-197(BT-118)-NoticeResult} // Unpublished Justification Code
 		{ND-NoticeMaximumValueUnpublish[BT-196(BT-118)-NoticeResult is present]} #{field|name|BT-196(BT-118)-NoticeResult}: ${BT-196(BT-118)-NoticeResult} // Unpublished Justification Description
 		{ND-NoticeMaximumValueUnpublish[BT-198(BT-118)-NoticeResult is present]} #{field|name|BT-198(BT-118)-NoticeResult}: ${BT-198(BT-118)-NoticeResult} // Unpublished Access Date
 	0 {BT-1118-NoticeResult[BT-1118-NoticeResult != -1]} #{field|name|BT-1118-NoticeResult}: ${format-number(BT-1118-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-1118-NoticeResult/@currencyID)}} // The approximate value of the framework agreements in this notice
+		{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 {BT-1118-NoticeResult[BT-1118-NoticeResult == -1]} #{field|name|BT-1118-NoticeResult}: #{auxiliary|text|unpublished} // The approximate value of the framework agreements in this notice (unpublished)
 		{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
+		{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
+		{ND-GroupMaximalValueIdentifierUnpublish[BT-198(BT-556)-NoticeResult is present]} #{field|name|BT-198(BT-556)-NoticeResult}: ${BT-198(BT-556)-NoticeResult} // Unpublished Access Date
 		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.##')} #{code|name|${concat('currency.', BT-156-NoticeResult/@currencyID)}} // Maximum value of the framework agreements in this group of lots
+			{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-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.##')} #{code|name|${concat('currency.', BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Re-estimated value of the framework agreements within a group of lots
+			{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 {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
@@ -272,106 +349,160 @@
 		{ND-GroupMaximalValueIdentifierUnpublish[BT-198(BT-556)-NoticeResult is present]} #{field|name|BT-198(BT-556)-NoticeResult}: ${BT-198(BT-556)-NoticeResult} // Unpublished Access Date
 		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.##')} #{code|name|${concat('currency.', BT-156-NoticeResult[BT-156-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Maximum value of the framework agreements in this group of lots
+			{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-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.##')} #{code|name|${concat('currency.', BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Re-estimated value of the framework agreements within a group of lots
+			{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 {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-DirectAward} #{auxiliary|text|direct-award}: // Direct award
 		0 {BT-136-Procedure[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
+			{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
 		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
 		0 {ND-DirectAward[BT-135-Procedure != 'unpublished']} #{field|name|BT-135-Procedure}: ${BT-135-Procedure} // Other justification
+			{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-135-Procedure == 'unpublished']} #{field|name|BT-135-Procedure}: #{auxiliary|text|unpublished} // Other justification (unpublished)
 			{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 {BT-1252-Procedure[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
+			{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
 		0 {BT-1252-Procedure[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 ?
+			{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-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
+			{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 {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.##')} #{code|name|${concat('currency.', BT-709-LotResult/@currencyID)}} // Framework Maximum Value
+				{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-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.##')} #{code|name|${concat('currency.', BT-660-LotResult/@currencyID)}} // Framework Re-estimated Value
+				{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
 			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
+		2 {ND-LotResult[BT-02-notice in ('veat','can-modif') or ((BT-142-LotResult in ('selec-w','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:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-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:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the 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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $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 == $tpa1]) return $orgid1) == 1]} #{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 == $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 $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[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the tendering party for this Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $org2} // Names of non-leaders for this Winner
+				{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 == $tpa1]) return $orgid1) == 1]} #{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 == $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:$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:$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:$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 $orgname2} // Subcontractor names
+				{OPT-320-LotResult[count(for text:$tender1 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 == $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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-720-Tender[BT-720-Tender[OPT-321-Tender == $tender3] != -1]/@currencyID )}} // Value of the tender
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-1711-Tender is present] == $tender1]) > 0]} #{field|name|BT-1711-Tender}: #{code|name|${if (some indicator:$tranked in (for text:$tender2 in OPT-320-LotResult return BT-1711-Tender[OPT-321-Tender == $tender2]) satisfies $tranked == TRUE) then 'indicator.true' else 'indicator.false'}} // 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-193-Tender is present] == $tender1]) > 0)]} #{field|name|BT-193-Tender}: #{code|name|${if (some indicator:$tvariant in (for text:$tender3 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender3]) satisfies $tvariant == TRUE) then 'indicator.true' else 'indicator.false'}} // 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 == 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-193-Tender is present and (BT-195(BT-193)-Tender is not present or BT-193-Tender == TRUE)] == $tender1]) > 0)]} #{field|name|BT-193-Tender}: #{code|name|${if (some indicator:$tvariant in (for text:$tender2 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender2]) satisfies $tvariant == TRUE) then 'indicator.true' else 'indicator.false'}} // The tender is a variant
+					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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-195(BT-193)-Tender is present and BT-193-Tender == FALSE] == $tender1]) > 0)]} #{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('applicability.',BT-773-Tender[OPT-321-Tender == $tender2])}} // Subcontracting
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-730-Tender is present and (BT-195(BT-730)-Tender is not present or BT-730-Tender == TRUE)] == $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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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 OPT-321-Tender[OPT-321-Tender[BT-195(BT-730)-Tender is present and BT-730-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID)}} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{auxiliary|text|unpublished} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-731-Tender is present and (BT-195(BT-731)-Tender is not present or BT-731-Tender == TRUE)] == $tender1]) > 0)]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk == 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-195(BT-731)-Tender is present and BT-731-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-555-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-555-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] == -1]) > 0]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // 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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies ($desc1 != '' and $desc1 != 'unpublished')]} #{field|name|BT-554-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-554-Tender[OPT-321-Tender == $tender2] return $desc2} // Subcontracting Description
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-554)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
@@ -396,12 +527,21 @@
 		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
+					{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 {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
+				{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 {BT-635-LotResult[BT-635-LotResult != -1]} #{field|name|BT-635-LotResult}: ${BT-635-LotResult} // 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 {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
@@ -411,13 +551,22 @@
 				{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
+					{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-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
+					{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
+						{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 {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
@@ -427,17 +576,26 @@
 					{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
+						{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 {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 {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.##')} #{code|name|${concat('currency.', BT-710-LotResult[BT-710-LotResult/@currencyID != 'unpublished']/@currencyID)}} // Tender Value Lowest
+					{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-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.##')} #{code|name|${concat('currency.', BT-711-LotResult[BT-711-LotResult/@currencyID != 'unpublished']/@currencyID)}} // Tender Value highest
+					{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 {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
@@ -516,10 +674,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
diff --git a/view-templates/32.efx b/view-templates/32.efx
index b1e38ba86..a517ba310 100644
--- a/view-templates/32.efx
+++ b/view-templates/32.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // 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
 		{BT-610-Procedure-Buyer} #{field|name|BT-610-Procedure-Buyer}: #{BT-610-Procedure-Buyer} // Activity Entity
@@ -15,6 +15,9 @@
 		{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 {ND-ProcedureProcurementScope[BT-88-Procedure != 'unpublished']} #{field|name|BT-88-Procedure}: ${BT-88-Procedure} // Procedure Features / Description of the procedure
+			{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
 		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
@@ -64,41 +67,65 @@
 		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
+					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
+					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
+					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-539-LotsGroup == 'unpublished' ]} #{field|name|BT-539-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Type (unpublished)
 					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
 					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
 					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup != 'unpublished']} #{field|name|BT-734-LotsGroup}: ${BT-734-LotsGroup} // Criterion Name
+					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup == 'unpublished']} #{field|name|BT-734-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup != 'unpublished']} #{field|name|BT-540-LotsGroup}: ${BT-540-LotsGroup} // Award Criterion Description
+					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup == 'unpublished']} #{field|name|BT-540-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup != 'unpublished']} #{BT-5421-LotsGroup}: ${format-number(BT-541-LotsGroup-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup == 'unpublished']} ${BT-5421-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Weight (unpublished) / Award Criterion Number
 					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup != 'unpublished']} #{BT-5422-LotsGroup}: ${format-number(BT-541-LotsGroup-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup == 'unpublished']} ${BT-5422-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup != 'unpublished']} #{BT-5423-LotsGroup}: ${format-number(BT-541-LotsGroup-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup == 'unpublished']} ${BT-5423-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup != 'unpublished']} #{field|name|BT-543-LotsGroup}: ${BT-543-LotsGroup} // Award Criteria Complicated
+				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup == 'unpublished']} #{field|name|BT-543-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup != 'unpublished']} #{field|name|BT-733-LotsGroup}: ${BT-733-LotsGroup} // Award Criteria Order Justification
+				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-198(BT-733)-LotsGroup is present]} #{field|name|BT-198(BT-733)-LotsGroup}: ${BT-198(BT-733)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup == 'unpublished']} #{field|name|BT-733-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Order Justification (unpublished)
 				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
@@ -112,7 +139,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -158,41 +184,65 @@
 		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
+					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
+					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
+					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-539-Lot == 'unpublished']} #{field|name|BT-539-Lot}: #{auxiliary|text|unpublished} // Type (unpublished)
 					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
 					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
 					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot != 'unpublished']} #{field|name|BT-734-Lot}: ${BT-734-Lot} // Criterion Name
+					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot == 'unpublished']} #{field|name|BT-734-Lot}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot != 'unpublished']} #{field|name|BT-540-Lot}: ${BT-540-Lot} // Award Criterion Description
+					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot == 'unpublished']} #{field|name|BT-540-Lot}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot != 'unpublished']} #{BT-5421-Lot}: ${format-number(BT-541-Lot-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Weight / Award Criterion Number (unpublished)
 					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot != 'unpublished']} #{BT-5422-Lot}: ${format-number(BT-541-Lot-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot != 'unpublished']} #{BT-5423-Lot}: ${format-number(BT-541-Lot-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot != 'unpublished']} #{field|name|BT-543-Lot}: ${BT-543-Lot} // Award Criteria Complicated
+				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot == 'unpublished']} #{field|name|BT-543-Lot}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot != 'unpublished']} #{field|name|BT-733-Lot}: ${BT-733-Lot} // Justification for not indicating the weighing of the award criteria
+				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriteria[BT-198(BT-733)-Lot is present]} #{field|name|BT-198(BT-733)-Lot}: ${BT-198(BT-733)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot == 'unpublished']} #{field|name|BT-733-Lot}: #{auxiliary|text|unpublished} // Justification for not indicating the weighing of the award criteria (unpublished)
 				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
@@ -212,104 +262,155 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // eSender
 6 {ND-NoticeResult} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-161-NoticeResult/@currencyID)}} // Notice Value (Value of all contracts awarded in this procedure)
+		{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-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 {BT-136-Procedure[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
+			{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
 		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
 		0 {ND-DirectAward[BT-135-Procedure != 'unpublished']} #{field|name|BT-135-Procedure}: ${BT-135-Procedure} // Other justification
+			{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-135-Procedure == 'unpublished']} #{field|name|BT-135-Procedure}: #{auxiliary|text|unpublished} // Other justification (unpublished)
 			{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 {BT-1252-Procedure[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
+			{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
 		0 {BT-1252-Procedure[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 ?
+			{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-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
+			{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 {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
+		2 {ND-LotResult[BT-02-notice in ('veat','can-modif') or ((BT-142-LotResult in ('selec-w','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:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-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:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the 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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $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 == $tpa1]) return $orgid1) == 1]} #{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 == $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 $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[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the tendering party for this Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $org2} // Names of non-leaders for this Winner
+				{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 == $tpa1]) return $orgid1) == 1]} #{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 == $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:$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:$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:$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 $orgname2} // Subcontractor names
+				{OPT-320-LotResult[count(for text:$tender1 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 == $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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-720-Tender[BT-720-Tender[OPT-321-Tender == $tender3] != -1]/@currencyID )}} // Value of the tender
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-162-Tender[OPT-321-Tender == $tender3]/@currencyID)}} // Concession Revenue User
+						{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-162)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-162)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-162)-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-162)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-162)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-162)-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-162)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-162)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-162)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 					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)
 						{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-162)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-162)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-162)-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-162)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-162)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-162)-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-162)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-162)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-162)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 					0 {OPT-320-LotResult[some number:$revenue1 in (for text:$tender1 in OPT-320-LotResult return BT-160-Tender[OPT-321-Tender == $tender1]) satisfies $revenue1 != -1]} #{field|name|BT-160-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$revenue2 in BT-160-Tender[OPT-321-Tender == $tender2] return format-number($revenue2, '###,##0.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.',BT-160-Tender[OPT-321-Tender == $tender3]/@currencyID)}} // Concession Revenue Buyer (Tender)
+						{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-160)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-160)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-160)-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-160)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-160)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-160)-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-160)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-160)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-160)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 					0 {OPT-320-LotResult[some number:$revenue1 in (for text:$tender1 in OPT-320-LotResult return BT-160-Tender[OPT-321-Tender == $tender1]) satisfies $revenue1 == -1]} #{field|name|BT-160-Tender}: #{auxiliary|text|unpublished} // Concession Revenue Buyer (Tender) (unpublished)
 						{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-160)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-160)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-160)-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-160)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-160)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-160)-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-160)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-160)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-160)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 					0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return BT-163-Tender[BT-163-Tender[OPT-321-Tender == $tender1] != 'unpublished'])>0]} #{field|name|BT-163-Tender}: ${for text:$tender in OPT-320-LotResult, text:$description in BT-163-Tender[OPT-321-Tender == $tender] return $description} // Concession Value Description (Tender)
+						{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[count(for text:$tender1 in OPT-320-LotResult return BT-163-Tender[BT-163-Tender[OPT-321-Tender == $tender1] == 'unpublished'])>0]} #{field|name|BT-163-Tender}: #{auxiliary|text|unpublished} // Concession Value Description (Tender) (unpublished)
 						{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-193-Tender is present] == $tender1]) > 0)]} #{field|name|BT-193-Tender}: #{code|name|${if (some indicator:$tvariant in (for text:$tender3 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender3]) satisfies $tvariant == TRUE) then 'indicator.true' else 'indicator.false'}} // 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 == 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-193-Tender is present and (BT-195(BT-193)-Tender is not present or BT-193-Tender == TRUE)] == $tender1]) > 0)]} #{field|name|BT-193-Tender}: #{code|name|${if (some indicator:$tvariant in (for text:$tender2 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender2]) satisfies $tvariant == TRUE) then 'indicator.true' else 'indicator.false'}} // The tender is a variant
+					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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-195(BT-193)-Tender is present and BT-193-Tender == FALSE] == $tender1]) > 0)]} #{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('applicability.',BT-773-Tender[OPT-321-Tender == $tender2])}} // Subcontracting
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-730-Tender is present and (BT-195(BT-730)-Tender is not present or BT-730-Tender == TRUE)] == $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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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 OPT-321-Tender[OPT-321-Tender[BT-195(BT-730)-Tender is present and BT-730-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID)}} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{auxiliary|text|unpublished} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-731-Tender is present and (BT-195(BT-731)-Tender is not present or BT-731-Tender == TRUE)] == $tender1]) > 0)]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk == 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-195(BT-731)-Tender is present and BT-731-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-555-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-555-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] == -1]) > 0]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // 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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies ($desc1 != '' and $desc1 != 'unpublished')]} #{field|name|BT-554-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-554-Tender[OPT-321-Tender == $tender2] return $desc2} // Subcontracting Description
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-554)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
@@ -334,12 +435,21 @@
 		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
+					{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 {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
+				{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 {BT-635-LotResult[BT-635-LotResult != -1]} #{field|name|BT-635-LotResult}: ${BT-635-LotResult} // 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 {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
@@ -349,13 +459,22 @@
 				{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
+					{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-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
+					{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
+						{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 {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
@@ -365,6 +484,9 @@
 					{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
+						{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 {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
@@ -441,10 +563,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
diff --git a/view-templates/33.efx b/view-templates/33.efx
index 4cbd24e32..6bcd4f688 100644
--- a/view-templates/33.efx
+++ b/view-templates/33.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{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
@@ -13,11 +13,17 @@
 		{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
+			{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-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
+			{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
 		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
@@ -71,41 +77,65 @@
 		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
+					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
+					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
+					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-539-LotsGroup == 'unpublished' ]} #{field|name|BT-539-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Type (unpublished)
 					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
 					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
 					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup != 'unpublished']} #{field|name|BT-734-LotsGroup}: ${BT-734-LotsGroup} // Criterion Name
+					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup == 'unpublished']} #{field|name|BT-734-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup != 'unpublished']} #{field|name|BT-540-LotsGroup}: ${BT-540-LotsGroup} // Award Criterion Description
+					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup == 'unpublished']} #{field|name|BT-540-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup != 'unpublished']} #{BT-5421-LotsGroup}: ${format-number(BT-541-LotsGroup-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup == 'unpublished']} ${BT-5421-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Weight (unpublished) / Award Criterion Number
 					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup != 'unpublished']} #{BT-5422-LotsGroup}: ${format-number(BT-541-LotsGroup-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup == 'unpublished']} ${BT-5422-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup != 'unpublished']} #{BT-5423-LotsGroup}: ${format-number(BT-541-LotsGroup-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup == 'unpublished']} ${BT-5423-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup != 'unpublished']} #{field|name|BT-543-LotsGroup}: ${BT-543-LotsGroup} // Award Criteria Complicated
+				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup == 'unpublished']} #{field|name|BT-543-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup != 'unpublished']} #{field|name|BT-733-LotsGroup}: ${BT-733-LotsGroup} // Award Criteria Order Justification
+				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-198(BT-733)-LotsGroup is present]} #{field|name|BT-198(BT-733)-LotsGroup}: ${BT-198(BT-733)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup == 'unpublished']} #{field|name|BT-733-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Order Justification (unpublished)
 				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
@@ -119,7 +149,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -165,41 +194,65 @@
 		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
+					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
+					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
+					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-539-Lot == 'unpublished']} #{field|name|BT-539-Lot}: #{auxiliary|text|unpublished} // Type (unpublished)
 					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
 					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
 					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot != 'unpublished']} #{field|name|BT-734-Lot}: ${BT-734-Lot} // Criterion Name
+					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot == 'unpublished']} #{field|name|BT-734-Lot}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot != 'unpublished']} #{field|name|BT-540-Lot}: ${BT-540-Lot} // Award Criterion Description
+					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot == 'unpublished']} #{field|name|BT-540-Lot}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot != 'unpublished']} #{BT-5421-Lot}: ${format-number(BT-541-Lot-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Weight / Award Criterion Number (unpublished)
 					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot != 'unpublished']} #{BT-5422-Lot}: ${format-number(BT-541-Lot-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot != 'unpublished']} #{BT-5423-Lot}: ${format-number(BT-541-Lot-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot != 'unpublished']} #{field|name|BT-543-Lot}: ${BT-543-Lot} // Award Criteria Complicated
+				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot == 'unpublished']} #{field|name|BT-543-Lot}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot != 'unpublished']} #{field|name|BT-733-Lot}: ${BT-733-Lot} // Justification for not indicating the weighing of the award criteria
+				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriteria[BT-198(BT-733)-Lot is present]} #{field|name|BT-198(BT-733)-Lot}: ${BT-198(BT-733)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot == 'unpublished']} #{field|name|BT-733-Lot}: #{auxiliary|text|unpublished} // Justification for not indicating the weighing of the award criteria (unpublished)
 				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
@@ -225,32 +278,50 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // eSender
 6 {ND-NoticeResult} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-161-NoticeResult/@currencyID)}} // Notice Value (Value of all contracts awarded in this procedure)
+		{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-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 {BT-118-NoticeResult[BT-118-NoticeResult != -1]} #{field|name|BT-118-NoticeResult}: ${format-number(BT-118-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-118-NoticeResult/@currencyID)}} // The maximum value of the framework agreement(s) in this notice
+		{ND-NoticeMaximumValueUnpublish} #{field|name|BT-197(BT-118)-NoticeResult}: #{BT-197(BT-118)-NoticeResult} // Unpublished Justification Code
+		{ND-NoticeMaximumValueUnpublish[BT-196(BT-118)-NoticeResult is present]} #{field|name|BT-196(BT-118)-NoticeResult}: ${BT-196(BT-118)-NoticeResult} // Unpublished Justification Description
+		{ND-NoticeMaximumValueUnpublish[BT-198(BT-118)-NoticeResult is present]} #{field|name|BT-198(BT-118)-NoticeResult}: ${BT-198(BT-118)-NoticeResult} // Unpublished Access Date
 	0 {BT-118-NoticeResult[BT-118-NoticeResult == -1]} #{field|name|BT-118-NoticeResult}: #{auxiliary|text|unpublished} // The maximum value of the framework agreement(s) in this notice (unpublished)
 		{ND-NoticeMaximumValueUnpublish} #{field|name|BT-197(BT-118)-NoticeResult}: #{BT-197(BT-118)-NoticeResult} // Unpublished Justification Code
 		{ND-NoticeMaximumValueUnpublish[BT-196(BT-118)-NoticeResult is present]} #{field|name|BT-196(BT-118)-NoticeResult}: ${BT-196(BT-118)-NoticeResult} // Unpublished Justification Description
 		{ND-NoticeMaximumValueUnpublish[BT-198(BT-118)-NoticeResult is present]} #{field|name|BT-198(BT-118)-NoticeResult}: ${BT-198(BT-118)-NoticeResult} // Unpublished Access Date
 	0 {BT-1118-NoticeResult[BT-1118-NoticeResult != -1]} #{field|name|BT-1118-NoticeResult}: ${format-number(BT-1118-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-1118-NoticeResult/@currencyID)}} // The approximate value of the framework agreements in this notice
+		{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 {BT-1118-NoticeResult[BT-1118-NoticeResult == -1]} #{field|name|BT-1118-NoticeResult}: #{auxiliary|text|unpublished} // The approximate value of the framework agreements in this notice (unpublished)
 		{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
+		{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
+		{ND-GroupMaximalValueIdentifierUnpublish[BT-198(BT-556)-NoticeResult is present]} #{field|name|BT-198(BT-556)-NoticeResult}: ${BT-198(BT-556)-NoticeResult} // Unpublished Access Date
 		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.##')} #{code|name|${concat('currency.', BT-156-NoticeResult/@currencyID)}} // Maximum value of the framework agreements in this group of lots
+			{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-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.##')} #{code|name|${concat('currency.', BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Re-estimated value of the framework agreements within a group of lots
+			{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 {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
@@ -261,106 +332,160 @@
 		{ND-GroupMaximalValueIdentifierUnpublish[BT-198(BT-556)-NoticeResult is present]} #{field|name|BT-198(BT-556)-NoticeResult}: ${BT-198(BT-556)-NoticeResult} // Unpublished Access Date
 		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.##')} #{code|name|${concat('currency.', BT-156-NoticeResult[BT-156-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Maximum value of the framework agreements in this group of lots
+			{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-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.##')} #{code|name|${concat('currency.', BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Re-estimated value of the framework agreements within a group of lots
+			{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 {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-DirectAward} #{auxiliary|text|direct-award}: // Direct award
 		0 {BT-136-Procedure[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
+			{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
 		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
 		0 {ND-DirectAward[BT-135-Procedure != 'unpublished']} #{field|name|BT-135-Procedure}: ${BT-135-Procedure} // Other justification
+			{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-135-Procedure == 'unpublished']} #{field|name|BT-135-Procedure}: #{auxiliary|text|unpublished} // Other justification (unpublished)
 			{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 {BT-1252-Procedure[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
+			{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
 		0 {BT-1252-Procedure[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 ?
+			{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-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
+			{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 {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.##')} #{code|name|${concat('currency.', BT-709-LotResult/@currencyID)}} // Framework Maximum Value
+				{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-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.##')} #{code|name|${concat('currency.', BT-660-LotResult/@currencyID)}} // Framework Re-estimated Value
+				{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
 			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
+		2 {ND-LotResult[BT-02-notice in ('veat','can-modif') or ((BT-142-LotResult in ('selec-w','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:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-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:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the 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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $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 == $tpa1]) return $orgid1) == 1]} #{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 == $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 $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[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the tendering party for this Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $org2} // Names of non-leaders for this Winner
+				{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 == $tpa1]) return $orgid1) == 1]} #{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 == $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:$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:$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:$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 $orgname2} // Subcontractor names
+				{OPT-320-LotResult[count(for text:$tender1 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 == $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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-720-Tender[BT-720-Tender[OPT-321-Tender == $tender3] != -1]/@currencyID )}} // Value of the tender
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-1711-Tender is present] == $tender1]) > 0]} #{field|name|BT-1711-Tender}: #{code|name|${if (some indicator:$tranked in (for text:$tender2 in OPT-320-LotResult return BT-1711-Tender[OPT-321-Tender == $tender2]) satisfies $tranked == TRUE) then 'indicator.true' else 'indicator.false'}} // 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-193-Tender is present] == $tender1]) > 0)]} #{field|name|BT-193-Tender}: #{code|name|${if (some indicator:$tvariant in (for text:$tender3 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender3]) satisfies $tvariant == TRUE) then 'indicator.true' else 'indicator.false'}} // 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 == 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-193-Tender is present and (BT-195(BT-193)-Tender is not present or BT-193-Tender == TRUE)] == $tender1]) > 0)]} #{field|name|BT-193-Tender}: #{code|name|${if (some indicator:$tvariant in (for text:$tender2 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender2]) satisfies $tvariant == TRUE) then 'indicator.true' else 'indicator.false'}} // The tender is a variant
+					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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-195(BT-193)-Tender is present and BT-193-Tender == FALSE] == $tender1]) > 0)]} #{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('applicability.',BT-773-Tender[OPT-321-Tender == $tender2])}} // Subcontracting
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-730-Tender is present and (BT-195(BT-730)-Tender is not present or BT-730-Tender == TRUE)] == $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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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 OPT-321-Tender[OPT-321-Tender[BT-195(BT-730)-Tender is present and BT-730-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID)}} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{auxiliary|text|unpublished} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-731-Tender is present and (BT-195(BT-731)-Tender is not present or BT-731-Tender == TRUE)] == $tender1]) > 0)]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk == 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-195(BT-731)-Tender is present and BT-731-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-555-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-555-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] == -1]) > 0]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // 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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies ($desc1 != '' and $desc1 != 'unpublished')]} #{field|name|BT-554-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-554-Tender[OPT-321-Tender == $tender2] return $desc2} // Subcontracting Description
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-554)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
@@ -385,12 +510,21 @@
 		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
+					{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 {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
+				{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 {BT-635-LotResult[BT-635-LotResult != -1]} #{field|name|BT-635-LotResult}: ${BT-635-LotResult} // 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 {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
@@ -400,13 +534,22 @@
 				{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
+					{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-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
+					{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
+						{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 {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
@@ -416,6 +559,9 @@
 					{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
+						{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 {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
@@ -494,10 +640,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
diff --git a/view-templates/34.efx b/view-templates/34.efx
index 1e983c673..2ef320c9e 100644
--- a/view-templates/34.efx
+++ b/view-templates/34.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{BT-10-Procedure-Buyer} #{field|name|BT-10-Procedure-Buyer}: #value // Activity of the contracting authority
 		{BT-610-Procedure-Buyer} #{field|name|BT-610-Procedure-Buyer}: #{BT-610-Procedure-Buyer} // Activity Entity
 2 {ND-Root} #{auxiliary|text|procedure} // 2. Procedure
@@ -14,11 +14,17 @@
 		{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
+			{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-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
+			{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
 		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
@@ -72,41 +78,65 @@
 		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
+					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
+					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
+					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-539-LotsGroup == 'unpublished' ]} #{field|name|BT-539-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Type (unpublished)
 					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
 					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
 					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup != 'unpublished']} #{field|name|BT-734-LotsGroup}: ${BT-734-LotsGroup} // Criterion Name
+					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup == 'unpublished']} #{field|name|BT-734-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup != 'unpublished']} #{field|name|BT-540-LotsGroup}: ${BT-540-LotsGroup} // Award Criterion Description
+					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup == 'unpublished']} #{field|name|BT-540-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup != 'unpublished']} #{BT-5421-LotsGroup}: ${format-number(BT-541-LotsGroup-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup == 'unpublished']} ${BT-5421-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Weight (unpublished) / Award Criterion Number
 					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup != 'unpublished']} #{BT-5422-LotsGroup}: ${format-number(BT-541-LotsGroup-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup == 'unpublished']} ${BT-5422-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup != 'unpublished']} #{BT-5423-LotsGroup}: ${format-number(BT-541-LotsGroup-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup == 'unpublished']} ${BT-5423-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup != 'unpublished']} #{field|name|BT-543-LotsGroup}: ${BT-543-LotsGroup} // Award Criteria Complicated
+				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup == 'unpublished']} #{field|name|BT-543-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup != 'unpublished']} #{field|name|BT-733-LotsGroup}: ${BT-733-LotsGroup} // Award Criteria Order Justification
+				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-198(BT-733)-LotsGroup is present]} #{field|name|BT-198(BT-733)-LotsGroup}: ${BT-198(BT-733)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup == 'unpublished']} #{field|name|BT-733-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Order Justification (unpublished)
 				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
@@ -120,7 +150,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -166,41 +195,65 @@
 		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
+					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
+					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
+					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-539-Lot == 'unpublished']} #{field|name|BT-539-Lot}: #{auxiliary|text|unpublished} // Type (unpublished)
 					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
 					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
 					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot != 'unpublished']} #{field|name|BT-734-Lot}: ${BT-734-Lot} // Criterion Name
+					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot == 'unpublished']} #{field|name|BT-734-Lot}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot != 'unpublished']} #{field|name|BT-540-Lot}: ${BT-540-Lot} // Award Criterion Description
+					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot == 'unpublished']} #{field|name|BT-540-Lot}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot != 'unpublished']} #{BT-5421-Lot}: ${format-number(BT-541-Lot-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Weight / Award Criterion Number (unpublished)
 					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot != 'unpublished']} #{BT-5422-Lot}: ${format-number(BT-541-Lot-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot != 'unpublished']} #{BT-5423-Lot}: ${format-number(BT-541-Lot-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot != 'unpublished']} #{field|name|BT-543-Lot}: ${BT-543-Lot} // Award Criteria Complicated
+				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot == 'unpublished']} #{field|name|BT-543-Lot}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot != 'unpublished']} #{field|name|BT-733-Lot}: ${BT-733-Lot} // Justification for not indicating the weighing of the award criteria
+				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriteria[BT-198(BT-733)-Lot is present]} #{field|name|BT-198(BT-733)-Lot}: ${BT-198(BT-733)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot == 'unpublished']} #{field|name|BT-733-Lot}: #{auxiliary|text|unpublished} // Justification for not indicating the weighing of the award criteria (unpublished)
 				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
@@ -226,32 +279,50 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // eSender
 6 {ND-NoticeResult} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-161-NoticeResult/@currencyID)}} // Notice Value (Value of all contracts awarded in this procedure)
+		{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-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 {BT-118-NoticeResult[BT-118-NoticeResult != -1]} #{field|name|BT-118-NoticeResult}: ${format-number(BT-118-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-118-NoticeResult/@currencyID)}} // The maximum value of the framework agreement(s) in this notice
+		{ND-NoticeMaximumValueUnpublish} #{field|name|BT-197(BT-118)-NoticeResult}: #{BT-197(BT-118)-NoticeResult} // Unpublished Justification Code
+		{ND-NoticeMaximumValueUnpublish[BT-196(BT-118)-NoticeResult is present]} #{field|name|BT-196(BT-118)-NoticeResult}: ${BT-196(BT-118)-NoticeResult} // Unpublished Justification Description
+		{ND-NoticeMaximumValueUnpublish[BT-198(BT-118)-NoticeResult is present]} #{field|name|BT-198(BT-118)-NoticeResult}: ${BT-198(BT-118)-NoticeResult} // Unpublished Access Date
 	0 {BT-118-NoticeResult[BT-118-NoticeResult == -1]} #{field|name|BT-118-NoticeResult}: #{auxiliary|text|unpublished} // The maximum value of the framework agreement(s) in this notice (unpublished)
 		{ND-NoticeMaximumValueUnpublish} #{field|name|BT-197(BT-118)-NoticeResult}: #{BT-197(BT-118)-NoticeResult} // Unpublished Justification Code
 		{ND-NoticeMaximumValueUnpublish[BT-196(BT-118)-NoticeResult is present]} #{field|name|BT-196(BT-118)-NoticeResult}: ${BT-196(BT-118)-NoticeResult} // Unpublished Justification Description
 		{ND-NoticeMaximumValueUnpublish[BT-198(BT-118)-NoticeResult is present]} #{field|name|BT-198(BT-118)-NoticeResult}: ${BT-198(BT-118)-NoticeResult} // Unpublished Access Date
 	0 {BT-1118-NoticeResult[BT-1118-NoticeResult != -1]} #{field|name|BT-1118-NoticeResult}: ${format-number(BT-1118-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-1118-NoticeResult/@currencyID)}} // The approximate value of the framework agreements in this notice
+		{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 {BT-1118-NoticeResult[BT-1118-NoticeResult == -1]} #{field|name|BT-1118-NoticeResult}: #{auxiliary|text|unpublished} // The approximate value of the framework agreements in this notice (unpublished)
 		{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
+		{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
+		{ND-GroupMaximalValueIdentifierUnpublish[BT-198(BT-556)-NoticeResult is present]} #{field|name|BT-198(BT-556)-NoticeResult}: ${BT-198(BT-556)-NoticeResult} // Unpublished Access Date
 		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.##')} #{code|name|${concat('currency.', BT-156-NoticeResult/@currencyID)}} // Maximum value of the framework agreements in this group of lots
+			{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-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.##')} #{code|name|${concat('currency.', BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Re-estimated value of the framework agreements within a group of lots
+			{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 {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
@@ -262,106 +333,160 @@
 		{ND-GroupMaximalValueIdentifierUnpublish[BT-198(BT-556)-NoticeResult is present]} #{field|name|BT-198(BT-556)-NoticeResult}: ${BT-198(BT-556)-NoticeResult} // Unpublished Access Date
 		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.##')} #{code|name|${concat('currency.', BT-156-NoticeResult[BT-156-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Maximum value of the framework agreements in this group of lots
+			{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-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.##')} #{code|name|${concat('currency.', BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Re-estimated value of the framework agreements within a group of lots
+			{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 {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-DirectAward} #{auxiliary|text|direct-award}: // Direct award
 		0 {BT-136-Procedure[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
+			{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
 		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
 		0 {ND-DirectAward[BT-135-Procedure != 'unpublished']} #{field|name|BT-135-Procedure}: ${BT-135-Procedure} // Other justification
+			{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-135-Procedure == 'unpublished']} #{field|name|BT-135-Procedure}: #{auxiliary|text|unpublished} // Other justification (unpublished)
 			{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 {BT-1252-Procedure[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
+			{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
 		0 {BT-1252-Procedure[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 ?
+			{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-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
+			{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 {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.##')} #{code|name|${concat('currency.', BT-709-LotResult/@currencyID)}} // Framework Maximum Value
+				{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-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.##')} #{code|name|${concat('currency.', BT-660-LotResult/@currencyID)}} // Framework Re-estimated Value
+				{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
 			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
+		2 {ND-LotResult[BT-02-notice in ('veat','can-modif') or ((BT-142-LotResult in ('selec-w','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:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-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:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the 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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $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 == $tpa1]) return $orgid1) == 1]} #{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 == $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 $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[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the tendering party for this Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $org2} // Names of non-leaders for this Winner
+				{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 == $tpa1]) return $orgid1) == 1]} #{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 == $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:$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:$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:$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 $orgname2} // Subcontractor names
+				{OPT-320-LotResult[count(for text:$tender1 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 == $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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-720-Tender[BT-720-Tender[OPT-321-Tender == $tender3] != -1]/@currencyID )}} // Value of the tender
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-1711-Tender is present] == $tender1]) > 0]} #{field|name|BT-1711-Tender}: #{code|name|${if (some indicator:$tranked in (for text:$tender2 in OPT-320-LotResult return BT-1711-Tender[OPT-321-Tender == $tender2]) satisfies $tranked == TRUE) then 'indicator.true' else 'indicator.false'}} // 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-193-Tender is present] == $tender1]) > 0)]} #{field|name|BT-193-Tender}: #{code|name|${if (some indicator:$tvariant in (for text:$tender3 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender3]) satisfies $tvariant == TRUE) then 'indicator.true' else 'indicator.false'}} // 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 == 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-193-Tender is present and (BT-195(BT-193)-Tender is not present or BT-193-Tender == TRUE)] == $tender1]) > 0)]} #{field|name|BT-193-Tender}: #{code|name|${if (some indicator:$tvariant in (for text:$tender2 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender2]) satisfies $tvariant == TRUE) then 'indicator.true' else 'indicator.false'}} // The tender is a variant
+					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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-195(BT-193)-Tender is present and BT-193-Tender == FALSE] == $tender1]) > 0)]} #{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('applicability.',BT-773-Tender[OPT-321-Tender == $tender2])}} // Subcontracting
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-730-Tender is present and (BT-195(BT-730)-Tender is not present or BT-730-Tender == TRUE)] == $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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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 OPT-321-Tender[OPT-321-Tender[BT-195(BT-730)-Tender is present and BT-730-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID)}} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{auxiliary|text|unpublished} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-731-Tender is present and (BT-195(BT-731)-Tender is not present or BT-731-Tender == TRUE)] == $tender1]) > 0)]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk == 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-195(BT-731)-Tender is present and BT-731-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-555-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-555-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] == -1]) > 0]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // 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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies ($desc1 != '' and $desc1 != 'unpublished')]} #{field|name|BT-554-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-554-Tender[OPT-321-Tender == $tender2] return $desc2} // Subcontracting Description
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-554)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
@@ -386,12 +511,21 @@
 		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
+					{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 {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
+				{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 {BT-635-LotResult[BT-635-LotResult != -1]} #{field|name|BT-635-LotResult}: ${BT-635-LotResult} // 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 {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
@@ -401,13 +535,22 @@
 				{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
+					{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-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
+					{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
+						{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 {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
@@ -417,6 +560,9 @@
 					{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
+						{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 {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
@@ -495,10 +641,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
diff --git a/view-templates/35.efx b/view-templates/35.efx
index 3e1b4ac7b..d14a3f8bd 100644
--- a/view-templates/35.efx
+++ b/view-templates/35.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // 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
 		{BT-610-Procedure-Buyer} #{field|name|BT-610-Procedure-Buyer}: #{BT-610-Procedure-Buyer} // Activity Entity
@@ -15,6 +15,9 @@
 		{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 {ND-ProcedureProcurementScope[BT-88-Procedure != 'unpublished']} #{field|name|BT-88-Procedure}: ${BT-88-Procedure} // Procedure Features / Description of the procedure
+			{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
 		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
@@ -65,41 +68,65 @@
 		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
+					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
+					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
+					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-539-LotsGroup == 'unpublished' ]} #{field|name|BT-539-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Type (unpublished)
 					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
 					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
 					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup != 'unpublished']} #{field|name|BT-734-LotsGroup}: ${BT-734-LotsGroup} // Criterion Name
+					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup == 'unpublished']} #{field|name|BT-734-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup != 'unpublished']} #{field|name|BT-540-LotsGroup}: ${BT-540-LotsGroup} // Award Criterion Description
+					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup == 'unpublished']} #{field|name|BT-540-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup != 'unpublished']} #{BT-5421-LotsGroup}: ${format-number(BT-541-LotsGroup-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup == 'unpublished']} ${BT-5421-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Weight (unpublished) / Award Criterion Number
 					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup != 'unpublished']} #{BT-5422-LotsGroup}: ${format-number(BT-541-LotsGroup-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup == 'unpublished']} ${BT-5422-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup != 'unpublished']} #{BT-5423-LotsGroup}: ${format-number(BT-541-LotsGroup-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup == 'unpublished']} ${BT-5423-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup != 'unpublished']} #{field|name|BT-543-LotsGroup}: ${BT-543-LotsGroup} // Award Criteria Complicated
+				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup == 'unpublished']} #{field|name|BT-543-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup != 'unpublished']} #{field|name|BT-733-LotsGroup}: ${BT-733-LotsGroup} // Award Criteria Order Justification
+				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-198(BT-733)-LotsGroup is present]} #{field|name|BT-198(BT-733)-LotsGroup}: ${BT-198(BT-733)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup == 'unpublished']} #{field|name|BT-733-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Order Justification (unpublished)
 				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
@@ -113,7 +140,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -158,41 +184,65 @@
 		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
+					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
+					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
+					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-539-Lot == 'unpublished']} #{field|name|BT-539-Lot}: #{auxiliary|text|unpublished} // Type (unpublished)
 					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
 					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
 					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot != 'unpublished']} #{field|name|BT-734-Lot}: ${BT-734-Lot} // Criterion Name
+					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot == 'unpublished']} #{field|name|BT-734-Lot}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot != 'unpublished']} #{field|name|BT-540-Lot}: ${BT-540-Lot} // Award Criterion Description
+					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot == 'unpublished']} #{field|name|BT-540-Lot}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot != 'unpublished']} #{BT-5421-Lot}: ${format-number(BT-541-Lot-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Weight / Award Criterion Number (unpublished)
 					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot != 'unpublished']} #{BT-5422-Lot}: ${format-number(BT-541-Lot-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot != 'unpublished']} #{BT-5423-Lot}: ${format-number(BT-541-Lot-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot != 'unpublished']} #{field|name|BT-543-Lot}: ${BT-543-Lot} // Award Criteria Complicated
+				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot == 'unpublished']} #{field|name|BT-543-Lot}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot != 'unpublished']} #{field|name|BT-733-Lot}: ${BT-733-Lot} // Justification for not indicating the weighing of the award criteria
+				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriteria[BT-198(BT-733)-Lot is present]} #{field|name|BT-198(BT-733)-Lot}: ${BT-198(BT-733)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot == 'unpublished']} #{field|name|BT-733-Lot}: #{auxiliary|text|unpublished} // Justification for not indicating the weighing of the award criteria (unpublished)
 				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
@@ -212,104 +262,155 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // eSender
 6 {ND-NoticeResult} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-161-NoticeResult/@currencyID)}} // Notice Value (Value of all contracts awarded in this procedure)
+		{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-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 {BT-136-Procedure[BT-136-Procedure != 'unpublished']} #{field|name|BT-136-Procedure}: #{BT-136-Procedure} // Justification for direct award
+			{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
 		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
 		0 {ND-DirectAward[BT-135-Procedure != 'unpublished']} #{field|name|BT-135-Procedure}: ${BT-135-Procedure} // Other justification
+			{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-135-Procedure == 'unpublished']} #{field|name|BT-135-Procedure}: #{auxiliary|text|unpublished} // Other justification (unpublished)
 			{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 {BT-1252-Procedure[BT-1252-Procedure != 'unpublished']} #{field|name|BT-1252-Procedure}: ${BT-1252-Procedure} // Identifier of the previous procedure that justifies direct award
+			{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
 		0 {BT-1252-Procedure[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 ?
+			{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-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
+			{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 {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
+		2 {ND-LotResult[BT-02-notice in ('veat','can-modif') or ((BT-142-LotResult in ('selec-w','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:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-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:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the 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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $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 == $tpa1]) return $orgid1) == 1]} #{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 == $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 $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[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the tendering party for this Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $org2} // Names of non-leaders for this Winner
+				{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 == $tpa1]) return $orgid1) == 1]} #{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 == $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:$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:$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:$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 $orgname2} // Subcontractor names
+				{OPT-320-LotResult[count(for text:$tender1 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 == $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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-720-Tender[BT-720-Tender[OPT-321-Tender == $tender3] != -1]/@currencyID )}} // Value of the tender
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-162-Tender[OPT-321-Tender == $tender3]/@currencyID)}} // Concession Revenue User
+						{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-162)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-162)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-162)-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-162)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-162)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-162)-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-162)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-162)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-162)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 					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)
 						{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-162)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-162)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-162)-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-162)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-162)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-162)-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-162)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-162)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-162)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 					0 {OPT-320-LotResult[some number:$revenue1 in (for text:$tender1 in OPT-320-LotResult return BT-160-Tender[OPT-321-Tender == $tender1]) satisfies $revenue1 != -1]} #{field|name|BT-160-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$revenue2 in BT-160-Tender[OPT-321-Tender == $tender2] return format-number($revenue2, '###,##0.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.',BT-160-Tender[OPT-321-Tender == $tender3]/@currencyID)}} // Concession Revenue Buyer (Tender)
+						{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-160)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-160)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-160)-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-160)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-160)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-160)-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-160)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-160)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-160)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 					0 {OPT-320-LotResult[some number:$revenue1 in (for text:$tender1 in OPT-320-LotResult return BT-160-Tender[OPT-321-Tender == $tender1]) satisfies $revenue1 == -1]} #{field|name|BT-160-Tender}: #{auxiliary|text|unpublished} // Concession Revenue Buyer (Tender) (unpublished)
 						{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-160)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-160)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-160)-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-160)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-160)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-160)-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-160)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-160)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-160)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 					0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return BT-163-Tender[BT-163-Tender[OPT-321-Tender == $tender1] != 'unpublished'])>0]} #{field|name|BT-163-Tender}: ${for text:$tender in OPT-320-LotResult, text:$description in BT-163-Tender[OPT-321-Tender == $tender] return $description} // Concession Value Description (Tender)
+						{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[count(for text:$tender1 in OPT-320-LotResult return BT-163-Tender[BT-163-Tender[OPT-321-Tender == $tender1] == 'unpublished'])>0]} #{field|name|BT-163-Tender}: #{auxiliary|text|unpublished} // Concession Value Description (Tender) (unpublished)
 						{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-193-Tender is present] == $tender1]) > 0)]} #{field|name|BT-193-Tender}: #{code|name|${if (some indicator:$tvariant in (for text:$tender3 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender3]) satisfies $tvariant == TRUE) then 'indicator.true' else 'indicator.false'}} // 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 == 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-193-Tender is present and (BT-195(BT-193)-Tender is not present or BT-193-Tender == TRUE)] == $tender1]) > 0)]} #{field|name|BT-193-Tender}: #{code|name|${if (some indicator:$tvariant in (for text:$tender2 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender2]) satisfies $tvariant == TRUE) then 'indicator.true' else 'indicator.false'}} // The tender is a variant
+					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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-195(BT-193)-Tender is present and BT-193-Tender == FALSE] == $tender1]) > 0)]} #{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('applicability.',BT-773-Tender[OPT-321-Tender == $tender2])}} // Subcontracting
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-730-Tender is present and (BT-195(BT-730)-Tender is not present or BT-730-Tender == TRUE)] == $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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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 OPT-321-Tender[OPT-321-Tender[BT-195(BT-730)-Tender is present and BT-730-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID)}} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{auxiliary|text|unpublished} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-731-Tender is present and (BT-195(BT-731)-Tender is not present or BT-731-Tender == TRUE)] == $tender1]) > 0)]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk == 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-195(BT-731)-Tender is present and BT-731-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-555-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-555-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] == -1]) > 0]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // 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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies ($desc1 != '' and $desc1 != 'unpublished')]} #{field|name|BT-554-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-554-Tender[OPT-321-Tender == $tender2] return $desc2} // Subcontracting Description
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-554)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
@@ -334,12 +435,21 @@
 		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
+					{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 {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
+				{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 {BT-635-LotResult[BT-635-LotResult != -1]} #{field|name|BT-635-LotResult}: ${BT-635-LotResult} // 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 {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
@@ -349,13 +459,22 @@
 				{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
+					{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-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
+					{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
+						{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 {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
@@ -365,6 +484,9 @@
 					{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
+						{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 {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
@@ -441,10 +563,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
diff --git a/view-templates/36.efx b/view-templates/36.efx
index 6ae6c83ed..acaedd4c4 100644
--- a/view-templates/36.efx
+++ b/view-templates/36.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{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
@@ -13,11 +13,17 @@
 		{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
+			{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-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
+			{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
 		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
@@ -63,41 +69,65 @@
 		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
+					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
+					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
+					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-539-LotsGroup == 'unpublished' ]} #{field|name|BT-539-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Type (unpublished)
 					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
 					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
 					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup != 'unpublished']} #{field|name|BT-734-LotsGroup}: ${BT-734-LotsGroup} // Criterion Name
+					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup == 'unpublished']} #{field|name|BT-734-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup != 'unpublished']} #{field|name|BT-540-LotsGroup}: ${BT-540-LotsGroup} // Award Criterion Description
+					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup == 'unpublished']} #{field|name|BT-540-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup != 'unpublished']} #{BT-5421-LotsGroup}: ${format-number(BT-541-LotsGroup-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup == 'unpublished']} ${BT-5421-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Weight (unpublished) / Award Criterion Number
 					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup != 'unpublished']} #{BT-5422-LotsGroup}: ${format-number(BT-541-LotsGroup-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup == 'unpublished']} ${BT-5422-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup != 'unpublished']} #{BT-5423-LotsGroup}: ${format-number(BT-541-LotsGroup-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup == 'unpublished']} ${BT-5423-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup != 'unpublished']} #{field|name|BT-543-LotsGroup}: ${BT-543-LotsGroup} // Award Criteria Complicated
+				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup == 'unpublished']} #{field|name|BT-543-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup != 'unpublished']} #{field|name|BT-733-LotsGroup}: ${BT-733-LotsGroup} // Award Criteria Order Justification
+				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-198(BT-733)-LotsGroup is present]} #{field|name|BT-198(BT-733)-LotsGroup}: ${BT-198(BT-733)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup == 'unpublished']} #{field|name|BT-733-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Order Justification (unpublished)
 				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
@@ -111,7 +141,6 @@
 			{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
@@ -142,41 +171,65 @@
 		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
+					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
+					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
+					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-539-Lot == 'unpublished']} #{field|name|BT-539-Lot}: #{auxiliary|text|unpublished} // Type (unpublished)
 					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
 					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
 					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot != 'unpublished']} #{field|name|BT-734-Lot}: ${BT-734-Lot} // Criterion Name
+					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot == 'unpublished']} #{field|name|BT-734-Lot}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot != 'unpublished']} #{field|name|BT-540-Lot}: ${BT-540-Lot} // Award Criterion Description
+					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot == 'unpublished']} #{field|name|BT-540-Lot}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot != 'unpublished']} #{BT-5421-Lot}: ${format-number(BT-541-Lot-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Weight / Award Criterion Number (unpublished)
 					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot != 'unpublished']} #{BT-5422-Lot}: ${format-number(BT-541-Lot-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot != 'unpublished']} #{BT-5423-Lot}: ${format-number(BT-541-Lot-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot != 'unpublished']} #{field|name|BT-543-Lot}: ${BT-543-Lot} // Award Criteria Complicated
+				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot == 'unpublished']} #{field|name|BT-543-Lot}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot != 'unpublished']} #{field|name|BT-733-Lot}: ${BT-733-Lot} // Justification for not indicating the weighing of the award criteria
+				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriteria[BT-198(BT-733)-Lot is present]} #{field|name|BT-198(BT-733)-Lot}: ${BT-198(BT-733)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot == 'unpublished']} #{field|name|BT-733-Lot}: #{auxiliary|text|unpublished} // Justification for not indicating the weighing of the award criteria (unpublished)
 				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
@@ -195,40 +248,52 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // eSender
 6 {ND-NoticeResult} #{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 ?
+			{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-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
+			{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 {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
-		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
+		2 {ND-LotResult[BT-02-notice in ('veat','can-modif') or ((BT-142-LotResult in ('selec-w','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:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-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:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the 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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $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 == $tpa1]) return $orgid1) == 1]} #{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 == $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 $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[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the tendering party for this Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $org2} // Names of non-leaders for this Winner
+				{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 == $tpa1]) return $orgid1) == 1]} #{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 == $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:$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:$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:$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 $orgname2} // Subcontractor names
+				{OPT-320-LotResult[count(for text:$tender1 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 == $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 OPT-321-Tender[OPT-321-Tender[BT-1711-Tender is present] == $tender1]) > 0]} #{field|name|BT-1711-Tender}: #{code|name|${if (some indicator:$tranked in (for text:$tender2 in OPT-320-LotResult return BT-1711-Tender[OPT-321-Tender == $tender2]) satisfies $tranked == TRUE) then 'indicator.true' else 'indicator.false'}} // 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-193-Tender is present] == $tender1]) > 0)]} #{field|name|BT-193-Tender}: #{code|name|${if (some indicator:$tvariant in (for text:$tender3 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender3]) satisfies $tvariant == TRUE) then 'indicator.true' else 'indicator.false'}} // 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 == 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-193-Tender is present and (BT-195(BT-193)-Tender is not present or BT-193-Tender == TRUE)] == $tender1]) > 0)]} #{field|name|BT-193-Tender}: #{code|name|${if (some indicator:$tvariant in (for text:$tender2 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender2]) satisfies $tvariant == TRUE) then 'indicator.true' else 'indicator.false'}} // The tender is a variant
+					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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-195(BT-193)-Tender is present and BT-193-Tender == FALSE] == $tender1]) > 0)]} #{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
@@ -250,12 +315,21 @@
 		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
+					{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 {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
+				{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 {BT-635-LotResult[BT-635-LotResult != -1]} #{field|name|BT-635-LotResult}: ${BT-635-LotResult} // 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 {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
@@ -265,13 +339,22 @@
 				{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
+					{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-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
+					{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
+						{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 {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
@@ -281,6 +364,9 @@
 					{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
+						{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 {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
@@ -355,10 +441,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
diff --git a/view-templates/37.efx b/view-templates/37.efx
index c6c62775f..18a4d40ea 100644
--- a/view-templates/37.efx
+++ b/view-templates/37.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{BT-10-Procedure-Buyer} #{field|name|BT-10-Procedure-Buyer}: #value // Activity of the contracting authority
 		{BT-610-Procedure-Buyer} #{field|name|BT-610-Procedure-Buyer}: #{BT-610-Procedure-Buyer} // Activity Entity
 2 {ND-Root} #{auxiliary|text|procedure} // 2. Procedure
@@ -14,11 +14,17 @@
 		{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
+			{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-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
+			{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
 		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
@@ -64,41 +70,65 @@
 		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
+					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
+					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
+					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-539-LotsGroup == 'unpublished' ]} #{field|name|BT-539-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Type (unpublished)
 					{BT-197(BT-539)-LotsGroup} #{field|name|BT-197(BT-539)-LotsGroup}: #{BT-197(BT-539)-LotsGroup} // Unpublished Justification Code
 					{BT-539-LotsGroup[BT-196(BT-539)-LotsGroup is present]} #{field|name|BT-196(BT-539)-LotsGroup}: ${BT-196(BT-539)-LotsGroup} // Unpublished Justification Description
 					{BT-539-LotsGroup[BT-198(BT-539)-LotsGroup is present]} #{field|name|BT-198(BT-539)-LotsGroup}: ${BT-198(BT-539)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup != 'unpublished']} #{field|name|BT-734-LotsGroup}: ${BT-734-LotsGroup} // Criterion Name
+					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-734-LotsGroup == 'unpublished']} #{field|name|BT-734-LotsGroup}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-LotsGroup} #{field|name|BT-197(BT-734)-LotsGroup}: #{BT-197(BT-734)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-734)-LotsGroup is present]} #{field|name|BT-196(BT-734)-LotsGroup}: ${BT-196(BT-734)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-734)-LotsGroup is present]} #{field|name|BT-198(BT-734)-LotsGroup}: ${BT-198(BT-734)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup != 'unpublished']} #{field|name|BT-540-LotsGroup}: ${BT-540-LotsGroup} // Award Criterion Description
+					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-540-LotsGroup == 'unpublished']} #{field|name|BT-540-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-LotsGroup} #{field|name|BT-197(BT-540)-LotsGroup}: #{BT-197(BT-540)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-196(BT-540)-LotsGroup is present]} #{field|name|BT-196(BT-540)-LotsGroup}: ${BT-196(BT-540)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriteriaNameUnpublish[BT-198(BT-540)-LotsGroup is present]} #{field|name|BT-198(BT-540)-LotsGroup}: ${BT-198(BT-540)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup != 'unpublished']} #{BT-5421-LotsGroup}: ${format-number(BT-541-LotsGroup-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5421-LotsGroup == 'unpublished']} ${BT-5421-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Weight (unpublished) / Award Criterion Number
 					{BT-197(BT-5421)-LotsGroup} #{field|name|BT-197(BT-5421)-LotsGroup}: #{BT-197(BT-5421)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-LotsGroup is present]} #{field|name|BT-196(BT-5421)-LotsGroup}: ${BT-196(BT-5421)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-LotsGroup is present]} #{field|name|BT-198(BT-5421)-LotsGroup}: ${BT-198(BT-5421)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup != 'unpublished']} #{BT-5422-LotsGroup}: ${format-number(BT-541-LotsGroup-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5422-LotsGroup == 'unpublished']} ${BT-5422-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-LotsGroup} #{field|name|BT-197(BT-5422)-LotsGroup}: #{BT-197(BT-5422)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-LotsGroup is present]} #{field|name|BT-196(BT-5422)-LotsGroup}: ${BT-196(BT-5422)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-LotsGroup is present]} #{field|name|BT-198(BT-5422)-LotsGroup}: ${BT-198(BT-5422)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup != 'unpublished']} #{BT-5423-LotsGroup}: ${format-number(BT-541-LotsGroup-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
+					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 				0 {ND-LotsGroupAwardCriterion[BT-5423-LotsGroup == 'unpublished']} ${BT-5423-LotsGroup}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-LotsGroup} #{field|name|BT-197(BT-5423)-LotsGroup}: #{BT-197(BT-5423)-LotsGroup} // Unpublished Justification Code
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-LotsGroup is present]} #{field|name|BT-196(BT-5423)-LotsGroup}: ${BT-196(BT-5423)-LotsGroup} // Unpublished Justification Description
 					{ND-LotsGroupAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-LotsGroup is present]} #{field|name|BT-198(BT-5423)-LotsGroup}: ${BT-198(BT-5423)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup != 'unpublished']} #{field|name|BT-543-LotsGroup}: ${BT-543-LotsGroup} // Award Criteria Complicated
+				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-543-LotsGroup == 'unpublished']} #{field|name|BT-543-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-LotsGroup} #{field|name|BT-197(BT-543)-LotsGroup}: #{BT-197(BT-543)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-LotsGroup is present]} #{field|name|BT-196(BT-543)-LotsGroup}: ${BT-196(BT-543)-LotsGroup} // Unpublished Justification Description
 				{ND-LotsGroupAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-LotsGroup is present]} #{field|name|BT-198(BT-543)-LotsGroup}: ${BT-198(BT-543)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup != 'unpublished']} #{field|name|BT-733-LotsGroup}: ${BT-733-LotsGroup} // Award Criteria Order Justification
+				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
+				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-198(BT-733)-LotsGroup is present]} #{field|name|BT-198(BT-733)-LotsGroup}: ${BT-198(BT-733)-LotsGroup} // Unpublished Access Date
 			0 {ND-LotsGroupAwardCriteria[BT-733-LotsGroup == 'unpublished']} #{field|name|BT-733-LotsGroup}: #{auxiliary|text|unpublished} // Award Criteria Order Justification (unpublished)
 				{BT-197(BT-733)-LotsGroup} #{field|name|BT-197(BT-733)-LotsGroup}: #{BT-197(BT-733)-LotsGroup} // Unpublished Justification Code
 				{ND-LotsGroupAwardCriteriaOrderJustificationUnpublish[BT-196(BT-733)-LotsGroup is present]} #{field|name|BT-196(BT-733)-LotsGroup}: ${BT-196(BT-733)-LotsGroup} // Unpublished Justification Description
@@ -112,7 +142,6 @@
 			{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
@@ -143,41 +172,65 @@
 		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
+					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
+					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
+					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-539-Lot == 'unpublished']} #{field|name|BT-539-Lot}: #{auxiliary|text|unpublished} // Type (unpublished)
 					{BT-197(BT-539)-Lot} #{field|name|BT-197(BT-539)-Lot}: #{BT-197(BT-539)-Lot} // Unpublished Justification Code
 					{BT-539-Lot[BT-196(BT-539)-Lot is present]} #{field|name|BT-196(BT-539)-Lot}: ${BT-196(BT-539)-Lot} // Unpublished Justification Description
 					{BT-539-Lot[BT-198(BT-539)-Lot is present]} #{field|name|BT-198(BT-539)-Lot}: ${BT-198(BT-539)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot != 'unpublished']} #{field|name|BT-734-Lot}: ${BT-734-Lot} // Criterion Name
+					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-734-Lot == 'unpublished']} #{field|name|BT-734-Lot}: #{auxiliary|text|unpublished} // Criterion Name (unpublished)
 					{BT-197(BT-734)-Lot} #{field|name|BT-197(BT-734)-Lot}: #{BT-197(BT-734)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-734)-Lot is present]} #{field|name|BT-196(BT-734)-Lot}: ${BT-196(BT-734)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-734)-Lot is present]} #{field|name|BT-198(BT-734)-Lot}: ${BT-198(BT-734)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot != 'unpublished']} #{field|name|BT-540-Lot}: ${BT-540-Lot} // Award Criterion Description
+					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardCriterion[BT-540-Lot == 'unpublished']} #{field|name|BT-540-Lot}: #{auxiliary|text|unpublished} // Award Criterion Description (unpublished)
 					{BT-197(BT-540)-Lot} #{field|name|BT-197(BT-540)-Lot}: #{BT-197(BT-540)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionParameters[BT-196(BT-540)-Lot is present]} #{field|name|BT-196(BT-540)-Lot}: ${BT-196(BT-540)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionParameters[BT-198(BT-540)-Lot is present]} #{field|name|BT-198(BT-540)-Lot}: ${BT-198(BT-540)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot != 'unpublished']} #{BT-5421-Lot}: ${format-number(BT-541-Lot-WeightNumber, '###,##0.###,###,###')} // Award Criterion Number Weight / Award Criterion Number
+					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardWeightCriterionParameter[BT-5421-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Weight / Award Criterion Number (unpublished)
 					{BT-197(BT-5421)-Lot} #{field|name|BT-197(BT-5421)-Lot}: #{BT-197(BT-5421)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-196(BT-5421)-Lot is present]} #{field|name|BT-196(BT-5421)-Lot}: ${BT-196(BT-5421)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberWeightUnpublish[BT-198(BT-5421)-Lot is present]} #{field|name|BT-198(BT-5421)-Lot}: ${BT-198(BT-5421)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot != 'unpublished']} #{BT-5422-Lot}: ${format-number(BT-541-Lot-FixedNumber, '###,##0.###,###,###')} // Award Criterion Number Fixed / Award Criterion Number
+					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardFixedCriterionParameter[BT-5422-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Fixed / Award Criterion Number (unpublished)
 					{BT-197(BT-5422)-Lot} #{field|name|BT-197(BT-5422)-Lot}: #{BT-197(BT-5422)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-196(BT-5422)-Lot is present]} #{field|name|BT-196(BT-5422)-Lot}: ${BT-196(BT-5422)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberFixUnpublish[BT-198(BT-5422)-Lot is present]} #{field|name|BT-198(BT-5422)-Lot}: ${BT-198(BT-5422)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot != 'unpublished']} #{BT-5423-Lot}: ${format-number(BT-541-Lot-ThresholdNumber, '###,##0.###,###,###')} // Award Criterion Number Threshold / Award Criterion Number
+					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
+					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 				0 {ND-LotAwardThresholdCriterionParameter[BT-5423-Lot == 'unpublished']} #{auxiliary|text|unpublished}: #{auxiliary|text|unpublished} // Award Criterion Number Threshold / Award Criterion Number (unpublished)
 					{BT-197(BT-5423)-Lot} #{field|name|BT-197(BT-5423)-Lot}: #{BT-197(BT-5423)-Lot} // Unpublished Justification Code
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-196(BT-5423)-Lot is present]} #{field|name|BT-196(BT-5423)-Lot}: ${BT-196(BT-5423)-Lot} // Unpublished Justification Description
 					{ND-LotAwardCriterionNumberThresholdUnpublish[BT-198(BT-5423)-Lot is present]} #{field|name|BT-198(BT-5423)-Lot}: ${BT-198(BT-5423)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot != 'unpublished']} #{field|name|BT-543-Lot}: ${BT-543-Lot} // Award Criteria Complicated
+				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-543-Lot == 'unpublished']} #{field|name|BT-543-Lot}: #{auxiliary|text|unpublished} // Award Criteria Complicated (unpublished)
 				{BT-197(BT-543)-Lot} #{field|name|BT-197(BT-543)-Lot}: #{BT-197(BT-543)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-196(BT-543)-Lot is present]} #{field|name|BT-196(BT-543)-Lot}: ${BT-196(BT-543)-Lot} // Unpublished Justification Description
 				{ND-LotAwardCriterionNumberComplicatedUnpublish[BT-198(BT-543)-Lot is present]} #{field|name|BT-198(BT-543)-Lot}: ${BT-198(BT-543)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot != 'unpublished']} #{field|name|BT-733-Lot}: ${BT-733-Lot} // Justification for not indicating the weighing of the award criteria
+				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
+				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
+				{ND-LotAwardCriteria[BT-198(BT-733)-Lot is present]} #{field|name|BT-198(BT-733)-Lot}: ${BT-198(BT-733)-Lot} // Unpublished Access Date
 			0 {ND-LotAwardCriteria[BT-733-Lot == 'unpublished']} #{field|name|BT-733-Lot}: #{auxiliary|text|unpublished} // Justification for not indicating the weighing of the award criteria (unpublished)
 				{BT-197(BT-733)-Lot} #{field|name|BT-197(BT-733)-Lot}: #{BT-197(BT-733)-Lot} // Unpublished Justification Code
 				{ND-LotAwardCriteria[BT-196(BT-733)-Lot is present]} #{field|name|BT-196(BT-733)-Lot}: ${BT-196(BT-733)-Lot} // Unpublished Justification Description
@@ -196,40 +249,52 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // eSender
 6 {ND-NoticeResult} #{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 ?
+			{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-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
+			{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 {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
-		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
+		2 {ND-LotResult[BT-02-notice in ('veat','can-modif') or ((BT-142-LotResult in ('selec-w','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:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-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:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the 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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $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 == $tpa1]) return $orgid1) == 1]} #{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 == $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 $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[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the tendering party for this Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $org2} // Names of non-leaders for this Winner
+				{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 == $tpa1]) return $orgid1) == 1]} #{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 == $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:$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:$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:$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 $orgname2} // Subcontractor names
+				{OPT-320-LotResult[count(for text:$tender1 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 == $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 OPT-321-Tender[OPT-321-Tender[BT-1711-Tender is present] == $tender1]) > 0]} #{field|name|BT-1711-Tender}: #{code|name|${if (some indicator:$tranked in (for text:$tender2 in OPT-320-LotResult return BT-1711-Tender[OPT-321-Tender == $tender2]) satisfies $tranked == TRUE) then 'indicator.true' else 'indicator.false'}} // 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-193-Tender is present] == $tender1]) > 0)]} #{field|name|BT-193-Tender}: #{code|name|${if (some indicator:$tvariant in (for text:$tender3 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender3]) satisfies $tvariant == TRUE) then 'indicator.true' else 'indicator.false'}} // 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 == 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-193-Tender is present and (BT-195(BT-193)-Tender is not present or BT-193-Tender == TRUE)] == $tender1]) > 0)]} #{field|name|BT-193-Tender}: #{code|name|${if (some indicator:$tvariant in (for text:$tender2 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender2]) satisfies $tvariant == TRUE) then 'indicator.true' else 'indicator.false'}} // The tender is a variant
+					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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-195(BT-193)-Tender is present and BT-193-Tender == FALSE] == $tender1]) > 0)]} #{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
@@ -251,12 +316,21 @@
 		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
+					{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 {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
+				{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 {BT-635-LotResult[BT-635-LotResult != -1]} #{field|name|BT-635-LotResult}: ${BT-635-LotResult} // 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 {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
@@ -266,13 +340,22 @@
 				{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
+					{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-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
+					{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
+						{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 {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
@@ -282,6 +365,9 @@
 					{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
+						{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 {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
@@ -356,10 +442,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
diff --git a/view-templates/38.efx b/view-templates/38.efx
index b976c3aaa..70550eba2 100644
--- a/view-templates/38.efx
+++ b/view-templates/38.efx
@@ -47,7 +47,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -108,32 +107,50 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // eSender
 6 {ND-NoticeResult} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-161-NoticeResult/@currencyID)}} // Notice Value (Value of all contracts awarded in this procedure)
+		{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-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 {BT-118-NoticeResult[BT-118-NoticeResult != -1]} #{field|name|BT-118-NoticeResult}: ${format-number(BT-118-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-118-NoticeResult/@currencyID)}} // The maximum value of the framework agreement(s) in this notice
+		{ND-NoticeMaximumValueUnpublish} #{field|name|BT-197(BT-118)-NoticeResult}: #{BT-197(BT-118)-NoticeResult} // Unpublished Justification Code
+		{ND-NoticeMaximumValueUnpublish[BT-196(BT-118)-NoticeResult is present]} #{field|name|BT-196(BT-118)-NoticeResult}: ${BT-196(BT-118)-NoticeResult} // Unpublished Justification Description
+		{ND-NoticeMaximumValueUnpublish[BT-198(BT-118)-NoticeResult is present]} #{field|name|BT-198(BT-118)-NoticeResult}: ${BT-198(BT-118)-NoticeResult} // Unpublished Access Date
 	0 {BT-118-NoticeResult[BT-118-NoticeResult == -1]} #{field|name|BT-118-NoticeResult}: #{auxiliary|text|unpublished} // The maximum value of the framework agreement(s) in this notice (unpublished)
 		{ND-NoticeMaximumValueUnpublish} #{field|name|BT-197(BT-118)-NoticeResult}: #{BT-197(BT-118)-NoticeResult} // Unpublished Justification Code
 		{ND-NoticeMaximumValueUnpublish[BT-196(BT-118)-NoticeResult is present]} #{field|name|BT-196(BT-118)-NoticeResult}: ${BT-196(BT-118)-NoticeResult} // Unpublished Justification Description
 		{ND-NoticeMaximumValueUnpublish[BT-198(BT-118)-NoticeResult is present]} #{field|name|BT-198(BT-118)-NoticeResult}: ${BT-198(BT-118)-NoticeResult} // Unpublished Access Date
 	0 {BT-1118-NoticeResult[BT-1118-NoticeResult != -1]} #{field|name|BT-1118-NoticeResult}: ${format-number(BT-1118-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-1118-NoticeResult/@currencyID)}} // The approximate value of the framework agreements in this notice
+		{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 {BT-1118-NoticeResult[BT-1118-NoticeResult == -1]} #{field|name|BT-1118-NoticeResult}: #{auxiliary|text|unpublished} // The approximate value of the framework agreements in this notice (unpublished)
 		{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
+		{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
+		{ND-GroupMaximalValueIdentifierUnpublish[BT-198(BT-556)-NoticeResult is present]} #{field|name|BT-198(BT-556)-NoticeResult}: ${BT-198(BT-556)-NoticeResult} // Unpublished Access Date
 		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.##')} #{code|name|${concat('currency.', BT-156-NoticeResult/@currencyID)}} // Maximum value of the framework agreements in this group of lots
+			{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-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.##')} #{code|name|${concat('currency.', BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Re-estimated value of the framework agreements within a group of lots
+			{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 {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
@@ -144,11 +161,17 @@
 		{ND-GroupMaximalValueIdentifierUnpublish[BT-198(BT-556)-NoticeResult is present]} #{field|name|BT-198(BT-556)-NoticeResult}: ${BT-198(BT-556)-NoticeResult} // Unpublished Access Date
 		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.##')} #{code|name|${concat('currency.', BT-156-NoticeResult[BT-156-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Maximum value of the framework agreements in this group of lots
+			{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-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.##')} #{code|name|${concat('currency.', BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Re-estimated value of the framework agreements within a group of lots
+			{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 {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
@@ -156,63 +179,93 @@
 	1 {ND-LotResult} #{field|name|BT-13713-LotResult}: ${BT-13713-LotResult} // 6.1 Result Lot Identifier (LOT-XXXX)
 		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.##')} #{code|name|${concat('currency.', BT-709-LotResult/@currencyID)}} // Framework Maximum Value
+				{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-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.##')} #{code|name|${concat('currency.', BT-660-LotResult/@currencyID)}} // Framework Re-estimated Value
+				{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
 			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
+		2 {ND-LotResult[BT-02-notice in ('veat','can-modif') or ((BT-142-LotResult in ('selec-w','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:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-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:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the 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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $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 == $tpa1]) return $orgid1) == 1]} #{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 == $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 $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[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the tendering party for this Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $org2} // Names of non-leaders for this Winner
+				{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 == $tpa1]) return $orgid1) == 1]} #{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 == $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:$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:$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:$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 $orgname2} // Subcontractor names
+				{OPT-320-LotResult[count(for text:$tender1 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 == $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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-720-Tender[BT-720-Tender[OPT-321-Tender == $tender3] != -1]/@currencyID )}} // Value of the tender
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-1711-Tender is present] == $tender1]) > 0]} #{field|name|BT-1711-Tender}: #{code|name|${if (some indicator:$tranked in (for text:$tender2 in OPT-320-LotResult return BT-1711-Tender[OPT-321-Tender == $tender2]) satisfies $tranked == TRUE) then 'indicator.true' else 'indicator.false'}} // 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('applicability.',BT-773-Tender[OPT-321-Tender == $tender2])}} // Subcontracting
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-730-Tender is present and (BT-195(BT-730)-Tender is not present or BT-730-Tender == TRUE)] == $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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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 OPT-321-Tender[OPT-321-Tender[BT-195(BT-730)-Tender is present and BT-730-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID)}} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{auxiliary|text|unpublished} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-731-Tender is present and (BT-195(BT-731)-Tender is not present or BT-731-Tender == TRUE)] == $tender1]) > 0)]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk == 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-195(BT-731)-Tender is present and BT-731-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-555-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-555-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] == -1]) > 0]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // 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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies ($desc1 != '' and $desc1 != 'unpublished')]} #{field|name|BT-554-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-554-Tender[OPT-321-Tender == $tender2] return $desc2} // Subcontracting Description
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-554)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
@@ -231,12 +284,21 @@
 		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
+					{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 {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
+				{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 {BT-635-LotResult[BT-635-LotResult != -1]} #{field|name|BT-635-LotResult}: ${BT-635-LotResult} // 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 {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
@@ -246,6 +308,9 @@
 				{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
+					{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-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
@@ -254,14 +319,100 @@
 				0 {ND-StrategicProcurementInformationLotResult} #{field|name|BT-735-LotResult}: #{BT-735-LotResult} // 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
+	1 {ND-LotTender[OPT-322-LotResult is not present]} #{field|name|BT-13713-LotResult}: ${BT-13714-Tender} // 6.1 Result Lot Identifier (LOT-XXXX) DAP/VEAT notices
+		2 {ND-LotTender} #{auxiliary|text|winner-info} // 6.1.2. Winning tenders
+			0 {ND-LotTender} #{auxiliary|text|winner}: // Winner
+				{ND-LotTender[count(for text:$tpa1 in OPT-310-Tender, text:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-Tenderer}: ${for text:$tpa2 in OPT-310-Tender, text:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the tendering party for this Winner
+				{ND-LotTender[count(for text:$tpa1 in OPT-310-Tender, text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tpa2 in OPT-310-Tender, 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
+				{ND-LotTender[count(for text:$tpa1 in OPT-310-Tender, text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer == $tpa1]) return $orgid1)>1]} #{field|name|BT-500-Organization-Company}: ${for text:$tpa2 in OPT-310-Tender, text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $org2} // Names of non-leaders for this Winner
+				{ND-LotTender[count(for text:$tpa1 in OPT-310-Tender, text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer == $tpa1]) return $orgid1) == 1]} #{field|name|BT-500-Organization-Company}: ${for text:$tpa2 in OPT-310-Tender, text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer == $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 {ND-LotTender[some text:$name in (for text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{auxiliary|text|winner-subcontractor}: // Subcontractors of the winner
+					{BT-13714-Tender[some text:$orgname1 in (for text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $orgname1 != '']} #{field|name|BT-500-Organization-Company}: ${for text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender]], text:$orgname2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return $orgname2 } // Subcontractor names
+				{ND-LotTender[count( BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender]])>0]} #{auxiliary|text|tender}: // Tender
+				{ND-LotTender} #{field|name|BT-3201-Tender}: ${BT-3201-Tender} // Tender identifier
+				{ND-LotTender} #{field|name|BT-13714-Tender}: ${BT-13714-Tender} // Identifier of lot or group of lots
+				0 {ND-LotTender[BT-720-Tender != -1]} #{field|name|BT-720-Tender}: ${format-number(BT-720-Tender, '###,##0.##')} #{code|name|${concat('currency.', BT-720-Tender[BT-720-Tender != -1]/@currencyID)}} // Value of the tender
+					{BT-197(BT-720)-Tender} #{field|name|BT-197(BT-720)-Tender}: #{BT-197(BT-720)-Tender} // Unpublished Justification Code
+					{ND-WinningTenderValueUnpublish[BT-196(BT-720)-Tender is present]} #{field|name|BT-196(BT-720)-Tender}: ${BT-196(BT-720)-Tender} // Unpublished Justification Description
+					{BT-198(BT-720)-Tender} #{field|name|BT-198(BT-720)-Tender}: ${BT-198(BT-720)-Tender} // Unpublished Access Date
+				0 {ND-LotTender[BT-720-Tender == -1]} #{field|name|BT-720-Tender}: #{auxiliary|text|unpublished} // Value of the tender (unpublished)
+					{BT-197(BT-720)-Tender} #{field|name|BT-197(BT-720)-Tender}: #{BT-197(BT-720)-Tender} // Unpublished Justification Code
+					{ND-WinningTenderValueUnpublish[BT-196(BT-720)-Tender is present]} #{field|name|BT-196(BT-720)-Tender}: ${BT-196(BT-720)-Tender} // Unpublished Justification Description
+					{BT-198(BT-720)-Tender} #{field|name|BT-198(BT-720)-Tender}: ${BT-198(BT-720)-Tender} // Unpublished Access Date
+				0 {ND-LotTender[BT-1711-Tender == TRUE]} #{field|name|BT-1711-Tender} // Tender Ranked
+				0 {ND-LotTender[BT-171-Tender != -1]} #{field|name|BT-171-Tender}: ${string(BT-171-Tender)} // Tender Rank
+					{BT-197(BT-171)-Tender} #{field|name|BT-197(BT-171)-Tender}: #{BT-197(BT-171)-Tender} // Unpublished Justification Code
+					{ND-TenderRankUnpublish[BT-196(BT-171)-Tender is present]} #{field|name|BT-196(BT-171)-Tender}: ${BT-196(BT-171)-Tender} // Unpublished Justification Description
+					{BT-198(BT-171)-Tender} #{field|name|BT-198(BT-171)-Tender}: ${BT-198(BT-171)-Tender} // Unpublished Access Date
+				0 {ND-LotTender[BT-171-Tender == -1]} #{field|name|BT-171-Tender}: #{auxiliary|text|unpublished} // Tender Rank (unpublished)
+					{BT-197(BT-171)-Tender} #{field|name|BT-197(BT-171)-Tender}: #{BT-197(BT-171)-Tender} // Unpublished Justification Code
+					{ND-TenderRankUnpublish[BT-196(BT-171)-Tender is present]} #{field|name|BT-196(BT-171)-Tender}: ${BT-196(BT-171)-Tender} // Unpublished Justification Description
+					{BT-198(BT-171)-Tender} #{field|name|BT-198(BT-171)-Tender}: ${BT-198(BT-171)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-773-Tender != 'unpublished']} #{field|name|BT-773-Tender}: #{code|name|${concat('applicability.',BT-773-Tender)}}  // Subcontracting  
+					{BT-197(BT-773)-Tender} #{field|name|BT-197(BT-773)-Tender}: #{BT-197(BT-773)-Tender} // Unpublished Justification Code
+					{BT-773-Tender[BT-196(BT-773)-Tender is present]} #{field|name|BT-196(BT-773)-Tender}: ${BT-196(BT-773)-Tender} // Unpublished Justification Description
+					{BT-198(BT-773)-Tender} #{field|name|BT-198(BT-773)-Tender}: ${BT-198(BT-773)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-773-Tender == 'unpublished']} #{field|name|BT-773-Tender}: #{auxiliary|text|unpublished} // Subcontracting (unpublished)
+					{BT-197(BT-773)-Tender} #{field|name|BT-197(BT-773)-Tender}: #{BT-197(BT-773)-Tender} // Unpublished Justification Code
+					{BT-773-Tender[BT-196(BT-773)-Tender is present]} #{field|name|BT-196(BT-773)-Tender}: ${BT-196(BT-773)-Tender} // Unpublished Justification Description
+					{BT-198(BT-773)-Tender} #{field|name|BT-198(BT-773)-Tender}: ${BT-198(BT-773)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-730-Tender is present and (BT-195(BT-730)-Tender is not present or BT-730-Tender == TRUE)]} #{field|name|BT-730-Tender}: #{code|name|${if (BT-730-Tender == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
+					{BT-197(BT-730)-Tender} #{field|name|BT-197(BT-730)-Tender}: #{BT-197(BT-730)-Tender} // Unpublished Justification Code
+					{BT-730-Tender[BT-196(BT-730)-Tender is present]} #{field|name|BT-196(BT-730)-Tender}: ${BT-196(BT-730)-Tender} // Unpublished Justification Description
+					{BT-198(BT-730)-Tender} #{field|name|BT-198(BT-730)-Tender}: ${BT-198(BT-730)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-195(BT-730)-Tender is present and BT-730-Tender == FALSE]} #{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)
+					{BT-197(BT-730)-Tender} #{field|name|BT-197(BT-730)-Tender}: #{BT-197(BT-730)-Tender} // Unpublished Justification Code
+					{BT-730-Tender[BT-196(BT-730)-Tender is present]} #{field|name|BT-196(BT-730)-Tender}: ${BT-196(BT-730)-Tender} // Unpublished Justification Description
+					{BT-198(BT-730)-Tender} #{field|name|BT-198(BT-730)-Tender}: ${BT-198(BT-730)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-553-Tender != -1]} #{field|name|BT-553-Tender}: ${format-number(BT-553-Tender, '###,##0.##')} #{code|name|${concat('currency.', BT-553-Tender/@currencyID)}} // Estimated value of the part of the contract that the contractor will subcontract to third parties
+					{BT-197(BT-553)-Tender} #{field|name|BT-197(BT-553)-Tender}: #{BT-197(BT-553)-Tender} // Unpublished Justification Code
+					{BT-553-Tender[BT-196(BT-553)-Tender is present]} #{field|name|BT-196(BT-553)-Tender}: ${BT-196(BT-553)-Tender} // Unpublished Justification Description
+					{BT-198(BT-553)-Tender} #{field|name|BT-198(BT-553)-Tender}: ${BT-198(BT-553)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-553-Tender == -1]} #{field|name|BT-553-Tender}: #{auxiliary|text|unpublished} // Estimated value of the part of the contract that the contractor will subcontract to third parties (unpublished)
+					{BT-197(BT-553)-Tender} #{field|name|BT-197(BT-553)-Tender}: #{BT-197(BT-553)-Tender} // Unpublished Justification Code
+					{BT-553-Tender[BT-196(BT-553)-Tender is present]} #{field|name|BT-196(BT-553)-Tender}: ${BT-196(BT-553)-Tender} // Unpublished Justification Description
+					{BT-198(BT-553)-Tender} #{field|name|BT-198(BT-553)-Tender}: ${BT-198(BT-553)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-731-Tender is present and (BT-195(BT-731)-Tender is not present or BT-731-Tender == TRUE)]} #{field|name|BT-731-Tender}: #{code|name|${if (BT-731-Tender == 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
+					{BT-197(BT-731)-Tender} #{field|name|BT-197(BT-731)-Tender}: #{BT-197(BT-731)-Tender} // Unpublished Justification Code
+					{BT-731-Tender[BT-196(BT-731)-Tender is present]} #{field|name|BT-196(BT-731)-Tender}: ${BT-196(BT-731)-Tender} // Unpublished Justification Description
+					{BT-198(BT-731)-Tender} #{field|name|BT-198(BT-731)-Tender}: ${BT-198(BT-731)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-195(BT-731)-Tender is present and BT-731-Tender == FALSE]} #{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)
+					{BT-197(BT-731)-Tender} #{field|name|BT-197(BT-731)-Tender}: #{BT-197(BT-731)-Tender} // Unpublished Justification Code
+					{BT-731-Tender[BT-196(BT-731)-Tender is present]} #{field|name|BT-196(BT-731)-Tender}: ${BT-196(BT-731)-Tender} // Unpublished Justification Description
+					{BT-198(BT-731)-Tender} #{field|name|BT-198(BT-731)-Tender}: ${BT-198(BT-731)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-555-Tender != -1]} #{field|name|BT-555-Tender}: ${format-number(BT-555-Tender, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+					{BT-197(BT-555)-Tender} #{field|name|BT-197(BT-555)-Tender}: #{BT-197(BT-555)-Tender} // Unpublished Justification Code
+					{BT-555-Tender[BT-196(BT-555)-Tender is present]} #{field|name|BT-196(BT-555)-Tender}: ${BT-196(BT-555)-Tender} // Unpublished Justification Description
+					{BT-198(BT-555)-Tender} #{field|name|BT-198(BT-555)-Tender}: ${BT-198(BT-555)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-555-Tender == -1]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
+					{BT-197(BT-555)-Tender} #{field|name|BT-197(BT-555)-Tender}: #{BT-197(BT-555)-Tender} // Unpublished Justification Code
+					{BT-555-Tender[BT-196(BT-555)-Tender is present]} #{field|name|BT-196(BT-555)-Tender}: ${BT-196(BT-555)-Tender} // Unpublished Justification Description
+					{BT-198(BT-555)-Tender} #{field|name|BT-198(BT-555)-Tender}: ${BT-198(BT-555)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[(BT-554-Tender != '' and BT-554-Tender != 'unpublished')]} #{field|name|BT-554-Tender}: ${BT-554-Tender} // Subcontracting Description
+					{BT-197(BT-554)-Tender} #{field|name|BT-197(BT-554)-Tender}: #{BT-197(BT-554)-Tender} // Unpublished Justification Code
+					{ND-SubcontractedContract[BT-196(BT-554)-Tender is present]} #{field|name|BT-196(BT-554)-Tender}: ${BT-196(BT-554)-Tender} // Unpublished Justification Description
+					{BT-198(BT-554)-Tender} #{field|name|BT-198(BT-554)-Tender}: ${BT-198(BT-554)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-554-Tender == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
+					{BT-197(BT-554)-Tender} #{field|name|BT-197(BT-554)-Tender}: #{BT-197(BT-554)-Tender} // Unpublished Justification Code
+					{ND-SubcontractedContract[BT-196(BT-554)-Tender is present]} #{field|name|BT-196(BT-554)-Tender}: ${BT-196(BT-554)-Tender} // Unpublished Justification Description
+					{BT-198(BT-554)-Tender} #{field|name|BT-198(BT-554)-Tender}: ${BT-198(BT-554)-Tender} // Unpublished Access Date
+				0 {OPT-321-Tender} #{auxiliary|text|contract-information}: // Contract info for this tender
+					0 {OPT-321-Tender} #{field|name|BT-150-Contract}: ${for text:$tender in OPT-321-Tender return BT-150-Contract[BT-3202-Contract == $tender]} // Contract identifier
+					0 {OPT-321-Tender} #{field|name|BT-721-Contract}: ${for text:$tender in OPT-321-Tender return BT-721-Contract[BT-3202-Contract == $tender]} // Contract title
+					0 {OPT-321-Tender} #{field|name|BT-1451-Contract}: ${for text:$tender in OPT-321-Tender return date:BT-1451-Contract[BT-3202-Contract == $tender]} // Winning Decision date
+					0 {OPT-321-Tender[some text:$contractid in (for text:$tender in OPT-321-Tender 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
+						0 {OPT-321-Tender[some text:$eufundname in (for text:$tender in OPT-321-Tender return BT-722-Contract[BT-3202-Contract == $tender]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: #{code|name|${for text:$tender2 in OPT-321-Tender, text:$name in BT-722-Contract[BT-3202-Contract == $tender2] return concat('eu-programme.', $name)}} // Contract EU Funds Name
+						0 {OPT-321-Tender[some text:$eufundid in (for text:$tender in OPT-321-Tender return BT-5011-Contract[BT-3202-Contract == $tender]) satisfies $eufundid != '']} #{field|name|BT-5011-Contract}: ${for text:$tender2 in OPT-321-Tender return BT-5011-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Identifier
+						0 {OPT-321-Tender[some text:$eufunddesc in (for text:$tender in OPT-321-Tender return BT-6110-Contract[BT-3202-Contract == $tender]) satisfies $eufunddesc != '']} #{field|name|BT-6110-Contract}: ${for text:$tender2 in OPT-321-Tender, text:$details in BT-6110-Contract[BT-3202-Contract == $tender2] return $details} // Contract EU Funds Details
+					0 {OPT-321-Tender[count(for text:$tender in OPT-321-Tender return OPT-300-Contract-Signatory[BT-3202-Contract == $tender]) > 0]} #{auxiliary|text|organisation-signing-contract}: ${for text:$tender2 in OPT-321-Tender, 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
 7 {ND-Root[BT-1501(n)-Contract is present]} #{auxiliary|text|modification} // 7. Modifications
 	1 {ND-ContractModification} #{auxiliary|text|modification} // Modification
 		{BT-1501(n)-Contract} #{field|name|BT-1501(n)-Contract}: ${BT-1501(n)-Contract} // Modification Previous Notice Identifier
 		{BT-1501(c)-Contract} #{field|name|BT-1501(c)-Contract}: ${BT-1501(c)-Contract} // Modified Contract Reference
 		{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
+		{ND-ContractModification} #{field|name|BT-201-Contract}: ${BT-201-Contract} // Modification Reason Description
 		1 {ND-Modification} #{auxiliary|text|change} // Modification
-			{BT-202-Contract} #{field|name|BT-202-Contract}: ${BT-202-Contract} // Modification Previous Notice Section Identifier
+			{ND-Modification} #{field|name|BT-202-Contract}: ${BT-202-Contract} // Modification Description
 			{BT-1501(p)-Contract} #{field|name|BT-1501(p)-Contract}: ${BT-1501(p)-Contract} // Modified Notice Part Reference
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
@@ -318,10 +469,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
diff --git a/view-templates/39.efx b/view-templates/39.efx
index 5cc439c76..4ad09a4a5 100644
--- a/view-templates/39.efx
+++ b/view-templates/39.efx
@@ -47,7 +47,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -108,32 +107,50 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // eSender
 6 {ND-NoticeResult} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-161-NoticeResult/@currencyID)}} // Notice Value (Value of all contracts awarded in this procedure)
+		{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-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 {BT-118-NoticeResult[BT-118-NoticeResult != -1]} #{field|name|BT-118-NoticeResult}: ${format-number(BT-118-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-118-NoticeResult/@currencyID)}} // The maximum value of the framework agreement(s) in this notice
+		{ND-NoticeMaximumValueUnpublish} #{field|name|BT-197(BT-118)-NoticeResult}: #{BT-197(BT-118)-NoticeResult} // Unpublished Justification Code
+		{ND-NoticeMaximumValueUnpublish[BT-196(BT-118)-NoticeResult is present]} #{field|name|BT-196(BT-118)-NoticeResult}: ${BT-196(BT-118)-NoticeResult} // Unpublished Justification Description
+		{ND-NoticeMaximumValueUnpublish[BT-198(BT-118)-NoticeResult is present]} #{field|name|BT-198(BT-118)-NoticeResult}: ${BT-198(BT-118)-NoticeResult} // Unpublished Access Date
 	0 {BT-118-NoticeResult[BT-118-NoticeResult == -1]} #{field|name|BT-118-NoticeResult}: #{auxiliary|text|unpublished} // The maximum value of the framework agreement(s) in this notice (unpublished)
 		{ND-NoticeMaximumValueUnpublish} #{field|name|BT-197(BT-118)-NoticeResult}: #{BT-197(BT-118)-NoticeResult} // Unpublished Justification Code
 		{ND-NoticeMaximumValueUnpublish[BT-196(BT-118)-NoticeResult is present]} #{field|name|BT-196(BT-118)-NoticeResult}: ${BT-196(BT-118)-NoticeResult} // Unpublished Justification Description
 		{ND-NoticeMaximumValueUnpublish[BT-198(BT-118)-NoticeResult is present]} #{field|name|BT-198(BT-118)-NoticeResult}: ${BT-198(BT-118)-NoticeResult} // Unpublished Access Date
 	0 {BT-1118-NoticeResult[BT-1118-NoticeResult != -1]} #{field|name|BT-1118-NoticeResult}: ${format-number(BT-1118-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-1118-NoticeResult/@currencyID)}} // The approximate value of the framework agreements in this notice
+		{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 {BT-1118-NoticeResult[BT-1118-NoticeResult == -1]} #{field|name|BT-1118-NoticeResult}: #{auxiliary|text|unpublished} // The approximate value of the framework agreements in this notice (unpublished)
 		{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
+		{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
+		{ND-GroupMaximalValueIdentifierUnpublish[BT-198(BT-556)-NoticeResult is present]} #{field|name|BT-198(BT-556)-NoticeResult}: ${BT-198(BT-556)-NoticeResult} // Unpublished Access Date
 		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.##')} #{code|name|${concat('currency.', BT-156-NoticeResult/@currencyID)}} // Maximum value of the framework agreements in this group of lots
+			{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-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.##')} #{code|name|${concat('currency.', BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Re-estimated value of the framework agreements within a group of lots
+			{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 {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
@@ -144,11 +161,17 @@
 		{ND-GroupMaximalValueIdentifierUnpublish[BT-198(BT-556)-NoticeResult is present]} #{field|name|BT-198(BT-556)-NoticeResult}: ${BT-198(BT-556)-NoticeResult} // Unpublished Access Date
 		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.##')} #{code|name|${concat('currency.', BT-156-NoticeResult[BT-156-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Maximum value of the framework agreements in this group of lots
+			{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-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.##')} #{code|name|${concat('currency.', BT-1561-NoticeResult[BT-1561-NoticeResult/@currencyID != 'unpublished']/@currencyID)}} // Re-estimated value of the framework agreements within a group of lots
+			{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 {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
@@ -156,63 +179,93 @@
 	1 {ND-LotResult} #{field|name|BT-13713-LotResult}: ${BT-13713-LotResult} // 6.1 Result Lot Identifier (LOT-XXXX)
 		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.##')} #{code|name|${concat('currency.', BT-709-LotResult/@currencyID)}} // Framework Maximum Value
+				{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-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.##')} #{code|name|${concat('currency.', BT-660-LotResult/@currencyID)}} // Framework Re-estimated Value
+				{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
 			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
+		2 {ND-LotResult[BT-02-notice in ('veat','can-modif') or ((BT-142-LotResult in ('selec-w','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:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-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:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the 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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $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 == $tpa1]) return $orgid1) == 1]} #{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 == $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 $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[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the tendering party for this Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $org2} // Names of non-leaders for this Winner
+				{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 == $tpa1]) return $orgid1) == 1]} #{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 == $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:$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:$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:$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 $orgname2} // Subcontractor names
+				{OPT-320-LotResult[count(for text:$tender1 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 == $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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-720-Tender[BT-720-Tender[OPT-321-Tender == $tender3] != -1]/@currencyID )}} // Value of the tender
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-1711-Tender is present] == $tender1]) > 0]} #{field|name|BT-1711-Tender}: #{code|name|${if (some indicator:$tranked in (for text:$tender2 in OPT-320-LotResult return BT-1711-Tender[OPT-321-Tender == $tender2]) satisfies $tranked == TRUE) then 'indicator.true' else 'indicator.false'}} // 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('applicability.',BT-773-Tender[OPT-321-Tender == $tender2])}} // Subcontracting
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-730-Tender is present and (BT-195(BT-730)-Tender is not present or BT-730-Tender == TRUE)] == $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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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 OPT-321-Tender[OPT-321-Tender[BT-195(BT-730)-Tender is present and BT-730-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID)}} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{auxiliary|text|unpublished} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-731-Tender is present and (BT-195(BT-731)-Tender is not present or BT-731-Tender == TRUE)] == $tender1]) > 0)]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk == 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-195(BT-731)-Tender is present and BT-731-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-555-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-555-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] == -1]) > 0]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // 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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies ($desc1 != '' and $desc1 != 'unpublished')]} #{field|name|BT-554-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-554-Tender[OPT-321-Tender == $tender2] return $desc2} // Subcontracting Description
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-554)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
@@ -231,12 +284,21 @@
 		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
+					{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 {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
+				{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 {BT-635-LotResult[BT-635-LotResult != -1]} #{field|name|BT-635-LotResult}: ${BT-635-LotResult} // 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 {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
@@ -246,6 +308,9 @@
 				{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
+					{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-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
@@ -254,14 +319,100 @@
 				0 {ND-StrategicProcurementInformationLotResult} #{field|name|BT-735-LotResult}: #{BT-735-LotResult} // 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
+	1 {ND-LotTender[OPT-322-LotResult is not present]} #{field|name|BT-13713-LotResult}: ${BT-13714-Tender} // 6.1 Result Lot Identifier (LOT-XXXX) DAP/VEAT notices
+		2 {ND-LotTender} #{auxiliary|text|winner-info} // 6.1.2. Winning tenders
+			0 {ND-LotTender} #{auxiliary|text|winner}: // Winner
+				{ND-LotTender[count(for text:$tpa1 in OPT-310-Tender, text:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-Tenderer}: ${for text:$tpa2 in OPT-310-Tender, text:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the tendering party for this Winner
+				{ND-LotTender[count(for text:$tpa1 in OPT-310-Tender, text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tpa2 in OPT-310-Tender, 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
+				{ND-LotTender[count(for text:$tpa1 in OPT-310-Tender, text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer == $tpa1]) return $orgid1)>1]} #{field|name|BT-500-Organization-Company}: ${for text:$tpa2 in OPT-310-Tender, text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $org2} // Names of non-leaders for this Winner
+				{ND-LotTender[count(for text:$tpa1 in OPT-310-Tender, text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer == $tpa1]) return $orgid1) == 1]} #{field|name|BT-500-Organization-Company}: ${for text:$tpa2 in OPT-310-Tender, text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer == $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 {ND-LotTender[some text:$name in (for text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{auxiliary|text|winner-subcontractor}: // Subcontractors of the winner
+					{BT-13714-Tender[some text:$orgname1 in (for text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $orgname1 != '']} #{field|name|BT-500-Organization-Company}: ${for text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender]], text:$orgname2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return $orgname2 } // Subcontractor names
+				{ND-LotTender[count( BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender]])>0]} #{auxiliary|text|tender}: // Tender
+				{ND-LotTender} #{field|name|BT-3201-Tender}: ${BT-3201-Tender} // Tender identifier
+				{ND-LotTender} #{field|name|BT-13714-Tender}: ${BT-13714-Tender} // Identifier of lot or group of lots
+				0 {ND-LotTender[BT-720-Tender != -1]} #{field|name|BT-720-Tender}: ${format-number(BT-720-Tender, '###,##0.##')} #{code|name|${concat('currency.', BT-720-Tender[BT-720-Tender != -1]/@currencyID)}} // Value of the tender
+					{BT-197(BT-720)-Tender} #{field|name|BT-197(BT-720)-Tender}: #{BT-197(BT-720)-Tender} // Unpublished Justification Code
+					{ND-WinningTenderValueUnpublish[BT-196(BT-720)-Tender is present]} #{field|name|BT-196(BT-720)-Tender}: ${BT-196(BT-720)-Tender} // Unpublished Justification Description
+					{BT-198(BT-720)-Tender} #{field|name|BT-198(BT-720)-Tender}: ${BT-198(BT-720)-Tender} // Unpublished Access Date
+				0 {ND-LotTender[BT-720-Tender == -1]} #{field|name|BT-720-Tender}: #{auxiliary|text|unpublished} // Value of the tender (unpublished)
+					{BT-197(BT-720)-Tender} #{field|name|BT-197(BT-720)-Tender}: #{BT-197(BT-720)-Tender} // Unpublished Justification Code
+					{ND-WinningTenderValueUnpublish[BT-196(BT-720)-Tender is present]} #{field|name|BT-196(BT-720)-Tender}: ${BT-196(BT-720)-Tender} // Unpublished Justification Description
+					{BT-198(BT-720)-Tender} #{field|name|BT-198(BT-720)-Tender}: ${BT-198(BT-720)-Tender} // Unpublished Access Date
+				0 {ND-LotTender[BT-1711-Tender == TRUE]} #{field|name|BT-1711-Tender} // Tender Ranked
+				0 {ND-LotTender[BT-171-Tender != -1]} #{field|name|BT-171-Tender}: ${string(BT-171-Tender)} // Tender Rank
+					{BT-197(BT-171)-Tender} #{field|name|BT-197(BT-171)-Tender}: #{BT-197(BT-171)-Tender} // Unpublished Justification Code
+					{ND-TenderRankUnpublish[BT-196(BT-171)-Tender is present]} #{field|name|BT-196(BT-171)-Tender}: ${BT-196(BT-171)-Tender} // Unpublished Justification Description
+					{BT-198(BT-171)-Tender} #{field|name|BT-198(BT-171)-Tender}: ${BT-198(BT-171)-Tender} // Unpublished Access Date
+				0 {ND-LotTender[BT-171-Tender == -1]} #{field|name|BT-171-Tender}: #{auxiliary|text|unpublished} // Tender Rank (unpublished)
+					{BT-197(BT-171)-Tender} #{field|name|BT-197(BT-171)-Tender}: #{BT-197(BT-171)-Tender} // Unpublished Justification Code
+					{ND-TenderRankUnpublish[BT-196(BT-171)-Tender is present]} #{field|name|BT-196(BT-171)-Tender}: ${BT-196(BT-171)-Tender} // Unpublished Justification Description
+					{BT-198(BT-171)-Tender} #{field|name|BT-198(BT-171)-Tender}: ${BT-198(BT-171)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-773-Tender != 'unpublished']} #{field|name|BT-773-Tender}: #{code|name|${concat('applicability.',BT-773-Tender)}}  // Subcontracting  
+					{BT-197(BT-773)-Tender} #{field|name|BT-197(BT-773)-Tender}: #{BT-197(BT-773)-Tender} // Unpublished Justification Code
+					{BT-773-Tender[BT-196(BT-773)-Tender is present]} #{field|name|BT-196(BT-773)-Tender}: ${BT-196(BT-773)-Tender} // Unpublished Justification Description
+					{BT-198(BT-773)-Tender} #{field|name|BT-198(BT-773)-Tender}: ${BT-198(BT-773)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-773-Tender == 'unpublished']} #{field|name|BT-773-Tender}: #{auxiliary|text|unpublished} // Subcontracting (unpublished)
+					{BT-197(BT-773)-Tender} #{field|name|BT-197(BT-773)-Tender}: #{BT-197(BT-773)-Tender} // Unpublished Justification Code
+					{BT-773-Tender[BT-196(BT-773)-Tender is present]} #{field|name|BT-196(BT-773)-Tender}: ${BT-196(BT-773)-Tender} // Unpublished Justification Description
+					{BT-198(BT-773)-Tender} #{field|name|BT-198(BT-773)-Tender}: ${BT-198(BT-773)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-730-Tender is present and (BT-195(BT-730)-Tender is not present or BT-730-Tender == TRUE)]} #{field|name|BT-730-Tender}: #{code|name|${if (BT-730-Tender == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
+					{BT-197(BT-730)-Tender} #{field|name|BT-197(BT-730)-Tender}: #{BT-197(BT-730)-Tender} // Unpublished Justification Code
+					{BT-730-Tender[BT-196(BT-730)-Tender is present]} #{field|name|BT-196(BT-730)-Tender}: ${BT-196(BT-730)-Tender} // Unpublished Justification Description
+					{BT-198(BT-730)-Tender} #{field|name|BT-198(BT-730)-Tender}: ${BT-198(BT-730)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-195(BT-730)-Tender is present and BT-730-Tender == FALSE]} #{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)
+					{BT-197(BT-730)-Tender} #{field|name|BT-197(BT-730)-Tender}: #{BT-197(BT-730)-Tender} // Unpublished Justification Code
+					{BT-730-Tender[BT-196(BT-730)-Tender is present]} #{field|name|BT-196(BT-730)-Tender}: ${BT-196(BT-730)-Tender} // Unpublished Justification Description
+					{BT-198(BT-730)-Tender} #{field|name|BT-198(BT-730)-Tender}: ${BT-198(BT-730)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-553-Tender != -1]} #{field|name|BT-553-Tender}: ${format-number(BT-553-Tender, '###,##0.##')} #{code|name|${concat('currency.', BT-553-Tender/@currencyID)}} // Estimated value of the part of the contract that the contractor will subcontract to third parties
+					{BT-197(BT-553)-Tender} #{field|name|BT-197(BT-553)-Tender}: #{BT-197(BT-553)-Tender} // Unpublished Justification Code
+					{BT-553-Tender[BT-196(BT-553)-Tender is present]} #{field|name|BT-196(BT-553)-Tender}: ${BT-196(BT-553)-Tender} // Unpublished Justification Description
+					{BT-198(BT-553)-Tender} #{field|name|BT-198(BT-553)-Tender}: ${BT-198(BT-553)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-553-Tender == -1]} #{field|name|BT-553-Tender}: #{auxiliary|text|unpublished} // Estimated value of the part of the contract that the contractor will subcontract to third parties (unpublished)
+					{BT-197(BT-553)-Tender} #{field|name|BT-197(BT-553)-Tender}: #{BT-197(BT-553)-Tender} // Unpublished Justification Code
+					{BT-553-Tender[BT-196(BT-553)-Tender is present]} #{field|name|BT-196(BT-553)-Tender}: ${BT-196(BT-553)-Tender} // Unpublished Justification Description
+					{BT-198(BT-553)-Tender} #{field|name|BT-198(BT-553)-Tender}: ${BT-198(BT-553)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-731-Tender is present and (BT-195(BT-731)-Tender is not present or BT-731-Tender == TRUE)]} #{field|name|BT-731-Tender}: #{code|name|${if (BT-731-Tender == 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
+					{BT-197(BT-731)-Tender} #{field|name|BT-197(BT-731)-Tender}: #{BT-197(BT-731)-Tender} // Unpublished Justification Code
+					{BT-731-Tender[BT-196(BT-731)-Tender is present]} #{field|name|BT-196(BT-731)-Tender}: ${BT-196(BT-731)-Tender} // Unpublished Justification Description
+					{BT-198(BT-731)-Tender} #{field|name|BT-198(BT-731)-Tender}: ${BT-198(BT-731)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-195(BT-731)-Tender is present and BT-731-Tender == FALSE]} #{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)
+					{BT-197(BT-731)-Tender} #{field|name|BT-197(BT-731)-Tender}: #{BT-197(BT-731)-Tender} // Unpublished Justification Code
+					{BT-731-Tender[BT-196(BT-731)-Tender is present]} #{field|name|BT-196(BT-731)-Tender}: ${BT-196(BT-731)-Tender} // Unpublished Justification Description
+					{BT-198(BT-731)-Tender} #{field|name|BT-198(BT-731)-Tender}: ${BT-198(BT-731)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-555-Tender != -1]} #{field|name|BT-555-Tender}: ${format-number(BT-555-Tender, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+					{BT-197(BT-555)-Tender} #{field|name|BT-197(BT-555)-Tender}: #{BT-197(BT-555)-Tender} // Unpublished Justification Code
+					{BT-555-Tender[BT-196(BT-555)-Tender is present]} #{field|name|BT-196(BT-555)-Tender}: ${BT-196(BT-555)-Tender} // Unpublished Justification Description
+					{BT-198(BT-555)-Tender} #{field|name|BT-198(BT-555)-Tender}: ${BT-198(BT-555)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-555-Tender == -1]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
+					{BT-197(BT-555)-Tender} #{field|name|BT-197(BT-555)-Tender}: #{BT-197(BT-555)-Tender} // Unpublished Justification Code
+					{BT-555-Tender[BT-196(BT-555)-Tender is present]} #{field|name|BT-196(BT-555)-Tender}: ${BT-196(BT-555)-Tender} // Unpublished Justification Description
+					{BT-198(BT-555)-Tender} #{field|name|BT-198(BT-555)-Tender}: ${BT-198(BT-555)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[(BT-554-Tender != '' and BT-554-Tender != 'unpublished')]} #{field|name|BT-554-Tender}: ${BT-554-Tender} // Subcontracting Description
+					{BT-197(BT-554)-Tender} #{field|name|BT-197(BT-554)-Tender}: #{BT-197(BT-554)-Tender} // Unpublished Justification Code
+					{ND-SubcontractedContract[BT-196(BT-554)-Tender is present]} #{field|name|BT-196(BT-554)-Tender}: ${BT-196(BT-554)-Tender} // Unpublished Justification Description
+					{BT-198(BT-554)-Tender} #{field|name|BT-198(BT-554)-Tender}: ${BT-198(BT-554)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-554-Tender == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
+					{BT-197(BT-554)-Tender} #{field|name|BT-197(BT-554)-Tender}: #{BT-197(BT-554)-Tender} // Unpublished Justification Code
+					{ND-SubcontractedContract[BT-196(BT-554)-Tender is present]} #{field|name|BT-196(BT-554)-Tender}: ${BT-196(BT-554)-Tender} // Unpublished Justification Description
+					{BT-198(BT-554)-Tender} #{field|name|BT-198(BT-554)-Tender}: ${BT-198(BT-554)-Tender} // Unpublished Access Date
+				0 {OPT-321-Tender} #{auxiliary|text|contract-information}: // Contract info for this tender
+					0 {OPT-321-Tender} #{field|name|BT-150-Contract}: ${for text:$tender in OPT-321-Tender return BT-150-Contract[BT-3202-Contract == $tender]} // Contract identifier
+					0 {OPT-321-Tender} #{field|name|BT-721-Contract}: ${for text:$tender in OPT-321-Tender return BT-721-Contract[BT-3202-Contract == $tender]} // Contract title
+					0 {OPT-321-Tender} #{field|name|BT-1451-Contract}: ${for text:$tender in OPT-321-Tender return date:BT-1451-Contract[BT-3202-Contract == $tender]} // Winning Decision date
+					0 {OPT-321-Tender[some text:$contractid in (for text:$tender in OPT-321-Tender 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
+						0 {OPT-321-Tender[some text:$eufundname in (for text:$tender in OPT-321-Tender return BT-722-Contract[BT-3202-Contract == $tender]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: #{code|name|${for text:$tender2 in OPT-321-Tender, text:$name in BT-722-Contract[BT-3202-Contract == $tender2] return concat('eu-programme.', $name)}} // Contract EU Funds Name
+						0 {OPT-321-Tender[some text:$eufundid in (for text:$tender in OPT-321-Tender return BT-5011-Contract[BT-3202-Contract == $tender]) satisfies $eufundid != '']} #{field|name|BT-5011-Contract}: ${for text:$tender2 in OPT-321-Tender return BT-5011-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Identifier
+						0 {OPT-321-Tender[some text:$eufunddesc in (for text:$tender in OPT-321-Tender return BT-6110-Contract[BT-3202-Contract == $tender]) satisfies $eufunddesc != '']} #{field|name|BT-6110-Contract}: ${for text:$tender2 in OPT-321-Tender, text:$details in BT-6110-Contract[BT-3202-Contract == $tender2] return $details} // Contract EU Funds Details
+					0 {OPT-321-Tender[count(for text:$tender in OPT-321-Tender return OPT-300-Contract-Signatory[BT-3202-Contract == $tender]) > 0]} #{auxiliary|text|organisation-signing-contract}: ${for text:$tender2 in OPT-321-Tender, 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
 7 {ND-Root[BT-1501(n)-Contract is present]} #{auxiliary|text|modification} // 7. Modifications
 	1 {ND-ContractModification} #{auxiliary|text|modification} // Modification
 		{BT-1501(n)-Contract} #{field|name|BT-1501(n)-Contract}: ${BT-1501(n)-Contract} // Modification Previous Notice Identifier
 		{BT-1501(c)-Contract} #{field|name|BT-1501(c)-Contract}: ${BT-1501(c)-Contract} // Modified Contract Reference
 		{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
+		{ND-ContractModification} #{field|name|BT-201-Contract}: ${BT-201-Contract} // Modification Reason Description
 		1 {ND-Modification} #{auxiliary|text|change} // Modification
-			{BT-202-Contract} #{field|name|BT-202-Contract}: ${BT-202-Contract} // Modification Previous Notice Section Identifier
+			{ND-Modification} #{field|name|BT-202-Contract}: ${BT-202-Contract} // Modification Description
 			{BT-1501(p)-Contract} #{field|name|BT-1501(p)-Contract}: ${BT-1501(p)-Contract} // Modified Notice Part Reference
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
@@ -318,10 +469,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
diff --git a/view-templates/4.efx b/view-templates/4.efx
index b56ea0afe..de90c0631 100644
--- a/view-templates/4.efx
+++ b/view-templates/4.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{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
@@ -51,7 +51,7 @@
 			{BT-5141-Part} #{field|name|BT-5141-Part}: #{BT-5141-Part} // Country
 			{BT-727-Part} #{BT-727-Part} // Restrictions on the place of performance
 			{ND-PartPlacePerformance[BT-728-Part is present]} #{field|name|BT-728-Part}: ${BT-728-Part} // Additional information
-		3 {ND-PartDuration[(BT-536-Part is present) or (BT-537-Part is present) or (BT-36-Part is present)]} #{auxiliary|text|duration} // 3.1.3 Duration
+		3 {ND-PartDuration} #{auxiliary|text|duration} // 3.1.3 Duration
 			{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.###,###,###')} #{code|name|${concat('duration-unit.', BT-36-Part/@unitCode)}} // Period
@@ -146,10 +146,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
diff --git a/view-templates/40.efx b/view-templates/40.efx
index a30b99cec..9acdf25af 100644
--- a/view-templates/40.efx
+++ b/view-templates/40.efx
@@ -47,7 +47,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -108,80 +107,116 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // eSender
 6 {ND-NoticeResult} #{auxiliary|text|results} // 6. Results
 	0 {ND-NoticeResult[BT-161-NoticeResult != -1]} #{field|name|BT-161-NoticeResult}: ${format-number(BT-161-NoticeResult, '###,##0.##')} #{code|name|${concat('currency.', BT-161-NoticeResult/@currencyID)}} // Notice Value (Value of all contracts awarded in this procedure)
+		{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-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
 	1 {ND-LotResult} #{field|name|BT-13713-LotResult}: ${BT-13713-LotResult} // 6.1 Result Lot Identifier (LOT-XXXX)
 		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
+		2 {ND-LotResult[BT-02-notice in ('veat','can-modif') or ((BT-142-LotResult in ('selec-w','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:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-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:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the 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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $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 == $tpa1]) return $orgid1) == 1]} #{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 == $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 $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[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the tendering party for this Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $org2} // Names of non-leaders for this Winner
+				{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 == $tpa1]) return $orgid1) == 1]} #{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 == $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:$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:$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:$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 $orgname2} // Subcontractor names
+				{OPT-320-LotResult[count(for text:$tender1 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 == $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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-720-Tender[BT-720-Tender[OPT-321-Tender == $tender3] != -1]/@currencyID )}} // Value of the tender
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-1711-Tender is present] == $tender1]) > 0]} #{field|name|BT-1711-Tender}: #{code|name|${if (some indicator:$tranked in (for text:$tender2 in OPT-320-LotResult return BT-1711-Tender[OPT-321-Tender == $tender2]) satisfies $tranked == TRUE) then 'indicator.true' else 'indicator.false'}} // 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-162-Tender[OPT-321-Tender == $tender3]/@currencyID)}} // Concession Revenue User
+						{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-162)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-162)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-162)-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-162)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-162)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-162)-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-162)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-162)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-162)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 					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)
 						{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-162)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-162)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-162)-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-162)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-162)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-162)-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-162)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-162)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-162)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 					0 {OPT-320-LotResult[some number:$revenue1 in (for text:$tender1 in OPT-320-LotResult return BT-160-Tender[OPT-321-Tender == $tender1]) satisfies $revenue1 != -1]} #{field|name|BT-160-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$revenue2 in BT-160-Tender[OPT-321-Tender == $tender2] return format-number($revenue2, '###,##0.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.',BT-160-Tender[OPT-321-Tender == $tender3]/@currencyID)}} // Concession Revenue Buyer (Tender)
+						{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-160)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-160)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-160)-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-160)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-160)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-160)-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-160)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-160)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-160)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 					0 {OPT-320-LotResult[some number:$revenue1 in (for text:$tender1 in OPT-320-LotResult return BT-160-Tender[OPT-321-Tender == $tender1]) satisfies $revenue1 == -1]} #{field|name|BT-160-Tender}: #{auxiliary|text|unpublished} // Concession Revenue Buyer (Tender) (unpublished)
 						{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-160)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-160)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-160)-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-160)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 !='']} #{field|name|BT-196(BT-160)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-160)-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-160)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-160)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-160)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 					0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return BT-163-Tender[BT-163-Tender[OPT-321-Tender == $tender1] != 'unpublished'])>0]} #{field|name|BT-163-Tender}: ${for text:$tender in OPT-320-LotResult, text:$description in BT-163-Tender[OPT-321-Tender == $tender] return $description} // Concession Value Description (Tender)
+						{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[count(for text:$tender1 in OPT-320-LotResult return BT-163-Tender[BT-163-Tender[OPT-321-Tender == $tender1] == 'unpublished'])>0]} #{field|name|BT-163-Tender}: #{auxiliary|text|unpublished} // Concession Value Description (Tender) (unpublished)
 						{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('applicability.',BT-773-Tender[OPT-321-Tender == $tender2])}} // Subcontracting
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-730-Tender is present and (BT-195(BT-730)-Tender is not present or BT-730-Tender == TRUE)] == $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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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 OPT-321-Tender[OPT-321-Tender[BT-195(BT-730)-Tender is present and BT-730-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-730)-Tender[OPT-321-Tender == $tender2])}} // 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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID)}} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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}: #{auxiliary|text|unpublished} // Estimated value of the part 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-553)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-553)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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[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)
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-731-Tender is present and (BT-195(BT-731)-Tender is not present or BT-731-Tender == TRUE)] == $tender1]) > 0)]} #{field|name|BT-731-Tender}: #{code|name|${if (some indicator:$svk in (for text:$tender2 in OPT-320-LotResult return BT-731-Tender[OPT-321-Tender == $tender2]) satisfies $svk == 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
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
+				0 {OPT-320-LotResult[(count(for text:$tender1 in OPT-320-LotResult return OPT-321-Tender[OPT-321-Tender[BT-195(BT-731)-Tender is present and BT-731-Tender == FALSE] == $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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-555-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-555-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-555-Tender[BT-555-Tender[OPT-321-Tender == $tender1] == -1]) > 0]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // 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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-555)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-555)-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-555)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-555)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies ($desc1 != '' and $desc1 != 'unpublished')]} #{field|name|BT-554-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-554-Tender[OPT-321-Tender == $tender2] return $desc2} // Subcontracting Description
+					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-554)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
 				0 {OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-554-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
 					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-554)-Tender}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', BT-197(BT-554)-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-554)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-554)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-554)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
@@ -200,12 +235,21 @@
 		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
+					{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 {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
+				{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 {BT-635-LotResult[BT-635-LotResult != -1]} #{field|name|BT-635-LotResult}: ${BT-635-LotResult} // 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 {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
@@ -215,6 +259,9 @@
 				{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
+					{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-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
@@ -223,14 +270,125 @@
 				0 {ND-StrategicProcurementInformationLotResult} #{field|name|BT-735-LotResult}: #{BT-735-LotResult} // 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
+	1 {ND-LotTender[OPT-322-LotResult is not present]} #{field|name|BT-13713-LotResult}: ${BT-13714-Tender} // 6.1 Result Lot Identifier (LOT-XXXX) DAP/VEAT notices
+		2 {ND-LotTender} #{auxiliary|text|winner-info} // 6.1.2. Winning tenders
+			0 {ND-LotTender} #{auxiliary|text|winner}: // Winner
+				{ND-LotTender[count(for text:$tpa1 in OPT-310-Tender, text:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-Tenderer}: ${for text:$tpa2 in OPT-310-Tender, text:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the tendering party for this Winner
+				{ND-LotTender[count(for text:$tpa1 in OPT-310-Tender, text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tpa2 in OPT-310-Tender, 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
+				{ND-LotTender[count(for text:$tpa1 in OPT-310-Tender, text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer == $tpa1]) return $orgid1)>1]} #{field|name|BT-500-Organization-Company}: ${for text:$tpa2 in OPT-310-Tender, text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $org2} // Names of non-leaders for this Winner
+				{ND-LotTender[count(for text:$tpa1 in OPT-310-Tender, text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer == $tpa1]) return $orgid1) == 1]} #{field|name|BT-500-Organization-Company}: ${for text:$tpa2 in OPT-310-Tender, text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer == $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 {ND-LotTender[some text:$name in (for text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $name != '']} #{auxiliary|text|winner-subcontractor}: // Subcontractors of the winner
+					{BT-13714-Tender[some text:$orgname1 in (for text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender]] return BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1]) satisfies $orgname1 != '']} #{field|name|BT-500-Organization-Company}: ${for text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company == OPT-301-Tenderer-SubCont[OPT-210-Tenderer == OPT-310-Tender]], text:$orgname2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return $orgname2 } // Subcontractor names
+				{ND-LotTender[count( BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender]])>0]} #{auxiliary|text|tender}: // Tender
+				{ND-LotTender} #{field|name|BT-3201-Tender}: ${BT-3201-Tender} // Tender identifier
+				{ND-LotTender} #{field|name|BT-13714-Tender}: ${BT-13714-Tender} // Identifier of lot or group of lots
+				0 {ND-LotTender[BT-720-Tender != -1]} #{field|name|BT-720-Tender}: ${format-number(BT-720-Tender, '###,##0.##')} #{code|name|${concat('currency.', BT-720-Tender[BT-720-Tender != -1]/@currencyID)}} // Value of the tender
+					{BT-197(BT-720)-Tender} #{field|name|BT-197(BT-720)-Tender}: #{BT-197(BT-720)-Tender} // Unpublished Justification Code
+					{ND-WinningTenderValueUnpublish[BT-196(BT-720)-Tender is present]} #{field|name|BT-196(BT-720)-Tender}: ${BT-196(BT-720)-Tender} // Unpublished Justification Description
+					{BT-198(BT-720)-Tender} #{field|name|BT-198(BT-720)-Tender}: ${BT-198(BT-720)-Tender} // Unpublished Access Date
+				0 {ND-LotTender[BT-720-Tender == -1]} #{field|name|BT-720-Tender}: #{auxiliary|text|unpublished} // Value of the tender (unpublished)
+					{BT-197(BT-720)-Tender} #{field|name|BT-197(BT-720)-Tender}: #{BT-197(BT-720)-Tender} // Unpublished Justification Code
+					{ND-WinningTenderValueUnpublish[BT-196(BT-720)-Tender is present]} #{field|name|BT-196(BT-720)-Tender}: ${BT-196(BT-720)-Tender} // Unpublished Justification Description
+					{BT-198(BT-720)-Tender} #{field|name|BT-198(BT-720)-Tender}: ${BT-198(BT-720)-Tender} // Unpublished Access Date
+				0 {ND-LotTender[BT-1711-Tender == TRUE]} #{field|name|BT-1711-Tender} // Tender Ranked
+				0 {ND-LotTender[BT-171-Tender != -1]} #{field|name|BT-171-Tender}: ${string(BT-171-Tender)} // Tender Rank
+					{BT-197(BT-171)-Tender} #{field|name|BT-197(BT-171)-Tender}: #{BT-197(BT-171)-Tender} // Unpublished Justification Code
+					{ND-TenderRankUnpublish[BT-196(BT-171)-Tender is present]} #{field|name|BT-196(BT-171)-Tender}: ${BT-196(BT-171)-Tender} // Unpublished Justification Description
+					{BT-198(BT-171)-Tender} #{field|name|BT-198(BT-171)-Tender}: ${BT-198(BT-171)-Tender} // Unpublished Access Date
+				0 {ND-LotTender[BT-171-Tender == -1]} #{field|name|BT-171-Tender}: #{auxiliary|text|unpublished} // Tender Rank (unpublished)
+					{BT-197(BT-171)-Tender} #{field|name|BT-197(BT-171)-Tender}: #{BT-197(BT-171)-Tender} // Unpublished Justification Code
+					{ND-TenderRankUnpublish[BT-196(BT-171)-Tender is present]} #{field|name|BT-196(BT-171)-Tender}: ${BT-196(BT-171)-Tender} // Unpublished Justification Description
+					{BT-198(BT-171)-Tender} #{field|name|BT-198(BT-171)-Tender}: ${BT-198(BT-171)-Tender} // Unpublished Access Date
+				0 {ND-LotTender[BT-160-Tender is present or BT-162-Tender is present or BT-163-Tender is present]} #{auxiliary|text|concession-value}  // Concession value (Tender)
+					0 {BT-162-Tender[BT-162-Tender != -1]} #{field|name|BT-162-Tender}: ${format-number(BT-162-Tender, '###,##0.##')} #{code|name|${concat('currency.', BT-162-Tender/@currencyID)}} // Concession Revenue User
+						{BT-197(BT-162)-Tender} #{field|name|BT-197(BT-162)-Tender}: #{BT-197(BT-162)-Tender} // Unpublished Justification Code
+						{BT-162-Tender[BT-196(BT-162)-Tender is present]} #{field|name|BT-196(BT-162)-Tender}: ${BT-196(BT-162)-Tender} // Unpublished Justification Description
+						{BT-198(BT-162)-Tender} #{field|name|BT-198(BT-162)-Tender}: ${BT-198(BT-162)-Tender} // Unpublished Access Date
+					0 {BT-162-Tender[BT-162-Tender == -1]} #{field|name|BT-162-Tender}: #{auxiliary|text|unpublished} // Concession Revenue User (unpublished)
+						{BT-197(BT-162)-Tender} #{field|name|BT-197(BT-162)-Tender}: #{BT-197(BT-162)-Tender} // Unpublished Justification Code
+						{BT-162-Tender[BT-196(BT-162)-Tender is present]} #{field|name|BT-196(BT-162)-Tender}: ${BT-196(BT-162)-Tender} // Unpublished Justification Description
+						{BT-198(BT-162)-Tender} #{field|name|BT-198(BT-162)-Tender}: ${BT-198(BT-162)-Tender} // Unpublished Access Date
+					0 {BT-160-Tender[BT-160-Tender != -1]} #{field|name|BT-160-Tender}: ${format-number(BT-160-Tender, '###,##0.##')} #{code|name|${concat('currency.', BT-160-Tender/@currencyID)}} // Concession Revenue Buyer
+						{BT-197(BT-160)-Tender} #{field|name|BT-197(BT-160)-Tender}: #{BT-197(BT-160)-Tender} // Unpublished Justification Code
+						{BT-160-Tender[BT-196(BT-160)-Tender is present]} #{field|name|BT-196(BT-160)-Tender}: ${BT-196(BT-160)-Tender} // Unpublished Justification Description
+						{BT-198(BT-160)-Tender} #{field|name|BT-198(BT-160)-Tender}: ${BT-198(BT-160)-Tender} // Unpublished Access Date
+					0 {BT-160-Tender[BT-160-Tender == -1]} #{field|name|BT-160-Tender}: #{auxiliary|text|unpublished} // Concession Revenue Buyer (unpublished)
+						{BT-197(BT-160)-Tender} #{field|name|BT-197(BT-160)-Tender}: #{BT-197(BT-160)-Tender} // Unpublished Justification Code
+						{BT-160-Tender[BT-196(BT-160)-Tender is present]} #{field|name|BT-196(BT-160)-Tender}: ${BT-196(BT-160)-Tender} // Unpublished Justification Description
+						{BT-198(BT-160)-Tender} #{field|name|BT-198(BT-160)-Tender}: ${BT-198(BT-160)-Tender} // Unpublished Access Date
+					0 {ND-ConcessionRevenue[BT-163-Tender != 'unpublished']} #{field|name|BT-163-Tender}: ${BT-163-Tender} // Concession Value Description (Tender)
+						{BT-197(BT-163)-Tender} #{field|name|BT-197(BT-163)-Tender}: #{BT-197(BT-163)-Tender} // Unpublished Justification Code
+						{ND-ConcessionRevenue[BT-196(BT-163)-Tender is present]} #{field|name|BT-196(BT-163)-Tender}: ${BT-196(BT-163)-Tender} // Unpublished Justification Description
+						{BT-198(BT-163)-Tender} #{field|name|BT-198(BT-163)-Tender}: ${BT-198(BT-163)-Tender} // Unpublished Access Date
+					0 {ND-ConcessionRevenue[BT-163-Tender == 'unpublished']} #{field|name|BT-163-Tender}: #{auxiliary|text|unpublished} // Concession Value Description (Tender) (unpublished)
+						{BT-197(BT-163)-Tender} #{field|name|BT-197(BT-163)-Tender}: #{BT-197(BT-163)-Tender} // Unpublished Justification Code
+						{ND-ConcessionRevenue[BT-196(BT-163)-Tender is present]} #{field|name|BT-196(BT-163)-Tender}: ${BT-196(BT-163)-Tender} // Unpublished Justification Description
+						{BT-198(BT-163)-Tender} #{field|name|BT-198(BT-163)-Tender}: ${BT-198(BT-163)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-773-Tender != 'unpublished']} #{field|name|BT-773-Tender}: #{code|name|${concat('applicability.',BT-773-Tender)}}  // Subcontracting  
+					{BT-197(BT-773)-Tender} #{field|name|BT-197(BT-773)-Tender}: #{BT-197(BT-773)-Tender} // Unpublished Justification Code
+					{BT-773-Tender[BT-196(BT-773)-Tender is present]} #{field|name|BT-196(BT-773)-Tender}: ${BT-196(BT-773)-Tender} // Unpublished Justification Description
+					{BT-198(BT-773)-Tender} #{field|name|BT-198(BT-773)-Tender}: ${BT-198(BT-773)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-773-Tender == 'unpublished']} #{field|name|BT-773-Tender}: #{auxiliary|text|unpublished} // Subcontracting (unpublished)
+					{BT-197(BT-773)-Tender} #{field|name|BT-197(BT-773)-Tender}: #{BT-197(BT-773)-Tender} // Unpublished Justification Code
+					{BT-773-Tender[BT-196(BT-773)-Tender is present]} #{field|name|BT-196(BT-773)-Tender}: ${BT-196(BT-773)-Tender} // Unpublished Justification Description
+					{BT-198(BT-773)-Tender} #{field|name|BT-198(BT-773)-Tender}: ${BT-198(BT-773)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-730-Tender is present and (BT-195(BT-730)-Tender is not present or BT-730-Tender == TRUE)]} #{field|name|BT-730-Tender}: #{code|name|${if (BT-730-Tender == TRUE) then 'indicator.true' else 'indicator.false' }} // The Buyer knows the estimated value of the contract that the contractor will subcontract to third parties
+					{BT-197(BT-730)-Tender} #{field|name|BT-197(BT-730)-Tender}: #{BT-197(BT-730)-Tender} // Unpublished Justification Code
+					{BT-730-Tender[BT-196(BT-730)-Tender is present]} #{field|name|BT-196(BT-730)-Tender}: ${BT-196(BT-730)-Tender} // Unpublished Justification Description
+					{BT-198(BT-730)-Tender} #{field|name|BT-198(BT-730)-Tender}: ${BT-198(BT-730)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-195(BT-730)-Tender is present and BT-730-Tender == FALSE]} #{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)
+					{BT-197(BT-730)-Tender} #{field|name|BT-197(BT-730)-Tender}: #{BT-197(BT-730)-Tender} // Unpublished Justification Code
+					{BT-730-Tender[BT-196(BT-730)-Tender is present]} #{field|name|BT-196(BT-730)-Tender}: ${BT-196(BT-730)-Tender} // Unpublished Justification Description
+					{BT-198(BT-730)-Tender} #{field|name|BT-198(BT-730)-Tender}: ${BT-198(BT-730)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-553-Tender != -1]} #{field|name|BT-553-Tender}: ${format-number(BT-553-Tender, '###,##0.##')} #{code|name|${concat('currency.', BT-553-Tender/@currencyID)}} // Estimated value of the part of the contract that the contractor will subcontract to third parties
+					{BT-197(BT-553)-Tender} #{field|name|BT-197(BT-553)-Tender}: #{BT-197(BT-553)-Tender} // Unpublished Justification Code
+					{BT-553-Tender[BT-196(BT-553)-Tender is present]} #{field|name|BT-196(BT-553)-Tender}: ${BT-196(BT-553)-Tender} // Unpublished Justification Description
+					{BT-198(BT-553)-Tender} #{field|name|BT-198(BT-553)-Tender}: ${BT-198(BT-553)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-553-Tender == -1]} #{field|name|BT-553-Tender}: #{auxiliary|text|unpublished} // Estimated value of the part of the contract that the contractor will subcontract to third parties (unpublished)
+					{BT-197(BT-553)-Tender} #{field|name|BT-197(BT-553)-Tender}: #{BT-197(BT-553)-Tender} // Unpublished Justification Code
+					{BT-553-Tender[BT-196(BT-553)-Tender is present]} #{field|name|BT-196(BT-553)-Tender}: ${BT-196(BT-553)-Tender} // Unpublished Justification Description
+					{BT-198(BT-553)-Tender} #{field|name|BT-198(BT-553)-Tender}: ${BT-198(BT-553)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-731-Tender is present and (BT-195(BT-731)-Tender is not present or BT-731-Tender == TRUE)]} #{field|name|BT-731-Tender}: #{code|name|${if (BT-731-Tender == 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
+					{BT-197(BT-731)-Tender} #{field|name|BT-197(BT-731)-Tender}: #{BT-197(BT-731)-Tender} // Unpublished Justification Code
+					{BT-731-Tender[BT-196(BT-731)-Tender is present]} #{field|name|BT-196(BT-731)-Tender}: ${BT-196(BT-731)-Tender} // Unpublished Justification Description
+					{BT-198(BT-731)-Tender} #{field|name|BT-198(BT-731)-Tender}: ${BT-198(BT-731)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-195(BT-731)-Tender is present and BT-731-Tender == FALSE]} #{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)
+					{BT-197(BT-731)-Tender} #{field|name|BT-197(BT-731)-Tender}: #{BT-197(BT-731)-Tender} // Unpublished Justification Code
+					{BT-731-Tender[BT-196(BT-731)-Tender is present]} #{field|name|BT-196(BT-731)-Tender}: ${BT-196(BT-731)-Tender} // Unpublished Justification Description
+					{BT-198(BT-731)-Tender} #{field|name|BT-198(BT-731)-Tender}: ${BT-198(BT-731)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-555-Tender != -1]} #{field|name|BT-555-Tender}: ${format-number(BT-555-Tender, '###,##0.##')} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract
+					{BT-197(BT-555)-Tender} #{field|name|BT-197(BT-555)-Tender}: #{BT-197(BT-555)-Tender} // Unpublished Justification Code
+					{BT-555-Tender[BT-196(BT-555)-Tender is present]} #{field|name|BT-196(BT-555)-Tender}: ${BT-196(BT-555)-Tender} // Unpublished Justification Description
+					{BT-198(BT-555)-Tender} #{field|name|BT-198(BT-555)-Tender}: ${BT-198(BT-555)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-555-Tender == -1]} #{field|name|BT-555-Tender}: #{auxiliary|text|unpublished} // Estimated percentage of the contract that the contractor will subcontract to third parties, compared to the whole contract (unpublished)
+					{BT-197(BT-555)-Tender} #{field|name|BT-197(BT-555)-Tender}: #{BT-197(BT-555)-Tender} // Unpublished Justification Code
+					{BT-555-Tender[BT-196(BT-555)-Tender is present]} #{field|name|BT-196(BT-555)-Tender}: ${BT-196(BT-555)-Tender} // Unpublished Justification Description
+					{BT-198(BT-555)-Tender} #{field|name|BT-198(BT-555)-Tender}: ${BT-198(BT-555)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[(BT-554-Tender != '' and BT-554-Tender != 'unpublished')]} #{field|name|BT-554-Tender}: ${BT-554-Tender} // Subcontracting Description
+					{BT-197(BT-554)-Tender} #{field|name|BT-197(BT-554)-Tender}: #{BT-197(BT-554)-Tender} // Unpublished Justification Code
+					{ND-SubcontractedContract[BT-196(BT-554)-Tender is present]} #{field|name|BT-196(BT-554)-Tender}: ${BT-196(BT-554)-Tender} // Unpublished Justification Description
+					{BT-198(BT-554)-Tender} #{field|name|BT-198(BT-554)-Tender}: ${BT-198(BT-554)-Tender} // Unpublished Access Date
+				0 {ND-SubcontractedContract[BT-554-Tender == 'unpublished']} #{field|name|BT-554-Tender}: #{auxiliary|text|unpublished} // Subcontracting Description (unpublished)
+					{BT-197(BT-554)-Tender} #{field|name|BT-197(BT-554)-Tender}: #{BT-197(BT-554)-Tender} // Unpublished Justification Code
+					{ND-SubcontractedContract[BT-196(BT-554)-Tender is present]} #{field|name|BT-196(BT-554)-Tender}: ${BT-196(BT-554)-Tender} // Unpublished Justification Description
+					{BT-198(BT-554)-Tender} #{field|name|BT-198(BT-554)-Tender}: ${BT-198(BT-554)-Tender} // Unpublished Access Date
+				0 {OPT-321-Tender} #{auxiliary|text|contract-information}: // Contract info for this tender
+					0 {OPT-321-Tender} #{field|name|BT-150-Contract}: ${for text:$tender in OPT-321-Tender return BT-150-Contract[BT-3202-Contract == $tender]} // Contract identifier
+					0 {OPT-321-Tender} #{field|name|BT-721-Contract}: ${for text:$tender in OPT-321-Tender return BT-721-Contract[BT-3202-Contract == $tender]} // Contract title
+					0 {OPT-321-Tender} #{field|name|BT-1451-Contract}: ${for text:$tender in OPT-321-Tender return date:BT-1451-Contract[BT-3202-Contract == $tender]} // Winning Decision date
+					0 {OPT-321-Tender[some text:$contractid in (for text:$tender in OPT-321-Tender 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
+						0 {OPT-321-Tender[some text:$eufundname in (for text:$tender in OPT-321-Tender return BT-722-Contract[BT-3202-Contract == $tender]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: #{code|name|${for text:$tender2 in OPT-321-Tender, text:$name in BT-722-Contract[BT-3202-Contract == $tender2] return concat('eu-programme.', $name)}} // Contract EU Funds Name
+						0 {OPT-321-Tender[some text:$eufundid in (for text:$tender in OPT-321-Tender return BT-5011-Contract[BT-3202-Contract == $tender]) satisfies $eufundid != '']} #{field|name|BT-5011-Contract}: ${for text:$tender2 in OPT-321-Tender return BT-5011-Contract[BT-3202-Contract == $tender2]} // Contract EU Funds Identifier
+						0 {OPT-321-Tender[some text:$eufunddesc in (for text:$tender in OPT-321-Tender return BT-6110-Contract[BT-3202-Contract == $tender]) satisfies $eufunddesc != '']} #{field|name|BT-6110-Contract}: ${for text:$tender2 in OPT-321-Tender, text:$details in BT-6110-Contract[BT-3202-Contract == $tender2] return $details} // Contract EU Funds Details
+					0 {OPT-321-Tender[count(for text:$tender in OPT-321-Tender return OPT-300-Contract-Signatory[BT-3202-Contract == $tender]) > 0]} #{auxiliary|text|organisation-signing-contract}: ${for text:$tender2 in OPT-321-Tender, 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
 7 {ND-Root[BT-1501(n)-Contract is present]} #{auxiliary|text|modification} // 7. Modifications
 	1 {ND-ContractModification} #{auxiliary|text|modification} // Modification
 		{BT-1501(n)-Contract} #{field|name|BT-1501(n)-Contract}: ${BT-1501(n)-Contract} // Modification Previous Notice Identifier
 		{BT-1501(c)-Contract} #{field|name|BT-1501(c)-Contract}: ${BT-1501(c)-Contract} // Modified Contract Reference
 		{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
+		{ND-ContractModification} #{field|name|BT-201-Contract}: ${BT-201-Contract} // Modification Reason Description
 		1 {ND-Modification} #{auxiliary|text|change} // Modification
-			{BT-202-Contract} #{field|name|BT-202-Contract}: ${BT-202-Contract} // Modification Previous Notice Section Identifier
+			{ND-Modification} #{field|name|BT-202-Contract}: ${BT-202-Contract} // Modification Description
 			{BT-1501(p)-Contract} #{field|name|BT-1501(p)-Contract}: ${BT-1501(p)-Contract} // Modified Notice Part Reference
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
@@ -285,10 +443,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
diff --git a/view-templates/5.efx b/view-templates/5.efx
index 8b22e047f..8ac9bfc50 100644
--- a/view-templates/5.efx
+++ b/view-templates/5.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{BT-10-Procedure-Buyer} #{field|name|BT-10-Procedure-Buyer}: #value // Activity of the contracting authority
 		{BT-610-Procedure-Buyer} #{field|name|BT-610-Procedure-Buyer}: #{BT-610-Procedure-Buyer} // Activity Entity
 2 {ND-Root} #{auxiliary|text|procedure} // 2. Procedure
@@ -52,7 +52,7 @@
 			{BT-5141-Part} #{field|name|BT-5141-Part}: #{BT-5141-Part} // Country
 			{BT-727-Part} #{BT-727-Part} // Restrictions on the place of performance
 			{ND-PartPlacePerformance[BT-728-Part is present]} #{field|name|BT-728-Part}: ${BT-728-Part} // Additional information
-		3 {ND-PartDuration[(BT-536-Part is present) or (BT-537-Part is present) or (BT-36-Part is present)]} #{auxiliary|text|duration} // 3.1.3 Duration
+		3 {ND-PartDuration} #{auxiliary|text|duration} // 3.1.3 Duration
 			{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.###,###,###')} #{code|name|${concat('duration-unit.', BT-36-Part/@unitCode)}} // Period
@@ -147,10 +147,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
diff --git a/view-templates/6.efx b/view-templates/6.efx
index 9af387799..6a66fee17 100644
--- a/view-templates/6.efx
+++ b/view-templates/6.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // 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
 		{BT-610-Procedure-Buyer} #{field|name|BT-610-Procedure-Buyer}: #{BT-610-Procedure-Buyer} // Activity Entity
@@ -53,7 +53,7 @@
 			{BT-5141-Part} #{field|name|BT-5141-Part}: #{BT-5141-Part} // Country
 			{BT-727-Part} #{BT-727-Part} // Restrictions on the place of performance
 			{ND-PartPlacePerformance[BT-728-Part is present]} #{field|name|BT-728-Part}: ${BT-728-Part} // Additional information
-		3 {ND-PartDuration[(BT-536-Part is present) or (BT-537-Part is present) or (BT-36-Part is present)]} #{auxiliary|text|duration} // 3.1.3 Duration
+		3 {ND-PartDuration} #{auxiliary|text|duration} // 3.1.3 Duration
 			{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.###,###,###')} #{code|name|${concat('duration-unit.', BT-36-Part/@unitCode)}} // Period
@@ -147,10 +147,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
diff --git a/view-templates/7.efx b/view-templates/7.efx
index e942b612d..e7769942e 100644
--- a/view-templates/7.efx
+++ b/view-templates/7.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{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
@@ -76,7 +76,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -131,13 +130,12 @@
 				{BT-747-Lot} #{field|name|BT-747-Lot}: #{BT-747-Lot} // Selection Criterion Type
 				{ND-SelectionCriteria[BT-749-Lot is present]} #{field|name|BT-749-Lot}: ${BT-749-Lot} // Selection Criterion Name
 				{ND-SelectionCriteria[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
 				{BT-7531-Lot} #{BT-7531-Lot}: ${format-number(BT-752-Lot-WeightNumber, '###,##0.###,###,###')} // Number Weight
 				{BT-7532-Lot} #{BT-7532-Lot}: ${format-number(BT-752-Lot-ThresholdNumber, '###,##0.###,###,###')} // Number Threshold
 			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-51-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.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
@@ -181,7 +179,7 @@
 				{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} #{field|name|BT-769-Lot}: #{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-751-Lot[BT-75-Lot is present]} #{field|name|BT-75-Lot}: ${BT-75-Lot} // Financial Guarantee Description
 				{BT-1311(d)-Lot} #{field|name|BT-1311(d)-Lot}: ${BT-1311(d)-Lot} ${BT-1311(t)-Lot} // Deadline for receipt of requests to participate
 				{BT-131(d)-Lot} #{field|name|BT-131(d)-Lot}: ${BT-131(d)-Lot} ${BT-131(t)-Lot} // Deadline for receipt of tenders
 				{BT-98-Lot} #{field|name|BT-98-Lot}: ${OPA-98-Lot-Number} #{code|name|${concat('duration-unit.', BT-98-Lot/@unitCode)}} // Deadline until which the tender must remain valid
@@ -272,10 +270,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
diff --git a/view-templates/8.efx b/view-templates/8.efx
index 192dee8f4..801e4c408 100644
--- a/view-templates/8.efx
+++ b/view-templates/8.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // Legal type of the buyer
 		{BT-10-Procedure-Buyer} #{field|name|BT-10-Procedure-Buyer}: #value // Activity of the contracting authority
 		{BT-610-Procedure-Buyer} #{field|name|BT-610-Procedure-Buyer}: #{BT-610-Procedure-Buyer} // Activity Entity
 2 {ND-Root} #{auxiliary|text|procedure} // 2. Procedure
@@ -77,7 +77,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -132,13 +131,12 @@
 				{BT-747-Lot} #{field|name|BT-747-Lot}: #{BT-747-Lot} // Selection Criterion Type
 				{ND-SelectionCriteria[BT-749-Lot is present]} #{field|name|BT-749-Lot}: ${BT-749-Lot} // Selection Criterion Name
 				{ND-SelectionCriteria[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
 				{BT-7531-Lot} #{BT-7531-Lot}: ${format-number(BT-752-Lot-WeightNumber, '###,##0.###,###,###')} // Number Weight
 				{BT-7532-Lot} #{BT-7532-Lot}: ${format-number(BT-752-Lot-ThresholdNumber, '###,##0.###,###,###')} // Number Threshold
 			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-51-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.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
@@ -182,13 +180,13 @@
 				{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} #{field|name|BT-769-Lot}: #{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-751-Lot[BT-75-Lot is present]} #{field|name|BT-75-Lot}: ${BT-75-Lot} // Financial Guarantee Description
 				{BT-131(d)-Lot} #{field|name|BT-131(d)-Lot}: ${BT-131(d)-Lot} ${BT-131(t)-Lot} // Deadline for receipt of tenders
 				{BT-98-Lot} #{field|name|BT-98-Lot}: ${OPA-98-Lot-Number} #{code|name|${concat('duration-unit.', 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
 				{BT-771-Lot} #{BT-771-Lot} // Late Tenderer Information
 				{ND-LateTendererInformation[BT-772-Lot is present]} #{field|name|BT-772-Lot}: ${BT-772-Lot} // Late Tenderer Information Description
-			0 {ND-LotTenderingTerms[(BT-736-Lot is present) or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot is present) or (BT-93-Lot is present) 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
+			0 {ND-LotTenderingTerms[(BT-736-Lot is present) or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot is present) or (BT-93-Lot is present) 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-681-Lot is present)]} #{auxiliary|text|contract-terms}: // Terms of contract
 				{BT-736-Lot} #{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.
@@ -221,8 +219,8 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // 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
@@ -274,10 +272,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
@@ -292,3 +290,6 @@
 		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
 		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
 		{BT-127-notice} #{field|name|BT-127-notice}: ${BT-127-notice} // Estimated date of publication of a contract notice within this procedure
+otice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
+		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
+		{BT-127-notice} #{field|name|BT-127-notice}: ${BT-127-notice} // Estimated date of publication of a contract notice within this procedure
diff --git a/view-templates/9.efx b/view-templates/9.efx
index dc8f40dd8..dba5daf7b 100644
--- a/view-templates/9.efx
+++ b/view-templates/9.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // 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
 		{BT-610-Procedure-Buyer} #{field|name|BT-610-Procedure-Buyer}: #{BT-610-Procedure-Buyer} // Activity Entity
@@ -78,7 +78,6 @@
 			{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
 			0 {ND-OptionsAndRenewals[BT-54-Lot is present]} #{auxiliary|text|options}: // Options
@@ -132,13 +131,12 @@
 				{BT-747-Lot} #{field|name|BT-747-Lot}: #{BT-747-Lot} // Selection Criterion Type
 				{ND-SelectionCriteria[BT-749-Lot is present]} #{field|name|BT-749-Lot}: ${BT-749-Lot} // Selection Criterion Name
 				{ND-SelectionCriteria[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
 				{BT-7531-Lot} #{BT-7531-Lot}: ${format-number(BT-752-Lot-WeightNumber, '###,##0.###,###,###')} // Number Weight
 				{BT-7532-Lot} #{BT-7532-Lot}: ${format-number(BT-752-Lot-ThresholdNumber, '###,##0.###,###,###')} // Number Threshold
 			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-51-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.
 		10 {ND-LotAwardCriteria} #{auxiliary|text|award-criteria} // 5.1.10 Award criteria
 			0 {ND-LotAwardCriterion} #{auxiliary|text|criterion}: // Award Criterion
@@ -183,14 +181,14 @@
 				{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} #{field|name|BT-769-Lot}: #{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-751-Lot[BT-75-Lot is present]} #{field|name|BT-75-Lot}: ${BT-75-Lot} // Financial Guarantee Description
 				{BT-1311(d)-Lot} #{field|name|BT-1311(d)-Lot}: ${BT-1311(d)-Lot} ${BT-1311(t)-Lot} // Deadline for receipt of requests to participate
 				{BT-131(d)-Lot} #{field|name|BT-131(d)-Lot}: ${BT-131(d)-Lot} ${BT-131(t)-Lot} // Deadline for receipt of tenders
 				{BT-98-Lot} #{field|name|BT-98-Lot}: ${OPA-98-Lot-Number} #{code|name|${concat('duration-unit.', 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
 				{BT-771-Lot} #{BT-771-Lot} // Late Tenderer Information
 				{ND-LateTendererInformation[BT-772-Lot is present]} #{field|name|BT-772-Lot}: ${BT-772-Lot} // Late Tenderer Information Description
-			0 {ND-LotTenderingTerms[(BT-736-Lot is present) or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot is present) or (BT-93-Lot is present) 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
+			0 {ND-LotTenderingTerms[(BT-736-Lot is present) or (BT-70-Lot is present) or (BT-801-Lot is present) or (BT-743-Lot is present) or (BT-92-Lot is present) or (BT-93-Lot is present) 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-681-Lot is present)]} #{auxiliary|text|contract-terms}: // Terms of contract
 				{BT-736-Lot} #{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.
@@ -227,8 +225,8 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // 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
@@ -280,10 +278,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
@@ -298,3 +296,6 @@
 		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
 		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
 		{BT-127-notice} #{field|name|BT-127-notice}: ${BT-127-notice} // Estimated date of publication of a contract notice within this procedure
+-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
+		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
+		{BT-127-notice} #{field|name|BT-127-notice}: ${BT-127-notice} // Estimated date of publication of a contract notice within this procedure
diff --git a/view-templates/CEI.efx b/view-templates/CEI.efx
index 0cf3367e1..03c29ca24 100644
--- a/view-templates/CEI.efx
+++ b/view-templates/CEI.efx
@@ -3,7 +3,7 @@
 1 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // 1 Buyer
 	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-11-Procedure-Buyer} #{field|name|BT-11-Procedure-Buyer}: #{BT-11-Procedure-Buyer} // 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
@@ -51,7 +51,6 @@
 			{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
@@ -78,7 +77,6 @@
 				{BT-747-Lot} #{field|name|BT-747-Lot}: #{BT-747-Lot} // Selection Criterion Type
 				{ND-SelectionCriteria[BT-749-Lot is present]} #{field|name|BT-749-Lot}: ${BT-749-Lot} // Selection Criterion Name
 				{ND-SelectionCriteria[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
 		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)
@@ -108,8 +106,8 @@
 			{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-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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // 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
@@ -155,10 +153,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
@@ -173,3 +171,5 @@
 		{OPP-010-notice} #{field|name|OPP-010-notice}: ${OPP-010-notice} // Notice publication number
 		{OPP-011-notice} #{field|name|OPP-011-notice}: ${OPP-011-notice} // OJ S issue number
 		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
+011-notice}: ${OPP-011-notice} // OJ S issue number
+		{OPP-012-notice} #{field|name|OPP-012-notice}: ${OPP-012-notice} // Publication date
diff --git a/view-templates/T01.efx b/view-templates/T01.efx
index 99c0accee..24ba1d5e6 100644
--- a/view-templates/T01.efx
+++ b/view-templates/T01.efx
@@ -10,8 +10,12 @@
 	1 {ND-ProcedureProcurementScope} #{auxiliary|text|procedure} // 2.1 Procedure
 		{ND-ProcedureProcurementScope} #{field|name|BT-21-Procedure}: ${BT-21-Procedure} // Procedure Title
 		{ND-ProcedureProcurementScope} #{field|name|BT-24-Procedure}: ${BT-24-Procedure} // Procedure Description
+		{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
+			{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)
@@ -36,7 +40,6 @@
 			{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
@@ -54,8 +57,8 @@
 			{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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // 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
@@ -95,10 +98,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
diff --git a/view-templates/T02.efx b/view-templates/T02.efx
index 6ac1805f0..6054412c9 100644
--- a/view-templates/T02.efx
+++ b/view-templates/T02.efx
@@ -14,6 +14,9 @@
 		{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
+			{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-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
@@ -49,7 +52,6 @@
 			{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
@@ -82,32 +84,41 @@
 		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-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-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
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='serv-prov']]} #{auxiliary|text|organisation-providing-procurement-service}: ${BT-500-Organization-Company} // Service Provider organisation
+			{ND-Company[OPT-200-Organization-Company == OPT-300-Procedure-SProvider[OPT-030-Procedure-SProvider=='ted-esen']]} #{auxiliary|text|organisation-esender}: ${BT-500-Organization-Company} // eSender
 6 {ND-NoticeResult} #{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 ?
+			{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-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
+			{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 {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
+		2 {ND-LotResult[BT-02-notice in ('veat','can-modif') or ((BT-142-LotResult in ('selec-w','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:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-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:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the 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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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-210-Tenderer == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $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 == $tpa1]) return $orgid1) == 1]} #{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 == $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 $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[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$name1 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $name1)>0]} #{field|name|OPT-211-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$name2 in (OPT-211-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]) return $name2} // Name of the tendering party for this Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 Winner
+				{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 == $tpa1]) return $orgid1)>1]} #{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 == FALSE or OPT-170-Tenderer is not present]), text:$orgid3 in (OPT-300-Tenderer[OPT-300-Tenderer[OPT-210-Tenderer == $tpa2] == $orgid2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid3] return $org2} // Names of non-leaders for this Winner
+				{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 == $tpa1]) return $orgid1) == 1]} #{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 == $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:$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:$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:$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 $orgname2} // Subcontractor names
+				{OPT-320-LotResult[count(for text:$tender1 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 == $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.##')} #{code|name|${for text:$tender3 in OPT-320-LotResult return concat('currency.', BT-720-Tender[BT-720-Tender[OPT-321-Tender == $tender3] != -1]/@currencyID )}} // Value of the tender
+					{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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
 				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}: #{code|name|${for text:$tender2 in OPT-320-LotResult return concat('non-publication-justification.', 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
@@ -125,9 +136,9 @@
 		{BT-1501(n)-Contract} #{field|name|BT-1501(n)-Contract}: ${BT-1501(n)-Contract} // Modification Previous Notice Identifier
 		{BT-1501(c)-Contract} #{field|name|BT-1501(c)-Contract}: ${BT-1501(c)-Contract} // Modified Contract Reference
 		{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
+		{ND-ContractModification} #{field|name|BT-201-Contract}: ${BT-201-Contract} // Modification Reason Description
 		1 {ND-Modification} #{auxiliary|text|change} // Modification
-			{BT-202-Contract} #{field|name|BT-202-Contract}: ${BT-202-Contract} // Modification Previous Notice Section Identifier
+			{ND-Modification} #{field|name|BT-202-Contract}: ${BT-202-Contract} // Modification Description
 			{BT-1501(p)-Contract} #{field|name|BT-1501(p)-Contract}: ${BT-1501(p)-Contract} // Modified Notice Part Reference
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
 	1 {ND-Organization} ${OPT-200-Organization-Company} // 8.1 Organisation Technical Identifier
@@ -185,10 +196,10 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{field|name|BT-762-notice}: ${BT-762-notice} // Change Reason Description
 	1 {ND-Change} #{auxiliary|text|change} // 10.1 Change
 		{BT-13716-notice} #{field|name|BT-13716-notice}: ${BT-13716-notice} // Change Previous Section Identifier
-		{BT-141(a)-notice} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
+		{ND-Change[BT-141(a)-notice is present]} #{field|name|BT-141(a)-notice}: ${BT-141(a)-notice} // Change Description
 		{BT-719-notice} #{field|name|BT-718-notice}: ${BT-719-notice} // Change Procurement Documents / Change Procurement Documents Date
 11 {ND-Root} #{auxiliary|text|notice-information} // 11. Notice information
 	1 {ND-Root} #{auxiliary|text|notice-information} // 11.1 Notice information
diff --git a/view-templates/X01.efx b/view-templates/X01.efx
index a920bcd07..bd4810e20 100644
--- a/view-templates/X01.efx
+++ b/view-templates/X01.efx
@@ -20,7 +20,7 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{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
diff --git a/view-templates/X02.efx b/view-templates/X02.efx
index e6929e44d..fec6038d2 100644
--- a/view-templates/X02.efx
+++ b/view-templates/X02.efx
@@ -33,7 +33,7 @@
 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
+	{ND-ChangeReason[BT-762-notice is present]} #{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
diff --git a/view-templates/summary.efx b/view-templates/summary.efx
index 5e9f7c4e0..fb1493f2e 100644
--- a/view-templates/summary.efx
+++ b/view-templates/summary.efx
@@ -1,11 +1,11 @@
 // Summary
 // File generated from metadata database
 0 {ND-Root[OPT-300-Procedure-Buyer is present]} #{auxiliary|text|buyer} // Buyer Summary
-	0 {ND-ContractingParty} #{auxiliary|text|buyer-competent} // Competent authority
-		0 {ND-ContractingParty} #{auxiliary|text|buyer} ${for text:$orgid in OPT-300-Procedure-Buyer, text:$orgname in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return $orgname} // Buyer
+	0 {ND-ContractingParty[(count(for text:$reforgid in OPT-300-Procedure-Buyer, text:$orgid in OPT-200-Organization-Company[OPT-200-Organization-Company[(OPP-050-Organization == TRUE) or (not(/OPP-050-Organization == TRUE))] == $reforgid] return $orgid) > 0) and not(preceding::OPT-300-Procedure-Buyer[(count(for text:$reforgid1 in OPT-300-Procedure-Buyer, text:$orgid1 in OPT-200-Organization-Company[OPT-200-Organization-Company[(OPP-050-Organization == TRUE) or (not(/OPP-050-Organization == TRUE))] == $reforgid1] return $orgid1) > 0)] is present)]} #{auxiliary|text|buyer-competent} // Competent authority (first Group Leader or first of all)
+		0 {ND-ContractingParty} #{auxiliary|text|buyer} ${for text:$orgid in OPT-300-Procedure-Buyer, text:$orgname in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid] return $orgname} // Buyer name (summary)
 		0 {ND-ContractingParty} ${for text:$orgid in OPT-300-Procedure-Buyer return concat(BT-514-Organization-Company[OPT-200-Organization-Company == $orgid], ', ', BT-507-Organization-Company[OPT-200-Organization-Company == $orgid], ', ', BT-513-Organization-Company[OPT-200-Organization-Company == $orgid])} // Place of the Buyer
 // summary efx
-// 2. Procedure Summary (empty)
+{ND-Root} Procedure // 2. Procedure Summary (empty) 
 // summary efx
 0 {ND-Part} ${BT-137-Part}: ${BT-21-Part} // 3.1 Part Summary
 	{ND-Part} #{BT-262-Part} (${BT-262-Part}) // Main CPV