diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 661dde11aa0..6d5da0fc47a 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -75,9 +75,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Client Actions">
-                    <field name="name"/>
-                    <field name="model"/>
-                    <field name="key2"/>
+                    <field name="name"
+                        filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('key2','ilike',self)]"
+                        string="Client Action"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Model" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
@@ -208,7 +208,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sequences">
-                    <field name="name"/>
+                    <field name="name" string="Sequence"/>
                     <field name="code"/>
                     <separator orientation="vertical"/>
                     <field name="company_id" groups="base.group_multi_company"/>
@@ -263,8 +263,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sequences Type">
-                    <field name="name"/>
-                    <field name="code"/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Sequence Type"/>
                 </search>
             </field>
         </record>
@@ -316,8 +315,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Action">
-                    <field name="name"/>
-                    <field name="type"/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('type','ilike',self)]" string="Action"/>
                 </search>
             </field>
         </record>
@@ -402,13 +400,11 @@
             <field name="model">ir.actions.report.xml</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Report xml">
+                <search string="Report Xml">
                     <group col="10" colspan="4">
-                        <field name="name"/>
-                        <field name="model"/>
-                        <field name="type"/>
-                        <field name="report_name"/>
-                        <field name="report_type"/>
+                        <field name="name"
+                            filter_domain="['|', '|', '|', '|', ('name','ilike',self), ('model','ilike',self), ('type','ilike',self), ('report_name','ilike',self), ('report_type','ilike',self)]"
+                            string="Report"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By" colspan="4">
@@ -511,8 +507,7 @@
             <field name="arch" type="xml">
                 <search string="Open a Window">
                     <group col="10" colspan="4">
-                        <field name="name"/>
-                        <field name="res_model"/>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('res_model','ilike',self)]" string="Action"/>
                         <field name="view_type"/>
                     </group>
                     <newline/>
@@ -581,9 +576,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Wizards">
-                    <field name="name"/>
-                    <field name="type"/>
-                    <field name="wiz_name"/>
+                    <field name="name"
+                        filter_domain="['|', '|', ('name','ilike',self), ('type','ilike',self), ('wiz_name','ilike',self)]"
+                        string="Wizard"/>
                 </search>
             </field>
         </record>
@@ -672,6 +667,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Views">
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('model','ilike',self)]" string="View"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-stock_zoom"
                         string="Search"
                         domain="[('type', '=', 'search')]"/>
@@ -682,10 +679,8 @@
                         string="Form"
                         domain="[('type', '=','form')]"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
-                    <field name="type"/>
-                    <field name="model"/>
                     <field name="inherit_id"/>
+                    <field name="type"/>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
@@ -815,29 +810,28 @@
             <field name="arch" type="xml">
                 <search string="Attachments">
                     <group colspan="4" col="10">
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('datas_fname','ilike',self)]" string="Attachment"/>
+                        <field name="create_date"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-stage"
                             string="URL"
                             domain="[('type','=','url')]"/>
                         <filter icon="terp-stock_align_left_24"
                             string="Binary"
                             domain="[('type','=','binary')]"/>
+                        <filter name="my_documents_filter" 
+                            string="My Document(s)"
+                            icon="terp-personal"
+                            domain="[('create_uid','=',uid)]"
+                            help="Filter on my documents"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-go-month" string="Month"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
+                        <field name="create_uid"/>
                         <field name="type"/>
-                        <field name="datas_fname"/>
-                        <field name="create_uid">
-                            <filter icon="terp-personal"
-                                domain="[('create_uid','=',uid)]"
-                                help="Filter on my documents" />
-                        </field>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'create_uid'}"/>
-                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"  groups="base.group_no_one"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}" groups="base.group_no_one"/>
                         <filter string="Company" icon="terp-gtk-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <separator orientation="vertical"/>
                         <filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
@@ -963,26 +957,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Model Description">
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('model','ilike',self)]" string="Model"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-camera_test"
                         string="In Memory"
                         domain="[('osv_memory', '=', True)]"/>
