diff --git a/product_harmonized_system/__manifest__.py b/product_harmonized_system/__manifest__.py
index 4664922..5730795 100644
--- a/product_harmonized_system/__manifest__.py
+++ b/product_harmonized_system/__manifest__.py
@@ -9,7 +9,7 @@
 
 {
     "name": "Product Harmonized System Codes",
-    "version": "14.0.2.0.0",
+    "version": "14.0.2.1.0",
     "category": "Reporting",
     "license": "AGPL-3",
     "summary": "Base module for Product Import/Export reports",
diff --git a/product_harmonized_system/i18n/es.po b/product_harmonized_system/i18n/es.po
index 009cd36..14f926c 100644
--- a/product_harmonized_system/i18n/es.po
+++ b/product_harmonized_system/i18n/es.po
@@ -99,6 +99,7 @@ msgstr "Nombre mostrado"
 #: model:ir.model.fields,field_description:product_harmonized_system.field_product_product__hs_code_id
 #: model:ir.model.fields,field_description:product_harmonized_system.field_product_template__hs_code_id
 #: model_terms:ir.ui.view,arch_db:product_harmonized_system.hs_code_view_form
+#: model_terms:ir.ui.view,arch_db:product_harmonized_system.product_template_search_view
 msgid "H.S. Code"
 msgstr "Código HS"
 
diff --git a/product_harmonized_system/i18n/fr.po b/product_harmonized_system/i18n/fr.po
index 0c359f4..8802d3d 100644
--- a/product_harmonized_system/i18n/fr.po
+++ b/product_harmonized_system/i18n/fr.po
@@ -100,6 +100,7 @@ msgstr "Nom affiché"
 #: model:ir.model.fields,field_description:product_harmonized_system.field_product_product__hs_code_id
 #: model:ir.model.fields,field_description:product_harmonized_system.field_product_template__hs_code_id
 #: model_terms:ir.ui.view,arch_db:product_harmonized_system.hs_code_view_form
+#: model_terms:ir.ui.view,arch_db:product_harmonized_system.product_template_search_view
 msgid "H.S. Code"
 msgstr "Code S.H."
 
diff --git a/product_harmonized_system/i18n/product_harmonized_system.pot b/product_harmonized_system/i18n/product_harmonized_system.pot
index 1ff4fa3..700b400 100644
--- a/product_harmonized_system/i18n/product_harmonized_system.pot
+++ b/product_harmonized_system/i18n/product_harmonized_system.pot
@@ -93,6 +93,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:product_harmonized_system.field_product_product__hs_code_id
 #: model:ir.model.fields,field_description:product_harmonized_system.field_product_template__hs_code_id
 #: model_terms:ir.ui.view,arch_db:product_harmonized_system.hs_code_view_form
+#: model_terms:ir.ui.view,arch_db:product_harmonized_system.product_template_search_view
 msgid "H.S. Code"
 msgstr ""
 
diff --git a/product_harmonized_system/models/hs_code.py b/product_harmonized_system/models/hs_code.py
index 245cb3d..da8cf11 100644
--- a/product_harmonized_system/models/hs_code.py
+++ b/product_harmonized_system/models/hs_code.py
@@ -53,7 +53,7 @@ class HSCode(models.Model):
 
     @api.model
     def _default_company_id(self):
-        return self.env.company
+        return False
 
     @api.depends("local_code")
     def _compute_hs_code(self):
diff --git a/product_harmonized_system/views/product_template.xml b/product_harmonized_system/views/product_template.xml
index 8cdfd2e..59fa83e 100644
--- a/product_harmonized_system/views/product_template.xml
+++ b/product_harmonized_system/views/product_template.xml
@@ -23,4 +23,17 @@
             </field>
         </field>
     </record>
+    <record id="product_template_search_view" model="ir.ui.view">
+        <field name="model">product.template</field>
+        <field name="inherit_id" ref="product.product_template_search_view" />
+        <field name="arch" type="xml">
+            <filter name="categ_id" position="after">
+                <filter
+                    string="H.S. Code"
+                    name="hs_code_groupby"
+                    context="{'group_by': 'hs_code_id'}"
+                />
+            </filter>
+        </field>
+    </record>
 </odoo>