diff --git a/view-templates/28.efx b/view-templates/28.efx
index 78953fc87..7121e568d 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,53 +250,77 @@
 			{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.##')} ${BT-709-LotResult/@currencyID} // Framework Maximum Value
+			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.##')} ${BT-660-LotResult/@currencyID} // Framework Re-estimated Value
+			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:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this Winner
 				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1], text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]) return $orgid1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$contractid2 in OPT-316-Contract[BT-3202-Contract == $tender2], text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this Winner
@@ -256,71 +330,89 @@
 				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$contractid1 in OPT-316-Contract[BT-3202-Contract == $tender1] return BT-500-Organization-Company[OPT-200-Organization-Company == OPT-300-Tenderer[OPT-210-Tenderer == OPT-310-Tender[OPT-321-Tender == $tender1]]])>0]} #{auxiliary|text|tender}: // Tender
 				{OPT-320-LotResult} #{field|name|BT-3201-Tender}: ${for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender == $tender]} // Tender identifier
 				{OPT-320-LotResult} #{field|name|BT-13714-Tender}: ${for text:$tender in OPT-320-LotResult return BT-13714-Tender[OPT-321-Tender == $tender]} // Identifier of lot or group of lots
-				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-720-Tender[BT-720-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-720-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$tendervalue in BT-720-Tender[OPT-321-Tender == $tender2] return format-number($tendervalue, '###,##0.##')} ${for text:$tender3 in OPT-320-LotResult return BT-720-Tender[BT-720-Tender[OPT-321-Tender == $tender3] != -1]/@currencyID } // Value of the tender
+				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-720-Tender[BT-720-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-720-Tender}: ${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}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-720)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+					{OPT-320-LotResult[some text:$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 // {OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-720)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-720)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-720)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
-				0 {OPT-320-LotResult[some indicator:$tranked in (for text:$tender in OPT-320-LotResult return BT-1711-Tender[OPT-321-Tender == $tender]) satisfies $tranked == TRUE]} #{field|name|BT-1711-Tender} // Tender Ranked
-				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-171-Tender[BT-171-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-171-Tender}: ${for text:$tender2 in OPT-320-LotResult return string(BT-171-Tender[OPT-321-Tender == $tender2])} // Tender Rank
-				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return number:BT-171-Tender[BT-171-Tender[OPT-321-Tender == $tender1] == -1]) > 0]} #{field|name|BT-171-Tender}: #{auxiliary|text|unpublished} // Tender Rank (unpublished)
-					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $code !='']} #{field|name|BT-197(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-171)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
-					{OPT-320-LotResult[some text:$desc1 in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $desc1 != '']} #{field|name|BT-196(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$desc2 in BT-196(BT-171)-Tender[OPT-321-Tender == $tender2] return $desc2} // Unpublished Justification Description
-					{OPT-320-LotResult[some date:$date in (for text:$tender1 in OPT-320-LotResult return BT-198(BT-171)-Tender[OPT-321-Tender == $tender1]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-171)-Tender}: ${for text:$tender2 in OPT-320-LotResult return date:BT-198(BT-171)-Tender[OPT-321-Tender == $tender2]} // Unpublished Access Date
+					{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.##')} ${for text:$tender3 in OPT-320-LotResult return BT-162-Tender[OPT-321-Tender == $tender3]/@currencyID} // Concession Revenue User
+					0 {OPT-320-LotResult[some number:$revenue1 in (for text:$tender1 in OPT-320-LotResult return BT-162-Tender[OPT-321-Tender == $tender1]) satisfies $revenue1 != -1]} #{field|name|BT-162-Tender}: ${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}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-162)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+						{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.##')} ${for text:$tender3 in OPT-320-LotResult return BT-160-Tender[OPT-321-Tender == $tender3]/@currencyID} // Concession Revenue Buyer (Tender)
+					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}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-160)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+						{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}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-163)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+						{OPT-320-LotResult[some text:$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 indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender}  // TODO The tender is a variant  0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1] ) satisfies $bool == TRUE)]} #{field|name|BT-193-Tender}    #{code|name|${if (some indicator:$bool2 in (for text:$tender2 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender2]) satisfies $bool2 == TRUE) then 'indicator.true' else 'indicator.false' }}
-				0 {OPT-320-LotResult[(some indicator:$bool in (for text:$tender1 in OPT-320-LotResult return BT-193-Tender[OPT-321-Tender == $tender1]) satisfies $bool == FALSE) and (some text:$code in (for text:$tender2 in OPT-320-LotResult return BT-195(BT-193)-Tender[OPT-321-Tender == $tender2]) satisfies $code != '')]} #{field|name|BT-193-Tender}: #{auxiliary|text|unpublished} // The tender is a variant (unpublished)
-					0 {OPT-320-LotResult[(some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-193)-Tender[OPT-321-Tender == $tender1] ) satisfies $code != '')]} #{field|name|BT-197(BT-193)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-193)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
-					0 {OPT-320-LotResult[(some text:$desc in (for text:$tender1 in OPT-320-LotResult return BT-196(BT-193)-Tender[OPT-321-Tender == $tender1] ) satisfies $desc != '')]} #{field|name|BT-196(BT-193)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-196(BT-193)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Description
-					{OPT-320-LotResult[some date:$date in (for text:$tender in OPT-320-LotResult return BT-198(BT-193)-Tender[OPT-321-Tender == $tender]) satisfies $date > 0000-01-01Z]} #{field|name|BT-198(BT-193)-Tender}: ${for text:$tender1 in OPT-320-LotResult return date:BT-198(BT-193)-Tender[OPT-321-Tender == $tender1]} // Unpublished Access Date
-				0 {OPT-320-LotResult[some text:$country in (for text:$tender1 in OPT-320-LotResult return BT-191-Tender[OPT-321-Tender == $tender1]) satisfies ($country != '' and $country != 'unpublished')]} #{field|name|BT-191-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-191-Tender[OPT-321-Tender == $tender2]} // Country Origin
-				0 {OPT-320-LotResult[some text:$country in (for text:$tender1 in OPT-320-LotResult return BT-191-Tender[OPT-321-Tender == $tender1]) satisfies $country == 'unpublished']} #{field|name|BT-191-Tender}:#{auxiliary|text|unpublished} // Country Origin (unpublished)
-					{OPT-320-LotResult[some text:$code in (for text:$tender in OPT-320-LotResult return BT-197(BT-191)-Tender[OPT-321-Tender == $tender]) satisfies $code !='']} #{field|name|BT-197(BT-191)-Tender}: ${for text:$tender1 in OPT-320-LotResult return BT-197(BT-191)-Tender[OPT-321-Tender == $tender1]} // Unpublished Justification Code
+				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}: ${for text:$tender2 in OPT-320-LotResult return BT-773-Tender[OPT-321-Tender == $tender2]} // Subcontracting
+				0 {OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult return BT-773-Tender[BT-773-Tender[OPT-321-Tender == $tender1] != 'unpublished'])>0]} #{field|name|BT-773-Tender}: #{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}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-773)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+					{OPT-320-LotResult[some text:$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)
-					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-730)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-730)-Tender}: ${for text:$tender2 in OPT-320-LotResult, text:$code2 in BT-197(BT-730)-Tender[OPT-321-Tender == $tender2] return $code2} // Unpublished Justification Code
+				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 number:BT-553-Tender[BT-553-Tender[OPT-321-Tender == $tender1] != -1]) > 0]} #{field|name|BT-553-Tender}: ${for text:$tender2 in OPT-320-LotResult, number:$subconvalue in BT-553-Tender[OPT-321-Tender == $tender2] return format-number($subconvalue, '###,##0.##')} ${for text:$tender3 in OPT-320-LotResult return BT-553-Tender[OPT-321-Tender == $tender3]/@currencyID} // Estimated value of the part of the contract that the contractor will subcontract to third parties
+				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}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-553)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+					{OPT-320-LotResult[some text:$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)
-					{OPT-320-LotResult[some text:$code in (for text:$tender1 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender1]) satisfies $code != '']} #{field|name|BT-197(BT-731)-Tender}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-731)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+				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 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.##')} ${for text:$tender3 in OPT-320-LotResult return BT-555-Tender[OPT-321-Tender == $tender3]/@currencyID} // 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 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}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-555)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+					{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}: ${for text:$tender2 in OPT-320-LotResult return BT-197(BT-554)-Tender[OPT-321-Tender == $tender2]} // Unpublished Justification Code
+					{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
@@ -331,24 +423,28 @@
 					{OPT-320-LotResult} #{field|name|BT-768-Contract}: #{code|name|${if (some indicator:$fa in (for text:$tender1 in OPT-320-LotResult return indicator:BT-768-Contract[BT-3202-Contract == $tender1]) satisfies $fa == TRUE) then 'indicator.true' else 'indicator.false'}} // Contract Framework Agreement indicator.true
 					{OPT-320-LotResult[some text:$url in (for text:$tender1 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender1]) satisfies $url != '']} #{field|name|BT-151-Contract}: ${for text:$tender2 in OPT-320-LotResult return BT-151-Contract[BT-3202-Contract == $tender2]} // Contract URL
 					0 {OPT-320-LotResult[some text:$contractid in (for text:$tender in OPT-320-LotResult return BT-3202-Contract[BT-3202-Contract[BT-5011-Contract is present or BT-722-Contract is present or BT-6110-Contract is present] == $tender]) satisfies $contractid != '']} #{auxiliary|text|eu-funds-used} // Information about European Union funds used to finance the contract
