diff --git a/addons/website_sale/data/demo.xml b/addons/website_sale/data/demo.xml
index 4e4b8726665..be98385d835 100644
--- a/addons/website_sale/data/demo.xml
+++ b/addons/website_sale/data/demo.xml
@@ -97,47 +97,59 @@
 
     <!-- product.public.category -->
 
-        <record id="Components" model="product.public.category">
-          <field name="name">Components</field>
+        <record id="public_category_desks" model="product.public.category">
+          <field name="name">Desks</field>
           <field name="sequence">15</field>
         </record>
+        <record id="public_category_furnitures" model="product.public.category">
+          <field name="name">Furnitures</field>
+          <field name="sequence">17</field>
+        </record>
         <record id="public_category_boxes" model="product.public.category">
             <field name="name">Boxes</field>
-            <field name="sequence">16</field>
-        </record>
-        <record id="public_category_desks" model="product.public.category">
-          <field name="name">Desks</field>
-          <field name="sequence">17</field>
-        </record>
-        <record id="public_category_cabinets" model="product.public.category">
-          <field name="name">Cabinets</field>
-          <field name="sequence">18</field>
-        </record>
-        <record id="public_category_bins" model="product.public.category">
-          <field name="name">Bins</field>
-          <field name="sequence">19</field>
-        </record>
-        <record id="public_category_chairs" model="product.public.category">
-          <field name="name">Chairs</field>
-          <field name="sequence">20</field>
+            <field name="sequence">20</field>
         </record>
         <record id="public_category_drawers" model="product.public.category">
           <field name="name">Drawers</field>
           <field name="sequence">21</field>
         </record>
+        <record id="public_category_cabinets" model="product.public.category">
+          <field name="name">Cabinets</field>
+          <field name="sequence">22</field>
+        </record>
+        <record id="public_category_bins" model="product.public.category">
+          <field name="name">Bins</field>
+          <field name="sequence">23</field>
+        </record>
         <record id="public_category_lamps" model="product.public.category">
           <field name="name">Lamps</field>
-          <field name="sequence">22</field>
+          <field name="sequence">24</field>
+        </record>
+        <record id="services" model="product.public.category">
+          <field name="name">Services</field>
+          <field name="sequence">25</field>
         </record>
         <record id="public_category_multimedia" model="product.public.category">
           <field name="name">Multimedia</field>
-          <field name="sequence">24</field>
+          <field name="sequence">26</field>
         </record>
 
-        <record id="services" model="product.public.category">
-          <field name="name">Services</field>
+        <!-- subcategories -->
+        <record id="public_category_desks_components" model="product.public.category">
+          <field name="parent_id" eval="ref('public_category_desks')"/>
+          <field name="name">Components</field>
           <field name="sequence">16</field>
         </record>
+        <record id="public_category_furnitures_chairs" model="product.public.category">
+          <field name="parent_id" eval="ref('public_category_furnitures')"/>
+          <field name="name">Chairs</field>
+          <field name="sequence">18</field>
+        </record>
+        <record id="public_category_furnitures_couches" model="product.public.category">
+          <field name="parent_id" eval="ref('public_category_furnitures')"/>
+          <field name="name">Couches</field>
+          <field name="sequence">19</field>
+        </record>
 
         <record id="product.product_product_1_product_template" model="product.template">
             <field name="public_categ_ids" eval="[(6,0,[ref('services')])]"/>
@@ -146,7 +158,7 @@
             <field name="public_categ_ids" eval="[(6,0,[ref('services')])]"/>
         </record>
         <record id="product.product_product_3_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('public_category_desks')])]"/>
+            <field name="public_categ_ids" eval="[(6,0,[ref('public_category_desks_components')])]"/>
         </record>
         <record id="product.consu_delivery_03_product_template" model="product.template">
             <field name="public_categ_ids" eval="[(6,0,[ref('public_category_desks')])]"/>
@@ -173,10 +185,10 @@
             <field name="public_categ_ids" eval="[(6,0,[ref('public_category_cabinets')])]"/>
         </record>
         <record id="product.product_product_11_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('public_category_chairs')])]"/>
+            <field name="public_categ_ids" eval="[(6,0,[ref('public_category_furnitures_chairs')])]"/>
         </record>
         <record id="product.product_product_12_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('public_category_chairs')])]"/>
+            <field name="public_categ_ids" eval="[(6,0,[ref('public_category_furnitures_chairs')])]"/>
         </record>
         <record id="product.product_product_13_product_template" model="product.template">
             <field name="public_categ_ids" eval="[(6,0,[ref('public_category_desks')])]"/>
@@ -185,13 +197,13 @@
             <field name="public_categ_ids" eval="[(6,0,[ref('public_category_drawers')])]"/>
         </record>
         <record id="product.product_product_20_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('Components')])]"/>
+            <field name="public_categ_ids" eval="[(6,0,[ref('public_category_desks_components')])]"/>
         </record>
         <record id="product.product_product_22_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('public_category_desks')])]"/>
+            <field name="public_categ_ids" eval="[(6,0,[ref('public_category_desks_components')])]"/>
         </record>
         <record id="product.product_product_25_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('public_category_desks')])]"/>
+            <field name="public_categ_ids" eval="[(6,0,[ref('public_category_desks_components')])]"/>
         </record>
         <record id="product.product_product_27_product_template" model="product.template">
             <field name="public_categ_ids" eval="[(6,0,[ref('public_category_drawers')])]"/>
@@ -200,19 +212,19 @@
             <field name="public_categ_ids" eval="[(6,0,[ref('public_category_multimedia')])]"/>
         </record>
         <record id="product.consu_delivery_01_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('public_category_chairs')])]"/>
+            <field name="public_categ_ids" eval="[(6,0,[ref('public_category_furnitures_couches')])]"/>
         </record>
         <record id="product.consu_delivery_02_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('public_category_lamps')])]"/>
+            <field name="public_categ_ids" eval="[(6,0,[ref('public_category_desks')])]"/>
         </record>
         <record id="product.consu_delivery_03_product_template" model="product.template">
             <field name="public_categ_ids" eval="[(6,0,[ref('public_category_desks')])]"/>
         </record>
         <record id="product.product_delivery_01_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('public_category_chairs')])]"/>
+            <field name="public_categ_ids" eval="[(6,0,[ref('public_category_furnitures_chairs')])]"/>
         </record>
         <record id="product.product_delivery_02_product_template" model="product.template">
-            <field name="public_categ_ids" eval="[(6,0,[ref('public_category_desks')])]"/>
+            <field name="public_categ_ids" eval="[(6,0,[ref('public_category_lamps')])]"/>
         </record>
 
         <record model="product.pricelist" id="product.list0">