diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index eebfa99985a..ffdb4e4e247 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -68,7 +68,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Client Actions">
-                    <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('key2','ilike',self)]" string="Client Action"/>
+                    <field name="name"
+                        filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('key2','ilike',self)]"
+                        string="Client Action"/>
                     <group expand="0" string="Group By...">
                         <filter string="Model" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'key2'}"/>
@@ -559,7 +561,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Wizards">
-                    <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('type','ilike',self), ('wiz_name','ilike',self)]" string="Wizard"/>
+                    <field name="name"
+                        filter_domain="['|', '|', ('name','ilike',self), ('type','ilike',self), ('wiz_name','ilike',self)]"
+                        string="Wizard"/>
                 </search>
             </field>
         </record>
@@ -649,11 +653,17 @@
             <field name="arch" type="xml">
                 <search string="Views">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('model','ilike',self)]" string="View"/>
+                    <filter icon="terp-stock_zoom"
+                        string="Search"
+                        domain="[('type', '=', 'search')]"/>
+                    <filter icon="gtk-indent"
+                        string="Tree"
+                        domain="[('type', '=', 'tree')]"/>
+                    <filter icon="gtk-new"
+                        string="Form"
+                        domain="[('type', '=','form')]"/>
                     <field name="inherit_id"/>
                     <field name="type"/>
-                    <filter icon="terp-stock_zoom" string="Search" domain="[('type', '=', 'search')]"/>
-                    <filter icon="gtk-indent" string="Tree" domain="[('type', '=', 'tree')]"/>
-                    <filter icon="gtk-new" string="Form" domain="[('type', '=','form')]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
@@ -783,12 +793,20 @@
                 <search string="Attachments">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('datas_fname','ilike',self)]" string="Attachment"/>
                     <field name="create_date"/>
+                    <filter icon="terp-stage"
+                        string="URL"
+                        domain="[('type','=','url')]"/>
+                    <filter icon="terp-stock_align_left_24"
+                        string="Binary"
+                        domain="[('type','=','binary')]"/>
+                    <separator/>
+                    <filter name="my_documents_filter" 
+                        string="My Document(s)"
+                        icon="terp-personal"
+                        domain="[('create_uid','=',uid)]"
+                        help="Filter on my documents"/>
                     <field name="create_uid"/>
                     <field name="type"/>
-                    <filter icon="terp-stage" string="URL" domain="[('type','=','url')]"/>
-                    <filter icon="terp-stock_align_left_24" string="Binary" domain="[('type','=','binary')]"/>
-                    <separator/>
-                    <filter name="my_documents_filter" string="My Document(s)" icon="terp-personal" domain="[('create_uid','=',uid)]" help="Filter on my documents"/>
                     <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"/>
@@ -921,10 +939,16 @@
             <field name="arch" type="xml">
                 <search string="Model Description">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('model','ilike',self)]" string="Model"/>
-                    <filter icon="terp-camera_test" string="In Memory" domain="[('osv_memory', '=', True)]"/>
+                    <filter icon="terp-camera_test"
+                        string="In Memory"
+                        domain="[('osv_memory', '=', True)]"/>
                     <separator/>
-                    <filter icon="terp-stock_align_left_24" string="Custom" domain="[('state', '=', 'manual')]"/>
-                    <filter icon="terp-translate" string="Base" domain="[('state', '=', 'base')]"/>
+                    <filter icon="terp-stock_align_left_24"
+                        string="Custom"
+                        domain="[('state', '=', 'manual')]"/>
+                    <filter icon="terp-translate"
+                        string="Base"
+                        domain="[('state', '=', 'base')]"/>
                 </search>
             </field>
         </record>
@@ -995,15 +1019,21 @@
             <field name="arch" type="xml">
                 <search string="Fields">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('field_description','ilike',self)]" string="Field"/>
+                    <filter icon="terp-gnome-cpu-frequency-applet+"
+                        string="Required"
+                        domain="[('required', '=', True)]"/>
+                    <separator/>
+                    <filter icon="terp-dialog-close"
+                        string="Readonly"
+                        domain="[('readonly', '=', True)]"/>
+                    <separator/>
+                    <filter icon="terp-translate"
+                        string="Translate"
+                        domain="[('translate', '=', True)]"/>
                     <field name="model_id"/>
                     <field name="ttype"/>
                     <field name="required"/>
                     <field name="readonly"/>
-                    <filter icon="terp-gnome-cpu-frequency-applet+" string="Required" domain="[('required', '=', True)]"/>
-                    <separator/>
-                    <filter icon="terp-dialog-close" string="Readonly" domain="[('readonly', '=', True)]"/>
-                    <separator/>
-                    <filter icon="terp-translate" string="Translate" domain="[('translate', '=', True)]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
                     </group>
@@ -1057,10 +1087,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"/>
+                    <field name="name"
+                        filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('module','ilike',self)]"
+                        string="External Identifier"/>
+                    <filter icon="terp-camera_test"
+                        string="Updatable"
+                        domain="[('noupdate', '=', False)]"/>
                     <field name="res_id"/>
                     <field name="noupdate"/>
