diff --git a/product_harmonized_system/__manifest__.py b/product_harmonized_system/__manifest__.py
index 8aa90ed..cb18a9d 100644
--- a/product_harmonized_system/__manifest__.py
+++ b/product_harmonized_system/__manifest__.py
@@ -9,7 +9,7 @@
 
 {
     "name": "Product Harmonized System Codes",
-    "version": "13.0.1.0.0",
+    "version": "13.0.1.0.1",
     "category": "Reporting",
     "license": "AGPL-3",
     "summary": "Base module for Product Import/Export reports",
diff --git a/product_harmonized_system/demo/product_demo.xml b/product_harmonized_system/demo/product_demo.xml
index 423f67d..83022b8 100644
--- a/product_harmonized_system/demo/product_demo.xml
+++ b/product_harmonized_system/demo/product_demo.xml
@@ -1,75 +1,60 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
   Copyright 2011-2019 Akretion France (http://www.akretion.com/)
   @author Alexis de Lattre <alexis.delattre@akretion.com>
   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
-
 <odoo noupdate="1">
-
-
-<record id="84715000" model="hs.code">
-    <field name="local_code">84715000</field>
-    <field name="description">Automatic data-processing machines (computers)</field>
-</record>
-
-<record id="84717050" model="hs.code">
-    <field name="local_code">84717050</field>
-    <field name="description">Storage units</field>
-</record>
-
-<record id="85340090" model="hs.code">
-    <field name="local_code">85340090</field>
-    <field name="description">Printed circuits</field>
-</record>
-
-<record id="product.product_product_3" model="product.product">
-    <field name="hs_code_id" ref="84715000" />
-    <field name="origin_country_id" ref="base.tw" />
-    <field name="weight">8.7</field>
-</record>
-
-<record id="product.product_product_4" model="product.product">
-    <field name="hs_code_id" ref="84715000" />
-    <field name="origin_country_id" ref="base.cn" />
-    <field name="weight">1.1</field>
-</record>
-
-<record id="product.product_product_5" model="product.product">
-    <field name="hs_code_id" ref="84715000" />
-    <field name="origin_country_id" ref="base.cn" />
-    <field name="weight">8.2</field>
-</record>
-
-<record id="product.product_product_13" model="product.product">
-    <field name="hs_code_id" ref="84717050" />
-    <field name="origin_country_id" ref="base.sg" />
-    <field name="weight">0.01</field>
-</record>
-
-<record id="product.product_product_16" model="product.product">
-    <field name="hs_code_id" ref="84717050" />
-    <field name="origin_country_id" ref="base.sg" />
-    <field name="weight">0.67</field>
-</record>
-
-<record id="product.product_product_20" model="product.product">
-    <field name="hs_code_id" ref="85340090" />
-    <field name="origin_country_id" ref="base.tw" />
-    <field name="weight">1.05</field>
-</record>
-
-<record id="product.product_product_22" model="product.product">
-    <field name="hs_code_id" ref="85340090" />
-    <field name="origin_country_id" ref="base.tw" />
-    <field name="weight">0.3</field>
-</record>
-
-<record id="product.product_product_25" model="product.product">
-    <field name="hs_code_id" ref="84715000" />
-    <field name="origin_country_id" ref="base.be" />
-    <field name="weight">3.3</field>
-</record>
-
-
+    <record id="84715000" model="hs.code">
+        <field name="local_code">84715000</field>
+        <field name="description">Automatic data-processing machines (computers)</field>
+    </record>
+    <record id="84717050" model="hs.code">
+        <field name="local_code">84717050</field>
+        <field name="description">Storage units</field>
+    </record>
+    <record id="85340090" model="hs.code">
+        <field name="local_code">85340090</field>
+        <field name="description">Printed circuits</field>
+    </record>
+    <record id="product.product_product_3" model="product.product">
+        <field name="hs_code_id" ref="84715000" />
+        <field name="origin_country_id" ref="base.tw" />
+        <field name="weight">8.7</field>
+    </record>
+    <record id="product.product_product_4" model="product.product">
+        <field name="hs_code_id" ref="84715000" />
+        <field name="origin_country_id" ref="base.cn" />
+        <field name="weight">1.1</field>
+    </record>
+    <record id="product.product_product_5" model="product.product">
+        <field name="hs_code_id" ref="84715000" />
+        <field name="origin_country_id" ref="base.cn" />
+        <field name="weight">8.2</field>
+    </record>
+    <record id="product.product_product_13" model="product.product">
+        <field name="hs_code_id" ref="84717050" />
+        <field name="origin_country_id" ref="base.sg" />
+        <field name="weight">0.01</field>
+    </record>
+    <record id="product.product_product_16" model="product.product">
+        <field name="hs_code_id" ref="84717050" />
+        <field name="origin_country_id" ref="base.sg" />
+        <field name="weight">0.67</field>
+    </record>
+    <record id="product.product_product_20" model="product.product">
+        <field name="hs_code_id" ref="85340090" />
+        <field name="origin_country_id" ref="base.tw" />
+        <field name="weight">1.05</field>
+    </record>
+    <record id="product.product_product_22" model="product.product">
+        <field name="hs_code_id" ref="85340090" />
+        <field name="origin_country_id" ref="base.tw" />
+        <field name="weight">0.3</field>
+    </record>
+    <record id="product.product_product_25" model="product.product">
+        <field name="hs_code_id" ref="84715000" />
+        <field name="origin_country_id" ref="base.be" />
+        <field name="weight">3.3</field>
+    </record>
 </odoo>
diff --git a/product_harmonized_system/models/hs_code.py b/product_harmonized_system/models/hs_code.py
index fab4283..b2ee7c8 100644
--- a/product_harmonized_system/models/hs_code.py
+++ b/product_harmonized_system/models/hs_code.py
@@ -36,7 +36,7 @@ class HSCode(models.Model):
         string="Company",
         readonly=True,
         required=True,
-        default=lambda self: self.env["res.company"]._company_default_get(),
+        default=lambda self: self._default_company_id(),
     )
     product_categ_ids = fields.One2many(
         comodel_name="product.category",
@@ -53,6 +53,10 @@ class HSCode(models.Model):
     product_categ_count = fields.Integer(compute="_compute_product_categ_count")
     product_tmpl_count = fields.Integer(compute="_compute_product_tmpl_count")
 
+    @api.model
+    def _default_company_id(self):
+        return self.env.company
+
     @api.depends("local_code")
     def _compute_hs_code(self):
         for this in self:
diff --git a/product_harmonized_system/security/product_hs_security.xml b/product_harmonized_system/security/product_hs_security.xml
index c7da6fb..fc1a5e0 100644
--- a/product_harmonized_system/security/product_hs_security.xml
+++ b/product_harmonized_system/security/product_hs_security.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
-
     <record id="hs_code_company_rule" model="ir.rule">
-      <field name="name">HS Code Company rule</field>
-      <field name="model_id" ref="model_hs_code"/>
-      <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
+        <field name="name">HS Code Company rule</field>
+        <field name="model_id" ref="model_hs_code" />
+        <field
+            name="domain_force"
+        >['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
     </record>
-
 </odoo>
diff --git a/product_harmonized_system/views/hs_code.xml b/product_harmonized_system/views/hs_code.xml
index 93a5e46..1841ced 100644
--- a/product_harmonized_system/views/hs_code.xml
+++ b/product_harmonized_system/views/hs_code.xml
@@ -1,39 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
   Copyright 2010-2019 Akretion France (http://www.akretion.com/)
   @author Alexis de Lattre <alexis.delattre@akretion.com>
   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
-
 <odoo>
-
     <!-- Search view for H.S. code -->
     <record id="hs_code_view_search" model="ir.ui.view">
-      <field name="name">hs.code.search</field>
-      <field name="model">hs.code</field>
-      <field name="arch" type="xml">
-        <search string="Search H.S. Codes">
-          <field name="local_code"
-                filter_domain="['|', ('local_code', 'like', self), ('description', 'ilike', self)]"/>
-          <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
-        </search>
-      </field>
+        <field name="name">hs.code.search</field>
+        <field name="model">hs.code</field>
+        <field name="arch" type="xml">
+            <search string="Search H.S. Codes">
+                <field
+                    name="local_code"
+                    filter_domain="['|', ('local_code', 'like', self), ('description', 'ilike', self)]"
+                />
+                <filter
+                    string="Archived"
+                    name="inactive"
+                    domain="[('active', '=', False)]"
+                />
+            </search>
+        </field>
     </record>
-
     <!-- Tree view for H.S. code -->
     <record id="hs_code_view_tree" model="ir.ui.view">
-      <field name="name">hs.code.tree</field>
-      <field name="model">hs.code</field>
-      <field name="arch" type="xml">
-        <tree string="H.S. Codes">
-          <field name="hs_code"/>
-          <field name="local_code"/>
-          <field name="description"/>
-          <field name="company_id" groups="base.group_multi_company"/>
-        </tree>
-      </field>
+        <field name="name">hs.code.tree</field>
+        <field name="model">hs.code</field>
+        <field name="arch" type="xml">
+            <tree string="H.S. Codes">
+                <field name="hs_code" />
+                <field name="local_code" />
+                <field name="description" />
+                <field name="company_id" groups="base.group_multi_company" />
+            </tree>
+        </field>
     </record>
-
     <!-- Action used in the form view for HS codes -->
     <record id="product_categ_hs_code_action" model="ir.actions.act_window">
         <field name="name">Product Categories</field>
@@ -41,63 +43,73 @@
         <field name="view_mode">tree,form</field>
         <field name="domain">[('hs_code_id', '=', active_id)]</field>
     </record>
-
     <record id="product_template_hs_code_action" model="ir.actions.act_window">
         <field name="name">Products</field>
         <field name="res_model">product.template</field>
         <field name="view_mode">kanban,tree,form</field>
         <field name="domain">[('hs_code_id', '=', active_id)]</field>
     </record>
-
     <!-- Form view for H.S. code -->
     <record id="hs_code_view_form" model="ir.ui.view">
-      <field name="name">hs.code.form</field>
-      <field name="model">hs.code</field>
-      <field name="arch" type="xml">
-        <form string="H.S. Code">
-          <div class="oe_button_box" name="button_box">
-            <button class="oe_stat_button"
-                name="%(product_categ_hs_code_action)d"
-                icon="fa-th-list"
-                type="action">
-              <div class="o_field_widget o_stat_info">
-                <span class="o_stat_value"><field name="product_categ_count"/></span>
-                <span class="o_stat_text"> Product Categs</span>
-              </div>
-            </button>
-            <button class="oe_stat_button"
-                name="%(product_template_hs_code_action)d"
-                icon="fa-th-list"
-                type="action">
-              <div class="o_field_widget o_stat_info">
-                <span class="o_stat_value"><field name="product_tmpl_count"/></span>
-                <span class="o_stat_text"> Products</span>
-              </div>
-            </button>
-            <button name="toggle_active" type="object"
-                    class="oe_stat_button" icon="fa-archive">
-                <field name="active" widget="boolean_button"
-                        options='{"terminology": "archive"}'/>
-            </button>
-          </div>
-          <group name="main">
-            <field name="local_code" />
-            <field name="hs_code"/>
-            <field name="description"/>
-            <field name="company_id" groups="base.group_multi_company"/>
-          </group>
-        </form>
-      </field>
+        <field name="name">hs.code.form</field>
+        <field name="model">hs.code</field>
+        <field name="arch" type="xml">
+            <form string="H.S. Code">
+                <div class="oe_button_box" name="button_box">
+                    <button
+                        class="oe_stat_button"
+                        name="%(product_categ_hs_code_action)d"
+                        icon="fa-th-list"
+                        type="action"
+                    >
+                        <div class="o_field_widget o_stat_info">
+                            <span class="o_stat_value">
+                                <field name="product_categ_count" />
+                            </span>
+                            <span class="o_stat_text"> Product Categs</span>
+                        </div>
+                    </button>
+                    <button
+                        class="oe_stat_button"
+                        name="%(product_template_hs_code_action)d"
+                        icon="fa-th-list"
+                        type="action"
+                    >
+                        <div class="o_field_widget o_stat_info">
+                            <span class="o_stat_value">
+                                <field name="product_tmpl_count" />
+                            </span>
+                            <span class="o_stat_text"> Products</span>
+                        </div>
+                    </button>
+                    <button
+                        name="toggle_active"
+                        type="object"
+                        class="oe_stat_button"
+                        icon="fa-archive"
+                    >
+                        <field
+                            name="active"
+                            widget="boolean_button"
+                            options='{"terminology": "archive"}'
+                        />
+                    </button>
+                </div>
+                <group name="main">
+                    <field name="local_code" />
+                    <field name="hs_code" />
+                    <field name="description" />
+                    <field name="company_id" groups="base.group_multi_company" />
+                </group>
+            </form>
+        </field>
     </record>
-
     <!-- Action for H.S. code -->
     <record id="hs_code_action" model="ir.actions.act_window">
-      <field name="name">H.S. Codes</field>
-      <field name="res_model">hs.code</field>
-      <field name="view_mode">tree,form</field>
+        <field name="name">H.S. Codes</field>
+        <field name="res_model">hs.code</field>
+        <field name="view_mode">tree,form</field>
     </record>
-
     <!-- The menu entry for H.S. code is now provided by the module
          product_harmonized_system_stock -->
-
 </odoo>
diff --git a/product_harmonized_system/views/product_category.xml b/product_harmonized_system/views/product_category.xml
index 419f2e0..eb58029 100644
--- a/product_harmonized_system/views/product_category.xml
+++ b/product_harmonized_system/views/product_category.xml
@@ -1,24 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
   Copyright 2010-2019 Akretion (http://www.akretion.com/)
   @author Alexis de Lattre <alexis.delattre@akretion.com>
   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
-
 <odoo>
-
     <!-- Product category form view -->
     <record id="product_category_form_view" model="ir.ui.view">
-      <field name="name">hs_code.product.category.form</field>
-      <field name="model">product.category</field>
-      <field name="inherit_id" ref="product.product_category_form_view"/>
-      <field name="arch" type="xml">
-        <xpath expr="//group[@name='first']" position="after">
-          <group name="hs_code" string="Import/Export Properties" colspan="2">
-            <field name="hs_code_id"/>
-          </group>
-        </xpath>
-      </field>
+        <field name="name">hs_code.product.category.form</field>
+        <field name="model">product.category</field>
+        <field name="inherit_id" ref="product.product_category_form_view" />
+        <field name="arch" type="xml">
+            <xpath expr="//group[@name='first']" position="after">
+                <group name="hs_code" string="Import/Export Properties" colspan="2">
+                    <field name="hs_code_id" />
+                </group>
+            </xpath>
+        </field>
     </record>
-
 </odoo>
diff --git a/product_harmonized_system/views/product_template.xml b/product_harmonized_system/views/product_template.xml
index b382e8c..1907d8d 100644
--- a/product_harmonized_system/views/product_template.xml
+++ b/product_harmonized_system/views/product_template.xml
@@ -1,23 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
   Copyright 2010-2019 Akretion France (http://www.akretion.com/)
   @author Alexis de Lattre <alexis.delattre@akretion.com>
   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
-
 <odoo>
-
     <!-- product.template form view -->
     <record id="product_template_form_view" model="ir.ui.view">
-      <field name="name">hs_code.product.template.form</field>
-      <field name="model">product.template</field>
-      <field name="inherit_id" ref="product.product_template_form_view" />
-      <field name="arch" type="xml">
-        <field name="company_id" position="before">
-          <field name="hs_code_id" attrs="{'invisible': [('type', '=', 'service')]}"/>
-          <field name="origin_country_id" attrs="{'invisible': [('type', '=', 'service')]}"/>
+        <field name="name">hs_code.product.template.form</field>
+        <field name="model">product.template</field>
+        <field name="inherit_id" ref="product.product_template_form_view" />
+        <field name="arch" type="xml">
+            <field name="company_id" position="before">
+                <field
+                    name="hs_code_id"
+                    attrs="{'invisible': [('type', '=', 'service')]}"
+                />
+                <field
+                    name="origin_country_id"
+                    attrs="{'invisible': [('type', '=', 'service')]}"
+                />
+            </field>
         </field>
-      </field>
     </record>
-
 </odoo>