diff --git a/intrastat_product/report/intrastat_product_report_xls.py b/intrastat_product/report/intrastat_product_report_xls.py
index dcd3c9b..3c4911e 100644
--- a/intrastat_product/report/intrastat_product_report_xls.py
+++ b/intrastat_product/report/intrastat_product_report_xls.py
@@ -40,7 +40,7 @@ class IntrastatProductDeclarationXlsx(AbstractReportXlsx):
             'product_origin_country': {
                 'header': {
                     'type': 'string',
-                    'value': self._('Country of Origin of the Product'),
+                    'value': self._('Product C/O'),
                 },
                 'line': {
                     'type': 'string',
diff --git a/intrastat_product/views/intrastat_product_declaration.xml b/intrastat_product/views/intrastat_product_declaration.xml
index 7050c79..c6a7fa9 100644
--- a/intrastat_product/views/intrastat_product_declaration.xml
+++ b/intrastat_product/views/intrastat_product_declaration.xml
@@ -54,7 +54,9 @@
                           context="{'computation_lines': 1}"/>
                 </header>
                 <group name="computation_lines">
-                  <field name="computation_line_ids" nolabel="1"/>
+                  <field name="computation_line_ids"
+                         context="{'type': type, 'reporting_level': reporting_level}"
+                         nolabel="1"/>
                 </group>
               </page>
               <page string="Declaration Lines">
@@ -63,7 +65,9 @@
                           context="{'declaration_lines': 1}"/>
                 </header>
                 <group name="declaration_lines">
-                  <field name="declaration_line_ids" nolabel="1"/>
+                  <field name="declaration_line_ids"
+                         context="{'type': type, 'reporting_level': reporting_level}"
+                         nolabel="1"/>
                 </group>
               </page>
               <page string="Notes">