diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index a4ab078e589..e463569a951 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -356,7 +356,7 @@
                         <field name="model_id"/>
                         <field name="user_id"/>
                     </group>
-                    <group col="4" expand="1">
+                    <group col="4" expand="1" groups="base.group_extended">
                         <separator string="Domain" colspan="2" />
                         <separator string="Context" colspan="2" />
                         <field name="domain" nolabel="1" colspan="2"/>
@@ -377,8 +377,8 @@
                     <field name="name"/>
                     <field name="user_id"/>
                     <field name="model_id"/>
-                    <field name="domain"/>
-                    <field name="context"/>
+                    <field name="domain" groups="base.group_extended"/>
+                    <field name="context" groups="base.group_extended"/>
                 </tree>
             </field>
         </record>
@@ -395,17 +395,11 @@
                       <field name="name"/>
                       <field name="user_id">
                   	  <filter icon="terp-personal"
-                        domain="[('user_id','=', uid)]"
+                        domain="[('user_id','in', ('uid', 'False'))]"
                         help="Current User" name="My Filters" />
                			</field>
                       <field name="model_id"/>
                     </group>
-                    
-                   <newline/>
-                   <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                     <field name="domain"/>
-                     <field name="context"/>
-                  </group>
               </search>
             </field>
         </record>
diff --git a/openerp/addons/base/ir/ir_filters.py b/openerp/addons/base/ir/ir_filters.py
index 3cffad737d8..43ad379e9d4 100644
--- a/openerp/addons/base/ir/ir_filters.py
+++ b/openerp/addons/base/ir/ir_filters.py
@@ -31,7 +31,7 @@ class ir_filters(osv.osv):
 
     def copy(self, cr, uid, id, default=None, context=None):
         name = self.read(cr, uid, [id], ['name'])[0]['name']
-        default.update({'name': name+ _(' (copy)')})
+        default.update({'name':_('%s (copy)') % name})
         return super(ir_filters, self).copy(cr, uid, id, default, context)
    
     def get_filters(self, cr, uid, model):
@@ -58,10 +58,10 @@ class ir_filters(osv.osv):
 
     _columns = {
         'name': fields.char('Filter Name', size=64, translate=True, required=True),
-        'user_id':fields.many2one('res.users', 'User', help='Keep empty if you want this filter to be applied to every user.If you assign a user in this field, only this user will have this filter available.'),
+        '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.many2one('ir.model', 'Object', size=64, required=True),
+        'model_id': fields.many2one('ir.model', 'Object',required=True),
     }
     _defaults = {
         'domain': '[]',