diff --git a/company.py b/company.py
index 0a786bebc4..9660149827 100644
--- a/company.py
+++ b/company.py
@@ -246,11 +246,11 @@ class Property:
 
     @classmethod
     def search(cls, domain, offset=0, limit=None, order=None, count=False,
-            query_string=False):
+            query=False):
         if Transaction().user == 0 and not 'user' in Transaction().context:
             domain = ['AND', domain[:], ('company', '=', None)]
         return super(Property, cls).search(domain, offset=offset, limit=limit,
-            order=order, count=count, query_string=query_string)
+            order=order, count=count, query=query)
 
 
 class Sequence:
diff --git a/company.xml b/company.xml
index 3c10eefb8a..6bea031130 100644
--- a/company.xml
+++ b/company.xml
@@ -24,7 +24,7 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.act_window" id="act_company_tree">
             <field name="name">Companies</field>
             <field name="res_model">company.company</field>
-            <field name="domain">[('parent', '=', False)]</field>
+            <field name="domain">[('parent', '=', None)]</field>
         </record>
         <record model="ir.action.act_window.view"
             id="act_company_tree_view1">