diff --git a/view/production_list.xml b/view/production_list.xml
index dab5a73e42..fa59260dca 100644
--- a/view/production_list.xml
+++ b/view/production_list.xml
@@ -3,6 +3,6 @@
 this repository contains the full copyright notices and license terms. -->
 <data>
     <xpath expr="/tree/field[@name='reference']" position="after">
-        <field name="work_center"/>
+        <field name="work_center" optional="1"/>
     </xpath>
 </data>
diff --git a/view/work_center_list.xml b/view/work_center_list.xml
index 61c24206d1..969c89b5fb 100644
--- a/view/work_center_list.xml
+++ b/view/work_center_list.xml
@@ -3,6 +3,7 @@
 this repository contains the full copyright notices and license terms. -->
 <tree>
     <field name="rec_name" expand="2"/>
-    <field name="category" expand="1"/>
-    <field name="warehouse" tree_invisible="1"/>
+    <field name="category" expand="1" optional="0"/>
+    <field name="company" expand="1" optional="1"/>
+    <field name="warehouse" expand="1" optional="1"/>
 </tree>
diff --git a/view/work_center_tree.xml b/view/work_center_tree.xml
index 6de974f880..b2632607c2 100644
--- a/view/work_center_tree.xml
+++ b/view/work_center_tree.xml
@@ -3,6 +3,7 @@
 this repository contains the full copyright notices and license terms. -->
 <tree>
     <field name="name" expand="2"/>
-    <field name="category" expand="1"/>
-    <field name="warehouse" tree_invisible="1"/>
+    <field name="category" expand="1" optional="0"/>
+    <field name="company" expand="1" optional="1"/>
+    <field name="warehouse" expand="1" optional="1"/>
 </tree>
diff --git a/view/work_list.xml b/view/work_list.xml
index 53dae0681b..d1c6a0604b 100644
--- a/view/work_list.xml
+++ b/view/work_list.xml
@@ -2,8 +2,10 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree>
+    <field name="company" expand="1" optional="1"/>
+    <field name="warehouse" expand="1" optional="1"/>
     <field name="production" expand="1"/>
-    <field name="operation" expand="1"/>
-    <field name="work_center" expand="1"/>
+    <field name="operation" expand="1" optional="0"/>
+    <field name="work_center" expand="1" optional="0"/>
     <field name="state"/>
 </tree>