-						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: ${for text:$tender2 in OPT-320-LotResult, text:$name in BT-722-Contract[BT-3202-Contract == $tender2] return $name} // Contract EU Funds Name
+						{OPT-320-LotResult[some text:$eufundname in (for text:$tender1 in OPT-320-LotResult return BT-722-Contract[BT-3202-Contract == $tender1]) satisfies $eufundname != '']} #{field|name|BT-722-Contract}: #{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
-		3 {ND-LotResult[count(for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender[count(OPT-316-Contract[BT-3202-Contract == $tender]) == 0] == $tender])>0]} #{auxiliary|text|non-winning-tender}: // 6.1.3. Non-winning tenders
-			0 {OPT-320-LotResult[count(for text:$tender in OPT-320-LotResult return BT-3201-Tender[OPT-321-Tender[count(OPT-316-Contract[BT-3202-Contract == $tender]) == 0] == $tender])>0]} #{auxiliary|text|organisation-tenderer}: // Non-winning tender
-				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|OPT-170-Tenderer}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == TRUE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return $org2} // Leader of tendering party for this non-winning tenderer
-				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa1] == TRUE]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-170-Tenderer[OPT-210-Tenderer == $tpa2] == FALSE]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of non-leaders for this non-winning tenderer
-				{OPT-320-LotResult[count(for text:$tender1 in OPT-320-LotResult, text:$tpa1 in OPT-310-Tender[OPT-321-Tender == $tender1], text:$orgid1 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa1]), text:$org1 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid1] return $org1)>0]} #{field|name|BT-500-Organization-Company}: ${for text:$tender2 in OPT-320-LotResult, text:$tpa2 in OPT-310-Tender[OPT-321-Tender == $tender2], text:$orgid2 in (OPT-300-Tenderer[OPT-210-Tenderer[OPT-170-Tenderer is not present] == $tpa2]), text:$org2 in BT-500-Organization-Company[OPT-200-Organization-Company == $orgid2] return concat($org2, ', ')} // Names of this non-winning tenderer (single organisation in Tendering Party)
 		4 {ND-LotResult[(BT-712(a)-LotResult is present) or (BT-636-LotResult is present) or (BT-760-LotResult is present) or (BT-710-LotResult is present) or (BT-710-LotResult is present) or (BT-735-LotResult is present)]} #{auxiliary|text|statistical-information} // 6.1.4. Statistical information
 			0 {ND-BuyerReviewComplainants} #{auxiliary|text|review-requests-summary}: // Summary of the review requests the buyer received
 				0 {BT-712(b)-LotResult[BT-712(b)-LotResult != -1]} #{field|name|BT-712(b)-LotResult}: ${BT-712(b)-LotResult} // Buyer Review Complainants