-                    <separator orientation="vertical"/>
-
                     <filter icon="terp-stock_align_left_24"
                         string="Custom"
                         domain="[('state', '=', 'manual')]"/>
-                    <separator orientation="vertical"/>
-
                     <filter icon="terp-translate"
                         string="Base"
                         domain="[('state', '=', 'base')]"/>
-
-                    <separator orientation="vertical"/>
-
-                    <field name="name"/>
-                    <field name="model"/>
-
-                    <newline/>
                 </search>
             </field>
         </record>
@@ -1053,20 +1038,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Fields">
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('field_description','ilike',self)]" string="Field"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-gnome-cpu-frequency-applet+"
                         string="Required"
                         domain="[('required', '=', True)]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-dialog-close"
                         string="Readonly"
                         domain="[('readonly', '=', True)]"/>
-                    <separator orientation="vertical"/>
                     <filter icon="terp-translate"
                         string="Translate"
                         domain="[('translate', '=', True)]"/>
                     <newline/>
-                    <field name="name"/>
-                    <field name="field_description"/>
                     <field name="model_id"/>
                     <field name="ttype"/>
                     <field name="required"/>
@@ -1075,7 +1058,6 @@
                     <group expand="0" string="Group By...">
                         <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
                     </group>
-
                 </search>
             </field>
         </record>
@@ -1086,18 +1068,23 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="External Identifiers" version="7.0">
-                  <sheet>
-                    <group col="4">
-                        <field name="name"/>
+                  <group>
+                    <group>
+                        <field name="complete_name"/>
                         <field name="module"/>
+                        <field name="name"/>
+                    </group>
+                    <group>
+                        <field name="display_name"/>
                         <field name="model"/>
                         <field name="res_id"/>
+                    </group>
+                    <group>
                         <field name="noupdate"/>
-                        <newline/>
                         <field name="date_update" />
                         <field name="date_init" />
                     </group>
-                   </sheet> 
+                  </group>
                 </form>
             </field>
         </record>
@@ -1108,10 +1095,9 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="External Identifiers">
-                    <field name="module"/>
-                    <field name="name"/>
-                    <field name="model"/>
-                    <field name="res_id"/>
+                    <field name="complete_name"/>
+                    <field name="display_name"/>
+                    <field name="model" groups="base.group_no_one"/>
                 </tree>
             </field>
         </record>
@@ -1122,13 +1108,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="External Identifiers">
+                    <field name="name"
+                        filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('module','ilike',self)]"
+                        string="External Identifier"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-camera_test"
                         string="Updatable"
                         domain="[('noupdate', '=', False)]"/>
                     <separator orientation="vertical"/>
-                    <field name="module"/>
-                    <field name="name"/>
-                    <field name="model"/>
                     <field name="res_id"/>
                     <field name="noupdate"/>
                     <newline/>
@@ -1328,7 +1315,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Menu">
-                    <field name="name" string="Menu" />
+                    <field name="name" string="Menu"/>
                     <field name="parent_id"/>
                 </search>
             </field>
@@ -1408,7 +1395,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Scheduled Actions">
-                    <field name="name"/>
+                    <field name="name" string="Scheduled Action"/>
+                    <separator orientation="vertical"/>
                     <field name="user_id" widget="selection"/>
                     <field name="nextcall"/>
                     <field name="active"/>
@@ -1493,22 +1481,22 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Access Controls">
-                <group>
-                        <filter string="Global" icon="terp-stage" domain="[('group_id','=',False)]"/>
+                    <group>
+                        <field name="name" string="Access Control"/>
                         <separator orientation="vertical"/>
+                        <filter string="Global" icon="terp-stage" domain="[('group_id','=',False)]"/>
                         <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
                         <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
                         <filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                          <field name="model_id"/>
+                        <field name="model_id"/>
                         <field name="group_id"/>
-                </group>
-                <newline/>
-                <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_no_one">
-                     <filter string="Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
-                     <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
-                   </group>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_no_one">
+                        <filter string="Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
+                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -1589,16 +1577,16 @@
             <field name="model">ir.rule</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Record rules">
