diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl
index c17ef61..09d525d 100644
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -50,10 +50,10 @@
 		"line_list": [
 		<#list executionflow.Lines as line>
 			<#-- ******* line  MetaData and Segmentationkeys to maps ******** -->
-			<#if executionflow.line.MetaData??>
-			<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(executionflow.line.MetaData, "Key", "Value") />
+			<#if line.MetaData??>
+			<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
 			</#if>
-			<#if executionflow.line.RequestedContent.Goods.SegmentationKeys??>
+			<#if line.RequestedContent.Goods.SegmentationKeys??>
 			<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(execution.line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
 			</#if>
 			<#include "RPtoRFX_PrepOrder_DefaultLineData.ftl">
diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl
index 472f0c1..534bf02 100644
--- a/RPtoRFX_Receipt.ftl
+++ b/RPtoRFX_Receipt.ftl
@@ -35,11 +35,11 @@
 		<#list executionflow.Lines as line>
 
 			<#-- ******* line  MetaData and Segmentationkeys to maps ******** -->
-			<#if executionflow.line.MetaData??>
-			<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(executionflow.line.MetaData, "Key", "Value") />
+			<#if line.MetaData??>
+			<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
 			</#if>
-			<#if executionflow.line.RequestedContent.Goods.SegmentationKeys??>
-			<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(execution.line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
+			<#if line.RequestedContent.Goods.SegmentationKeys??>
+			<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
 			</#if>
 			<#include "RPtoRFX_Receipt_DefaultLineData.ftl">