+					{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
@@ -358,13 +454,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
@@ -374,23 +479,32 @@
 					{BT-760-LotResult[BT-196(BT-760)-LotResult is present]} #{field|name|BT-196(BT-760)-LotResult}: ${BT-196(BT-760)-LotResult} // Unpublished Justification Description
 					{BT-198(BT-760)-LotResult} #{field|name|BT-198(BT-760)-LotResult}: ${BT-198(BT-760)-LotResult} // Unpublished Access Date
 					0 {BT-759-LotResult[BT-759-LotResult != -1]} #{field|name|BT-759-LotResult}: ${BT-759-LotResult} // Received Submissions Count
-					0 {BT-759-LotResult[BT-759-LotResult == -1]} #{field|name|BT-759-LotResult}: #{auxiliary|text|unpublished} // Received Submissions Count
+						{BT-197(BT-759)-LotResult} #{field|name|BT-197(BT-759)-LotResult}: #{BT-197(BT-759)-LotResult} // Unpublished Justification Code
+						{BT-759-LotResult[BT-196(BT-759)-LotResult is present]} #{field|name|BT-196(BT-759)-LotResult}: ${BT-196(BT-759)-LotResult} // Unpublished Justification Description
+						{BT-198(BT-759)-LotResult} #{field|name|BT-198(BT-759)-LotResult}: ${BT-198(BT-759)-LotResult} // Unpublished Access Date
+					0 {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.##')} ${BT-710-LotResult[BT-710-LotResult/@currencyID != 'unpublished']/@currencyID} // Tender Value Lowest
+				0 {BT-710-LotResult[BT-710-LotResult != -1]} #{field|name|BT-710-LotResult}: ${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.##')} ${BT-711-LotResult[BT-711-LotResult/@currencyID != 'unpublished']/@currencyID} // Tender Value highest
+				0 {BT-711-LotResult[BT-711-LotResult != -1]} #{field|name|BT-711-LotResult}: ${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 {BT-735-LotResult} #{field|name|BT-735-LotResult}: #value // The type of contract of the procurement procedure within the scope of Clean Vehicles Directive 2009/33/EC.
+				0 {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
 8 {ND-Root} #{auxiliary|text|organisations} // 8. Organisations
@@ -461,10 +575,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 5523c6ecc..ea3c6035f 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,16 +179,22 @@
 	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:$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
@@ -176,42 +205,66 @@
 				{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
@@ -230,12 +283,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
@@ -245,6 +307,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
@@ -315,10 +380,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 b66a351a9..b9694a3f1 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,17 +107,20 @@
 			{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:$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
@@ -129,58 +131,91 @@
 				{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
@@ -199,12 +234,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
@@ -214,6 +258,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
@@ -282,10 +329,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