+                <search string="Record Rules">
                     <group>
-                        <filter string="Global" icon="terp-stage" domain="[('global','=',True)]"/>
+                        <field name="name" string="Record Rule"/>
                         <separator orientation="vertical"/>
+                        <filter string="Global" icon="terp-stage" domain="[('global','=',True)]"/>
                         <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
                         <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
                         <filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
                         <separator orientation="vertical"/>
                         <field name="model_id"/>
-                        <field name="name"/>
                         <field name="groups"/>
                     </group>
                 </search>
@@ -1644,7 +1632,7 @@
                         <page string="Trigger" attrs="{'invisible':[('state','!=','trigger')]}">
                             <group string="Trigger Configuration" col="4">
                                 <field name="wkf_model_id" attrs="{'required':[('state','=','trigger')]}"/>
-                                <field name="trigger_obj_id" context="{'key':''}" 
+                                <field name="trigger_obj_id" context="{'key':''}"
                                        domain="[('model_id','=',model_id),('ttype','in',['many2one','int'])]"
                                        attrs="{'required':[('state','=','trigger')]}"/>
                                 <field name="trigger_name" attrs="{'required':[('state','=','trigger')]}"/>
@@ -1732,13 +1720,14 @@
             <field name="arch" type="xml">
                 <search string="Server Actions">
                     <group col="10" colspan="4">
-                        <field name="name"/>
-                        <field name="state"/>
+                        <field name="name" string="Server Action"/>
+                    <separator orientation="vertical"/>
                         <field name="model_id"/>
+                        <field name="state"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By" colspan="4" col="4">
-                       <filter string="Action Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Action Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
@@ -1836,7 +1825,7 @@
             <field name="view_type">form</field>
             <field name="help">The configuration wizards are used to help you configure a new instance of OpenERP. They are launched during the installation of new modules, but you can choose to restart some wizards manually from this menu.</field>
         </record>
-        <menuitem id="menu_ir_actions_todo" name="Configuration Wizards" parent="menu_custom" sequence="20" groups="base.group_no_one"/> 
+        <menuitem id="menu_ir_actions_todo" name="Configuration Wizards" parent="menu_custom" sequence="20" groups="base.group_no_one"/>
         <menuitem id="menu_ir_actions_todo_form" action="act_ir_actions_todo_form" parent="menu_ir_actions_todo"/>
 
         <record model="ir.cron" id="cronjob_osv_memory_autovacuum">
@@ -1944,9 +1933,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Outgoing Mail Servers">
-                    <field name="name"/>
-                    <field name="smtp_host"/>
-                    <field name="smtp_user"/>
+                    <field name="name"
+                        filter_domain="['|', '|', ('name','ilike',self), ('smtp_host','ilike',self), ('smtp_user','ilike',self)]"
+                        string="Outgoing Mail Server"/>
                     <field name="smtp_encryption"/>
                 </search>
             </field>
diff --git a/openerp/addons/base/ir/ir_config_parameter_view.xml b/openerp/addons/base/ir/ir_config_parameter_view.xml
index a3e2f7173d2..3df9b80551c 100644
--- a/openerp/addons/base/ir/ir_config_parameter_view.xml
+++ b/openerp/addons/base/ir/ir_config_parameter_view.xml
@@ -7,7 +7,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="System Properties">
-                    <field name="key"/>
+                    <field name="key" string="Key"/>
                     <field name="value"/>
                 </search>
             </field>
diff --git a/openerp/addons/base/ir/ir_filters.xml b/openerp/addons/base/ir/ir_filters.xml
index 3722b533e19..55ebd11de4a 100644
--- a/openerp/addons/base/ir/ir_filters.xml
+++ b/openerp/addons/base/ir/ir_filters.xml
@@ -53,16 +53,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Filters">
+                    <field name="name" string="Filter Name"/>
+                    <separator orientation="vertical"/>
                     <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 icon="terp-personal" domain="[('user_id','in',(uid, False))]"
