diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 0b059fb60c1..6d25ac66a8f 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -142,7 +142,7 @@ class res_partner(osv.osv):
         'website': fields.char('Website',size=64, help="Website of Partner or Company"),
         'comment': fields.text('Notes'),
         'address': fields.one2many('res.partner.address', 'partner_id', 'Contacts'),   # should be removed in version 7, but kept until then for backward compatibility
-        'category_id': fields.many2many('res.partner.category', 'res_partner_category_rel', 'partner_id', 'category_id', 'Categories'),
+        'category_id': fields.many2many('res.partner.category', 'res_partner_category_rel', 'partner_id', 'category_id', 'Tags'),
         'events': fields.one2many('res.partner.event', 'partner_id', 'Events'),
         'credit_limit': fields.float(string='Credit Limit'),
         'ean13': fields.char('EAN13', size=13),
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 9c508060246..31e98bef43f 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -443,19 +443,14 @@
             <field name="arch" type="xml">
                 <search string="Search Partner">
                    <group col='10' colspan='4'>
+                        <field name="name" filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]"/>
+                        <field name="parent_id" filter_domain="[('parent_id','child_of',[self])]"/>
+                        <field name="category_id"/>
+                        <field name="user_id"/>
+                        <filter help="My Partners" icon="terp-personal+" domain="[('user_id','=',uid)]"/>
+                        <separator orientation="vertical"/>
                         <filter string="Persons" name="type_person" icon="terp-personal" domain="[('is_company','=',0)]"/>
                         <filter string="Companies" name="type_company" icon="terp-partner" domain="[('is_company','=',1)]"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
-                        <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
-                        <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <!--field name="address" select="1"/-->
-                        <!--field name="country" select="1"/-->
-                        <field name="category_id" select="1"/>
-                        <field name="user_id" select="1">
-                            <filter help="My Partners" icon="terp-personal+" domain="[('user_id','=',uid)]"/>
-                        </field>
                    </group>
                    <newline />
                    <group expand="0" string="Group By...">