diff --git a/openerp/addons/base/ir/ir_filters.xml b/openerp/addons/base/ir/ir_filters.xml
index 51215132079..72c5dad8885 100644
--- a/openerp/addons/base/ir/ir_filters.xml
+++ b/openerp/addons/base/ir/ir_filters.xml
@@ -19,6 +19,7 @@
                         <field name="name"/>
                         <field name="user_id"/>
                         <field name="model_id"/>
+                        <field name="is_default"/>
                     </group>
                     <group>
                         <field name="domain"/>
@@ -35,6 +36,7 @@
                     <field name="name"/>
                     <field name="model_id"/>
                     <field name="user_id"/>
+                    <field name="is_default"/>
                     <field name="domain" groups="base.group_no_one"/>
                     <field name="context" groups="base.group_no_one"/>
                 </tree>
@@ -45,12 +47,14 @@
             <field name="arch" type="xml">
                 <search string="Filters">
                     <field name="name" string="Filter Name"/>
-                    <filter string="Personal" domain="[('user_id','!=',False)]" help="Filters visible only for one user"/>
-                    <filter string="Shared" domain="[('user_id','=',False)]" help="Filters shared with all users"/>
+                    <filter string="User" domain="[('user_id','!=',False)]" name="user" help="Filters visible only for one user"/>
+                    <filter string="Shared" domain="[('user_id','=',False)]" name="shared" help="Filters shared with all users"/>
+                    <filter string="My filters" domain="[('user_id','=',uid)]" name="my_filters" help="Filters created by myself"/>
                     <separator/>
-                    <filter icon="terp-personal" domain="[('user_id','in',(uid, False))]"
-                        name="my_filters"
-                        string="My Filters"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="User" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Model" domain="[]" context="{'group_by':'model_id'}"/>
+                    </group>
                     <field name="model_id"/>
                     <field name="user_id"/>
                 </search>