+                        name="my_filters"
+                        string="My Filters"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="model_id"/>
-                    <field name="user_id">
-                        <filter icon="terp-personal" domain="[('user_id','in',(uid, False))]"
-                                name="my_filters"
-                                string="My Filters" />
-                    </field>
+                    <field name="user_id"/>
                 </search>
             </field>
         </record>
diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py
index da5a1ec19fd..b366d1dfb1c 100644
--- a/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@ -642,10 +642,37 @@ class ir_model_data(osv.osv):
     """
     _name = 'ir.model.data'
     _order = 'module,model,name'
+    def _display_name_get(self, cr, uid, ids, prop, unknow_none, context=None):
+        result = {}
+        result2 = {}
+        for res in self.browse(cr, uid, ids, context=context):
+            if res.id:
+                result.setdefault(res.model, {})
+                result[res.model][res.res_id] = res.id
+            result2[res.id] = False
+
+        for model in result:
+            try:
+                r = dict(self.pool.get(model).name_get(cr, uid, result[model].keys(), context=context))
+                for key,val in result[model].items():
+                    result2[val] = r.get(key, False)
+            except:
+                # some object have no valid name_get implemented, we accept this
+                pass
+        return result2
+
+    def _complete_name_get(self, cr, uid, ids, prop, unknow_none, context=None):
+        result = {}
+        for res in self.browse(cr, uid, ids, context=context):
+            result[res.id] = (res.module and (res.module + '.') or '')+res.name
+        return result
+
     _columns = {
         'name': fields.char('External Identifier', required=True, size=128, select=1,
                             help="External Key/Identifier that can be used for "
                                  "data integration with third-party systems"),
+        'complete_name': fields.function(_complete_name_get, type='char', string='Complete ID'),
+        'display_name': fields.function(_display_name_get, type='char', string='Record Name'),
         'model': fields.char('Model Name', required=True, size=64, select=1),
         'module': fields.char('Module', required=True, size=64, select=1),
         'res_id': fields.integer('Record ID', select=1,
diff --git a/openerp/addons/base/ir/workflow/workflow_view.xml b/openerp/addons/base/ir/workflow/workflow_view.xml
index 0ac7df78ce7..bda98b7c8c0 100644
--- a/openerp/addons/base/ir/workflow/workflow_view.xml
+++ b/openerp/addons/base/ir/workflow/workflow_view.xml
@@ -28,15 +28,14 @@
     </record>
 
     <record id="view_workflow_search" model="ir.ui.view">
-      <field name="name">workflow.search</field>
-      <field name="model">workflow</field>
-      <field name="type">search</field>
-      <field name="arch" type="xml">
-        <search string="Workflow">
-          <field name="name"/>
-          <field name="osv"/>
-        </search>
-      </field>
+        <field name="name">workflow.search</field>
+        <field name="model">workflow</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Workflow">
+                <field name="name" filter_domain="['|', ('name','ilike',self), ('osv','ilike',self)]" string="Workflow"/>
+            </search>
+        </field>
     </record>
 
     <record id="view_workflow_diagram" model="ir.ui.view">
@@ -161,27 +160,27 @@
     </record>
 
     <record id="view_workflow_activity_search" model="ir.ui.view">
-      <field name="name">workflow.activity.search</field>
-      <field name="model">workflow.activity</field>
-      <field name="type">search</field>
-      <field name="arch" type="xml">
-        <search string="Workflow Activity">
-          <filter icon="terp-camera_test" string="Flow Start"
-            domain="[('flow_start', '=',True)]" />
-          <filter icon="terp-gtk-stop" string="Flow Stop"
-            domain="[('flow_stop', '=',True)]" />
-          <separator orientation="vertical"/>
-          <field name="name"/>
-          <field name="wkf_id"/>
-          <field name="kind"/>
-          <field name="action_id"/>
-          <field name="action"/>
-          <newline/>
-              <group expand="0" string="Group By...">
-                  <filter string="Workflow" icon="terp-stage" domain="[]" context="{'group_by':'wkf_id'}"/>
-              </group>
-        </search>
-      </field>
+        <field name="name">workflow.activity.search</field>
+        <field name="model">workflow.activity</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Workflow Activity">
+                <field name="name" string="Workflow Activity"/>
+                <separator orientation="vertical"/>
+                <filter icon="terp-camera_test" string="Flow Start"
+                domain="[('flow_start', '=',True)]" />
+                <filter icon="terp-gtk-stop" string="Flow Stop"
+                domain="[('flow_stop', '=',True)]" />
+                <separator orientation="vertical"/>
+                <field name="wkf_id"/>
+                <field name="action_id"/>
+                <field name="kind"/>
+                <newline/>
+                <group expand="0" string="Group By...">
+                    <filter string="Workflow" icon="terp-stage" domain="[]" context="{'group_by':'wkf_id'}"/>
+                </group>
+            </search>
+        </field>
     </record>
 
     <record id="action_workflow_activity_form" model="ir.actions.act_window">
@@ -235,17 +234,17 @@
     </record>
 
     <record id="view_workflow_transition_search" model="ir.ui.view">
-      <field name="name">workflow.transition.search</field>
-      <field name="model">workflow.transition</field>
-      <field name="type">search</field>
-      <field name="arch" type="xml">
-        <search string="Transition">
-          <field name="act_from"/>
-          <field name="act_to"/>
-          <field name="signal"/>
-          <field name="condition"/>
-        </search>
-      </field>
+        <field name="name">workflow.transition.search</field>
+        <field name="model">workflow.transition</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Transition">
+                <field name="signal" filter_domain="['|', ('signal','ilike',self), ('condition','ilike',self)]" string="Workflow Transition"/>
+                <separator orientation="vertical"/>
+                <field name="act_from"/>
+                <field name="act_to"/>
+            </search>
+        </field>
     </record>
 
     <record id="action_workflow_transition_form" model="ir.actions.act_window">
@@ -294,17 +293,18 @@
       </field>
     </record>
     <record id="view_workflow_instance_search" model="ir.ui.view">
-      <field name="name">workflow.instance.search</field>
-      <field name="model">workflow.instance</field>
-      <field name="type">search</field>
-      <field name="arch" type="xml">
-        <search string="Workflow Instances">
-          <filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" name="active"/>
-          <separator orientation="vertical"/>
-          <field name="wkf_id" widget="selection"/>
-          <field name="res_id"/>
-          <field name="res_type"/>
-          <field name="state"/>
+        <field name="name">workflow.instance.search</field>
+        <field name="model">workflow.instance</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Workflow Instances">
+                <field name="res_type" string="Resource Object"/>
+                <separator orientation="vertical"/>
+                <filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" name="active"/>
+                <separator orientation="vertical"/>
+                <field name="wkf_id" widget="selection"/>
+                <field name="res_id"/>
+                <field name="state"/>
         </search>
       </field>
     </record>
@@ -349,7 +349,7 @@
       <field name="type">tree</field>
       <field name="arch" type="xml">
         <tree string="Workflow Workitems">
-          <field name="wkf_id"/>  
+          <field name="wkf_id"/>
           <field name="act_id"/>
           <field name="subflow_id"/>
           <field name="inst_id"/>
@@ -358,20 +358,21 @@
       </field>
     </record>
     <record id="view_workflow_workitem_search" model="ir.ui.view">
-      <field name="name">workflow.workitem.search</field>
-      <field name="model">workflow.workitem</field>
-      <field name="type">search</field>
-      <field name="arch" type="xml">
-        <search string="Workflow Workitems">
-          <filter icon="terp-camera_test" string="Active" name="active" domain="[('state','=','active')]"/>
-          <separator orientation="vertical"/>
-          <field name="wkf_id" widget="selection"/>  
-          <field name="act_id"/>
-          <field name="subflow_id"/>
-          <field name="inst_id"/>
-          <field name="state"/>
-        </search>
-      </field>
+        <field name="name">workflow.workitem.search</field>
+        <field name="model">workflow.workitem</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Workflow Workitems">
+                <field name="state" string="State"/>
+                <separator orientation="vertical"/>
+                <filter icon="terp-camera_test" string="Active" name="active" domain="[('state','=','active')]"/>
+                <separator orientation="vertical"/>
+                <field name="wkf_id" widget="selection"/>
+                <field name="act_id"/>
+                <field name="subflow_id"/>
+                <field name="inst_id"/>
+            </search>
+        </field>
     </record>
 
     <record id="action_workflow_workitem_form" model="ir.actions.act_window">
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index b09bdb22643..97df3bd26d2 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -42,17 +42,14 @@
             <field name="arch" type="xml">
                 <search string="Search modules">
                     <group col='10' colspan='4'>
+                        <field name="name" filter_domain="['|', ('name','ilike',self), ('shortdesc','ilike',self)]" string="Module"/>
+                        <field name="description" string="Keywords"/>
+                        <separator orientation="vertical"/>
                         <filter name="app" icon="terp-check" string="Apps" domain="[('application', '=', 1)]"/>
                         <filter name="extra" icon="terp-check" string="Extra" domain="[('application', '=', 0)]"/>
-
-                        <separator orientation="vertical"/>
                         <filter icon="terp-check" string="Installed" domain="[('state', 'in', ['installed', 'to upgrade', 'to remove'])]"/>
                         <filter icon="terp-dialog-close" string="Not Installed" domain="[('state', 'in', ['uninstalled', 'uninstallable', 'to install'])]"/>
                         <separator orientation="vertical"/>
-                        <field name="name"
-                            filter_domain="['|', ('name','ilike',self), ('shortdesc','ilike',self)]"
-                            string="Name"/>
-                        <field name="description" string="Keywords"/>
                         <field name="category_id"/>
                         <newline/>
                         <group expand="0" string="Group By...">
diff --git a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
index ddf51f8f858..d5c3ef70754 100644
--- a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
+++ b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
@@ -58,7 +58,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Publisher Warranty Contract">
-                    <field name="name"/>
+                    <field name="name" string="Serial Key"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
                 </search>
diff --git a/openerp/addons/base/res/ir_property_view.xml b/openerp/addons/base/res/ir_property_view.xml
index e0b533aeee2..9717cea1fef 100644
--- a/openerp/addons/base/res/ir_property_view.xml
+++ b/openerp/addons/base/res/ir_property_view.xml
@@ -8,13 +8,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Parameters">
+                    <field name="name" string="Name"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-project"
                         string="Generic"
                         help="Parameters that are used by all resources."
                         domain="[('res_id','=',False)]"/>
                     <separator orientation="vertical"/>
-                    <field name="fields_id" />
-                    <field name="name"/>
+                    <field name="fields_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </search>
             </field>
diff --git a/openerp/addons/base/res/res_bank_view.xml b/openerp/addons/base/res/res_bank_view.xml
index 53e58a2c1e5..8857534983a 100644
--- a/openerp/addons/base/res/res_bank_view.xml
+++ b/openerp/addons/base/res/res_bank_view.xml
@@ -140,12 +140,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Bank Accounts">
+                    <field name="bank_name" filter_domain="['|', ('bank_name','ilike',self), ('acc_number','ilike',self)]" string="Bank Name"/>
+                    <separator orientation="vertical"/>
                     <filter name="my_bank" icon="terp-check" string="My Banks" domain="[('company_id','&lt;&gt;',False)]" help="Bank accounts belonging to one of your companies"/>
                     <separator orientation="vertical"/>
-                    <field name="acc_number"/>
                     <field name="company_id" invisible="context.get('company_hide', True)"/>
                     <field name="partner_id"/>
-                    <field name="bank_name"/>
                 </search>
             </field>
         </record>
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 4a0ab8a9e3a..5740042b160 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -173,7 +173,7 @@
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
                 <search string="Multi Company">
-                    <field name="name"/>
+                    <field name="name" string="Name"/>
                     <field name="company_id" widget="selection"/>
                     <field name="company_dest_id" widget="selection"/>
                     <field name="object_id"/>
diff --git a/openerp/addons/base/res/res_currency_view.xml b/openerp/addons/base/res/res_currency_view.xml
index e571ba70700..1d37d8d1bba 100644
--- a/openerp/addons/base/res/res_currency_view.xml
+++ b/openerp/addons/base/res/res_currency_view.xml
@@ -8,7 +8,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Currencies">
-                    <field name="name"/>
+                    <field name="name" string="Currency"/>
                     <field name="active"/>
                 </search>
             </field>
@@ -109,7 +109,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Currency Rate Type">
-                    <field name="name"/>
+                    <field name="name" string="Name"/>
                 </search>
             </field>
         </record>
diff --git a/openerp/addons/base/res/res_lang_view.xml b/openerp/addons/base/res/res_lang_view.xml
index 24911593e17..c7811ce4d09 100644
--- a/openerp/addons/base/res/res_lang_view.xml
+++ b/openerp/addons/base/res/res_lang_view.xml
@@ -109,11 +109,12 @@
             <field name="arch" type="xml">
                 <search string="Languages">
                      <group>
+                        <field name="name"
+                            filter_domain="['|', '|', ('name','ilike',self), ('code','ilike',self), ('iso_code','ilike',self)]"
+                            string="Language"/>
+                        <separator orientation="vertical"/>
                         <filter string="Translatable" icon="terp-tools" domain="[('translatable','=',True)]"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="code"/>
-                        <field name="iso_code"/>
                         <field name="direction"/>
                     </group>
                 </search>
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 386fe28545b..aaab3a7d008 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -254,17 +254,19 @@
             <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)]"/>
+                        <field name="name" 
+                            filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]"
+                            string="Partner"/>
                         <separator orientation="vertical"/>
+                        <filter help="My Partners" icon="terp-personal+" domain="[('user_id','=',uid)]"/>
                         <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"/>
+                        <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>                        
+                        <separator orientation="vertical"/>
+                        <field name="category_id"/>
+                        <field name="user_id"/>
+                        <field name="parent_id" filter_domain="[('parent_id','child_of',[self])]"/>
                    </group>
                    <newline />
                    <group expand="0" string="Group By...">
diff --git a/openerp/addons/base/res/res_request_view.xml b/openerp/addons/base/res/res_request_view.xml
index 0fecd3cd72d..88e9cc91932 100644
--- a/openerp/addons/base/res/res_request_view.xml
+++ b/openerp/addons/base/res/res_request_view.xml
@@ -34,8 +34,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Request Link">
-                    <field name="name"/>
-                    <field name="object"/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('object','ilike',self)]" string="Subject"/>
                 </search>
             </field>
         </record>
diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index e4e70fac7ed..82093dadd4b 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -150,8 +150,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Users">
-                    <field name="name"/>
-                    <field name="login"/>
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('login','ilike',self)]" string="User"/>
                     <field name="company_ids" string="Company" groups="base.group_multi_company"/>
                 </search>
             </field>
diff --git a/openerp/addons/base/res/res_widget.py b/openerp/addons/base/res/res_widget.py
index c4765c3cb1f..2137eab51fd 100644
--- a/openerp/addons/base/res/res_widget.py
+++ b/openerp/addons/base/res/res_widget.py
@@ -35,6 +35,7 @@ res_widget()
 
 class res_widget_user(osv.osv):
     _name="res.widget.user"
+    _rec_name="user_id"
     _order = "sequence"
     _columns = {
         'sequence': fields.integer('Sequence'),
diff --git a/openerp/addons/base/res/res_widget_view.xml b/openerp/addons/base/res/res_widget_view.xml
index 5b3a7705d61..3fff081ddd8 100644
--- a/openerp/addons/base/res/res_widget_view.xml
+++ b/openerp/addons/base/res/res_widget_view.xml
@@ -7,7 +7,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Widget">
-                    <field name="title" />
+                    <field name="title" string="Widget"/>
                  </search>
             </field>
         </record>
diff --git a/openerp/tests/test_orm.py b/openerp/tests/test_orm.py
index 0c4046df2a4..ea9b37e5f3b 100644
--- a/openerp/tests/test_orm.py
+++ b/openerp/tests/test_orm.py
@@ -20,7 +20,6 @@ class TestO2MSerialization(common.TransactionCase):
     def setUp(self):
         super(TestO2MSerialization, self).setUp()
         self.partner = self.registry('res.partner')
-        self.address = self.registry('res.partner.address')
 
     def test_no_command(self):
         " empty list of commands yields an empty list of records "
@@ -43,9 +42,9 @@ class TestO2MSerialization(common.TransactionCase):
     def test_LINK_TO_command(self):
         " reads the records from the database, records are returned with their ids. "
         ids = [
-            self.address.create(self.cr, UID, {'name': 'foo'}),
-            self.address.create(self.cr, UID, {'name': 'bar'}),
-            self.address.create(self.cr, UID, {'name': 'baz'})
+            self.partner.create(self.cr, UID, {'name': 'foo'}),
+            self.partner.create(self.cr, UID, {'name': 'bar'}),
+            self.partner.create(self.cr, UID, {'name': 'baz'})
         ]
         commands = map(LINK_TO, ids)
 
@@ -61,9 +60,9 @@ class TestO2MSerialization(common.TransactionCase):
     def test_bare_ids_command(self):
         " same as the equivalent LINK_TO commands "
         ids = [
-            self.address.create(self.cr, UID, {'name': 'foo'}),
-            self.address.create(self.cr, UID, {'name': 'bar'}),
-            self.address.create(self.cr, UID, {'name': 'baz'})
+            self.partner.create(self.cr, UID, {'name': 'foo'}),
+            self.partner.create(self.cr, UID, {'name': 'bar'}),
+            self.partner.create(self.cr, UID, {'name': 'baz'})
         ]
 
         results = self.partner.resolve_o2m_commands_to_record_dicts(
@@ -77,9 +76,9 @@ class TestO2MSerialization(common.TransactionCase):
 
     def test_UPDATE_command(self):
         " take the in-db records and merge the provided information in "
-        id_foo = self.address.create(self.cr, UID, {'name': 'foo'})
-        id_bar = self.address.create(self.cr, UID, {'name': 'bar'})
-        id_baz = self.address.create(self.cr, UID, {'name': 'baz', 'city': 'tag'})
+        id_foo = self.partner.create(self.cr, UID, {'name': 'foo'})
+        id_bar = self.partner.create(self.cr, UID, {'name': 'bar'})
+        id_baz = self.partner.create(self.cr, UID, {'name': 'baz', 'city': 'tag'})
 
         results = self.partner.resolve_o2m_commands_to_record_dicts(
             self.cr, UID, 'address', [
@@ -96,7 +95,7 @@ class TestO2MSerialization(common.TransactionCase):
 
     def test_mixed_commands(self):
         ids = [
-            self.address.create(self.cr, UID, {'name': name})
+            self.partner.create(self.cr, UID, {'name': name})
             for name in ['NObar', 'baz', 'qux', 'NOquux', 'NOcorge', 'garply']
         ]
 
@@ -126,9 +125,9 @@ class TestO2MSerialization(common.TransactionCase):
     def test_LINK_TO_pairs(self):
         "LINK_TO commands can be written as pairs, instead of triplets"
         ids = [
-            self.address.create(self.cr, UID, {'name': 'foo'}),
-            self.address.create(self.cr, UID, {'name': 'bar'}),
-            self.address.create(self.cr, UID, {'name': 'baz'})
+            self.partner.create(self.cr, UID, {'name': 'foo'}),
+            self.partner.create(self.cr, UID, {'name': 'bar'}),
+            self.partner.create(self.cr, UID, {'name': 'baz'})
         ]
         commands = map(lambda id: (4, id), ids)