-                    <filter icon="terp-camera_test" string="Updatable" domain="[('noupdate', '=', False)]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Module" icon="terp-folder-blue" domain="[]" context="{'group_by':'module'}"/>
                         <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
@@ -1183,10 +1217,12 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Translations">
+                    <filter icon="terp-gdu-smart-failing"
+                        string="Untranslated"
+                        domain="['|',('value', '=', False),('value','=','')]"/>
                     <field name="lang"/>
                     <field name="src"/>
                     <field name="value"/>
-                    <filter icon="terp-gdu-smart-failing" string="Untranslated" domain="['|',('value', '=', False),('value','=','')]"/>
                 </search>
             </field>
         </record>
@@ -1496,13 +1532,13 @@
             <field name="arch" type="xml">
                 <search string="Access Controls">
                     <field name="name" string="Access Control"/>
-                    <field name="model_id"/>
-                    <field name="group_id"/>
                     <filter string="Global" icon="terp-stage" domain="[('group_id','=',False)]"/>
                     <separator/>
                     <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)]"/>
+                    <field name="model_id"/>
+                    <field name="group_id"/>
                     <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'}"/>
@@ -1589,13 +1625,13 @@
             <field name="arch" type="xml">
                 <search string="Record Rules">
                     <field name="name" string="Record Rule"/>
-                    <field name="model_id"/>
-                    <field name="groups"/>
                     <filter string="Global" icon="terp-stage" domain="[('global','=',True)]"/>
                     <separator/>
                     <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)]"/>
+                    <field name="model_id"/>
+                    <field name="groups"/>
                 </search>
             </field>
         </record>
@@ -1808,10 +1844,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Actions">
+                    <filter string="To Do" name="todo" icon="terp-camera_test" domain=" [('state','=','open')]" help="Wizards to be Launched"/>
                     <field name="action_id"/>
                     <field name="category_id"/>
                     <field name="state"/>
-                    <filter string="To Do" name="todo" icon="terp-camera_test" domain=" [('state','=','open')]" help="Wizards to be Launched"/>
                     <group expand="0" string="Group By...">
                         <filter string="Category" context="{'group_by': 'category_id'}" icon="terp-folder-orange"/>
                     </group>
@@ -1934,7 +1970,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Outgoing Mail Servers">
-                    <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('smtp_host','ilike',self), ('smtp_user','ilike',self)]" string="Outgoing Mail Server"/>
+                    <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_filters.xml b/openerp/addons/base/ir/ir_filters.xml
index 60c52c958ec..fec6b0a604e 100644
--- a/openerp/addons/base/ir/ir_filters.xml
+++ b/openerp/addons/base/ir/ir_filters.xml
@@ -54,12 +54,14 @@
             <field name="arch" type="xml">
                 <search string="Filters">
                     <field name="name" string="Filter Name"/>
-                    <field name="model_id"/>
-                    <field name="user_id"/>
                     <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"/>
                     <separator/>
-                    <filter icon="terp-personal" domain="[('user_id','in',(uid, False))]" name="my_filters" string="My Filters"/>
+                    <filter icon="terp-personal" domain="[('user_id','in',(uid, False))]"
+                        name="my_filters"
+                        string="My Filters"/>
+                    <field name="model_id"/>
+                    <field name="user_id"/>
                 </search>
             </field>
         </record>
diff --git a/openerp/addons/base/ir/workflow/workflow_view.xml b/openerp/addons/base/ir/workflow/workflow_view.xml
index 9ec977199eb..f27755e2987 100644
--- a/openerp/addons/base/ir/workflow/workflow_view.xml
+++ b/openerp/addons/base/ir/workflow/workflow_view.xml
@@ -164,11 +164,14 @@
         <field name="arch" type="xml">
             <search string="Workflow Activity">
                 <field name="name" string="Workflow Activity"/>
+                <filter icon="terp-camera_test" string="Flow Start"
+                domain="[('flow_start', '=',True)]" />
+                <separator/>
+                <filter icon="terp-gtk-stop" string="Flow Stop"
+                domain="[('flow_stop', '=',True)]" />
                 <field name="wkf_id"/>
                 <field name="action_id"/>
                 <field name="kind"/>
-                <filter icon="terp-camera_test" string="Flow Start" domain="[('flow_start', '=',True)]" />
-                <filter icon="terp-gtk-stop" string="Flow Stop" domain="[('flow_stop', '=',True)]" />
                 <group expand="0" string="Group By...">
                     <filter string="Workflow" icon="terp-stage" domain="[]" context="{'group_by':'wkf_id'}"/>
                 </group>
@@ -295,10 +298,10 @@
         <field name="arch" type="xml">
             <search string="Workflow Instances">
                 <field name="res_type" string="Resource Object"/>
