Improved 3 Rig properties in drilling report header html

 <ui:group 
 		let:activity="{= spl:object(?report, ep-activity:reportOn) }"
-		let:onWellBore="{# SELECT ?onWellBore WHERE { ?this ep-activity:reportOn/ep-activity:onWellBore ?onWellBore } }">
+		let:onWellBore="{# SELECT ?onWellBore WHERE { ?this ep-activity:reportOn/ep-activity:onWellBore ?onWellBore } }"
+		let:rig="{# SELECT ?rig WHERE { ?report ep-activity:reportOn/ep-activity:onRig/ep-core:temporalPartOf ?rig } }">
 	<ui:group let:wellBore="{= spl:object(?onWellBore, ep-core:temporalPartOf) }">
 		<h1>Summary report Wellbore: {= rhspin:npdName(?wellBore) }</h1>
 		<div>End time: {= ui:label(spl:object(?activity, ep-activity:finishedAt)) }</div>
 		<hr />
 		<table><tr>
 			<td class="ddrSummaryLeft">
-				<rhswp:NameValuePair arg:name="Report Number:" 				arg:value="{TBD}" />
+				<rhswp:NameValuePair arg:name="Report Number:" 				arg:value="{= rhspin:dtypeValue(?this, ddr:reportNo) }"  />
 				<rhswp:NameValuePair arg:name="Wellbore:" 					arg:value="{= rhspin:npdName(?wellBore) }" />
 				<rhswp:NameValuePair arg:name="Status:" 					arg:value="{TBD}" />
 				<rhswp:NameValuePair arg:name="Operator:" 					arg:value="{= spl:object(?dailyDrillingActivity, ep-activity:drillingOperator) }"  />
-				<rhswp:NameValuePair arg:name="Rig name:" 					arg:value="{= spl:object(?dailyDrillingActivity, ep-activity:onRig/ep-core:temporalPartOf) }"  />
+				<rhswp:NameValuePair arg:name="Rig name:" 					arg:value="{= ui:label(?rig) }"  />
 				<rhswp:NameValuePair arg:name="Spud date:" 					arg:value="{= ui:label(spl:object(?onWellBore, ddr:dTimSpud)) }"  />
 				<rhswp:NameValuePair arg:name="Elevation RKB-MSL m:" 		arg:value="{= rhspin:dtypeValue(?onWellBore, ddr:elevKelly) }" />
 				<rhswp:NameValuePair arg:name="Tight well:" 				arg:value="{# SELECT ui:label(?wellBoreTightnessType) WHERE { ?temporalPartOfAWellBore rdf:type ?wellBoreTightnessType . ?wellBoreTightnessType a ep-well:WellBoreTightnessType} }"  />
 				<rhswp:NameValuePair arg:name="Pressure psig:" 				arg:value="{= rhspin:dtypeValue(?temporalPartOfAWellBore, ddr:avgPresBH) }" />
-				<rhswp:NameValuePair arg:name="Fixed rig:" 					arg:value="{TBD}" />
+				<rhswp:NameValuePair arg:name="Fixed rig:" 					arg:value="{# SELECT ui:label(?fixedOrMoveableRigType) WHERE { ?rig rdf:type ?fixedOrMoveableRigType . ?fixedOrMoveableRigType a ep-fac:FixedOrMoveableRigType} }"  />
 				<rhswp:NameValuePair arg:name="Depth at Kick Off mMD:" 		arg:value="{= rhspin:dtypeValue(?onWellBore, ddr:mdKickoff) }" />
 				<rhswp:NameValuePair arg:name="Plug Back Depth mMD:" 		arg:value="{= rhspin:dtypeValue(?onWellBore, ddr:mdPlugTop) }" />
 				<rhswp:NameValuePair arg:name="Penetration Rate m/h:" 		arg:value="{= rhspin:dtypeValue(?activity, ddr:ropCurrent) }" />
@@ -30,7 +31,7 @@
 				<rhswp:NameValuePair arg:name="Wellbore Id:" 				arg:value="{= rhspin:npdId(?wellBore) }" />
 				<rhswp:NameValuePair arg:name="Created date:"				arg:value="{= ui:label(spl:object(?this, ep-activity:createdAt)) }" />
 				<rhswp:NameValuePair arg:name="Drilling contractor:" 		arg:value="{= spl:object(?dailyDrillingActivity, ep-activity:drillingContractor) }" />
-				<rhswp:NameValuePair arg:name="NPD Rig Id:" 				arg:value="{= spl:object(?dailyDrillingActivity, ep-activity:onRig/ep-core:temporalPartOf) }"  />
+				<rhswp:NameValuePair arg:name="NPD Rig Id:" 				arg:value="{= spl:object(?rig, ep-core:npdCode) }" />
 				<rhswp:NameValuePair arg:name="Date Well Complete:" 		arg:value="{= ui:label(spl:object(?wellBore,  ddr:dateDrillComplete)) }"  />
 				<rhswp:NameValuePair arg:name="Water depth MSL m:" 			arg:value="{= rhspin:dtypeValue(?temporalPartOfAWellBore, ddr:waterDepth) }"  />
 				<rhswp:NameValuePair arg:name="High pressure - High temperature:" arg:value="{# SELECT ui:label(?wellBoreHphtType) WHERE { ?temporalPartOfAWellBore rdf:type ?wellBoreHphtType . ?wellBoreHphtType a ep-well:WellBoreHphtType} }" />