diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index a4881e90f23..868e405e93c 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -375,10 +375,10 @@
             <field name="arch" type="xml">
                 <tree string="Filters">
                     <field name="name"/>
-                    <field name="user_id"/>
                     <field name="model_id"/>
-                    <field name="domain"/>
-                    <field name="context"/>
+                    <field name="user_id"/>
+                    <field name="domain" groups="base.group_extended"/>
+                    <field name="context" groups="base.group_extended"/>
                 </tree>
             </field>
         </record>
@@ -391,15 +391,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Filters">
-                    <group colspan="4" col="10">
-                      <field name="name"/>
-                      <field name="user_id"/>
-                      <field name="model_id"/>
-                    </group>
-                    <newline/>
-                    <group expand="0" string="Group By" colspan="4">
-                      <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                    </group>
+                    <field name="name"/>
+                    <field name="model_id"/>
+                    <field name="user_id">
+                        <filter icon="terp-personal" domain="[('user_id','in', (uid, False))]" help="Current User" name="My Filters" />
+                    </field>
                 </search>
             </field>
         </record>
diff --git a/openerp/addons/base/ir/ir_filters.py b/openerp/addons/base/ir/ir_filters.py
index 0146b8dd85b..e18d3346db6 100644
--- a/openerp/addons/base/ir/ir_filters.py
+++ b/openerp/addons/base/ir/ir_filters.py
@@ -33,6 +33,11 @@ class ir_filters(osv.osv):
         cr.execute("SELECT model, name from ir_model")
         return cr.fetchall()
 
+    def copy(self, cr, uid, id, default=None, context=None):
+        name = self.read(cr, uid, [id], ['name'])[0]['name']
+        default.update({'name':_('%s (copy)') % name})
+        return super(ir_filters, self).copy(cr, uid, id, default, context)
+   
     def get_filters(self, cr, uid, model):
         act_ids = self.search(cr,uid,[('model_id','=',model),('user_id','=',uid)])
         my_acts = self.read(cr, uid, act_ids, ['name', 'domain','context'])
@@ -56,12 +61,16 @@ class ir_filters(osv.osv):
             cr.execute('CREATE UNIQUE INDEX "ir_filters_name_model_uid_unique_index" ON ir_filters (lower(name), model_id, user_id)')
 
     _columns = {
-        'name': fields.char('Action Name', size=64, translate=True, required=True),
-        'user_id':fields.many2one('res.users', 'User', help='False means for every user'),
+        'name': fields.char('Filter Name', size=64, translate=True, required=True),
+        'user_id':fields.many2one('res.users', 'User', help="The user this filter is available to. Keep empty to make it available to all users."),
         'domain': fields.text('Domain Value', required=True),
         'context': fields.text('Context Value', required=True),
         'model_id': fields.selection(_list_all_models, 'Object', size=64, required=True),
     }
+    _defaults = {
+        'domain': '[]',
+        'context':'{}',
+    }
 
 ir_filters()