+                <filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" name="active"/>
                 <field name="wkf_id"/>
                 <field name="res_id"/>
                 <field name="state"/>
-                <filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" name="active"/>
         </search>
       </field>
     </record>
@@ -358,11 +361,11 @@
         <field name="arch" type="xml">
             <search string="Workflow Workitems">
                 <field name="state" string="State"/>
+                <filter icon="terp-camera_test" string="Active" name="active" domain="[('state','=','active')]"/>
                 <field name="wkf_id"/>
                 <field name="act_id"/>
                 <field name="subflow_id"/>
                 <field name="inst_id"/>
-                <filter icon="terp-camera_test" string="Active" name="active" domain="[('state','=','active')]"/>
             </search>
         </field>
     </record>
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 2950abb1546..8e12b9c932a 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -42,13 +42,13 @@
             <field name="arch" type="xml">
                 <search string="Search modules">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('shortdesc','ilike',self)]" string="Module"/>
-                    <field name="description" string="Keywords"/>
-                    <field name="category_id"/>
+                    <field name="description" string="Keywords" filter_domain="['|', ('description', 'ilike', self), ('summary', 'ilike', self)]"/>
                     <filter name="app" icon="terp-check" string="Apps" domain="[('application', '=', 1)]"/>
                     <filter name="extra" icon="terp-check" string="Extra" domain="[('application', '=', 0)]"/>
                     <separator/>
                     <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'])]"/>
+                    <field name="category_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Author" icon="terp-personal" domain="[]" context="{'group_by':'author'}"/>
                         <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/>
diff --git a/openerp/addons/base/res/ir_property_view.xml b/openerp/addons/base/res/ir_property_view.xml
index 8f48a0320cd..b7d3324b3f6 100644
--- a/openerp/addons/base/res/ir_property_view.xml
+++ b/openerp/addons/base/res/ir_property_view.xml
@@ -9,9 +9,12 @@
             <field name="arch" type="xml">
                 <search string="Parameters">
                     <field name="name" string="Name"/>
+                    <filter icon="terp-project"
+                        string="Generic"
+                        help="Parameters that are used by all resources."
+                        domain="[('res_id','=',False)]"/>
                     <field name="fields_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <filter icon="terp-project" string="Generic" help="Parameters that are used by all resources." domain="[('res_id','=',False)]"/>
                 </search>
             </field>
         </record>
diff --git a/openerp/addons/base/res/res_bank_view.xml b/openerp/addons/base/res/res_bank_view.xml
index 5f5ddadc3f7..4409f23a501 100644
--- a/openerp/addons/base/res/res_bank_view.xml
+++ b/openerp/addons/base/res/res_bank_view.xml
@@ -146,9 +146,9 @@
             <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"/>
+                    <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"/>
                     <field name="company_id" invisible="context.get('company_hide', True)"/>
                     <field name="partner_id"/>
-                    <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"/>
                 </search>
             </field>
         </record>
diff --git a/openerp/addons/base/res/res_lang_view.xml b/openerp/addons/base/res/res_lang_view.xml
index c4f8bc97e63..3d91b977dab 100644
--- a/openerp/addons/base/res/res_lang_view.xml
+++ b/openerp/addons/base/res/res_lang_view.xml
@@ -108,9 +108,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Languages">
-                    <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('code','ilike',self), ('iso_code','ilike',self)]" string="Language"/>
-                    <field name="direction"/>
+                    <field name="name"
+                        filter_domain="['|', '|', ('name','ilike',self), ('code','ilike',self), ('iso_code','ilike',self)]"
+                        string="Language"/>
                     <filter string="Translatable" icon="terp-tools" domain="[('translatable','=',True)]"/>
+                    <field name="direction"/>
                 </search>
             </field>
         </record>
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 18dcb7cd895..27caa708cb6 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -245,23 +245,25 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Partner">
-                    <field name="name" filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]" string="Partner"/>
-                    <field name="category_id"/>
-                    <field name="user_id"/>
-                    <field name="parent_id" filter_domain="[('parent_id','child_of',[self])]"/>
-                    <filter help="My Partners" icon="terp-personal+" domain="[('user_id','=',uid)]"/>
-                    <separator/>
-                    <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/>
-                    <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
-                    <separator/>
-                    <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
-                        <filter string="Company" context="{'group_by': 'parent_id'}"/>
-                    </group>
-                </search>
+                   <field name="name"
+                       filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]"
+                       string="Partner"/>
+                   <filter help="My Partners" icon="terp-personal+" domain="[('user_id','=',uid)]"/>
+                   <separator/>
+                   <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/>
+                   <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
+                   <separator/>
+                   <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
+                   <field name="category_id"/>
+                   <field name="user_id"/>
+                   <field name="parent_id" filter_domain="[('parent_id','child_of',[self])]"/>
+                   <group expand="0" string="Group By...">
+                       <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
+                       <filter string="Company" context="{'group_by': 'parent_id'}"/>
+                   </group>
+               </search>
             </field>
         </record>