diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index 415225ac374..100a5ea11e8 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -172,10 +172,10 @@ class AccountMove(models.Model):
         string='Salesperson',
         default=lambda self: self.env.user)
     invoice_payment_state = fields.Selection(selection=[
-            ('not_paid', 'Not Paid'),
-            ('in_payment', 'In Payment'),
-            ('paid', 'paid')
-        ], string='Payment Status', store=True, readonly=True, copy=False, tracking=True,
+        ('not_paid', 'Not Paid'),
+        ('in_payment', 'In Payment'),
+        ('paid', 'Paid')],
+        string='Payment Status', store=True, readonly=True, copy=False, tracking=True,
         compute='_compute_amount')
     invoice_date = fields.Date(string='Invoice/Bill Date', readonly=True, index=True, copy=False,
         states={'draft': [('readonly', False)]},
@@ -2133,7 +2133,7 @@ class AccountMoveLine(models.Model):
 
     # ==== Tax fields ====
     tax_ids = fields.Many2many('account.tax', string='Taxes')
-    tax_line_id = fields.Many2one('account.tax', string='Originator tax', ondelete='restrict', store=True,
+    tax_line_id = fields.Many2one('account.tax', string='Originator Tax', ondelete='restrict', store=True,
         compute='_compute_tax_line_id')
     tax_group_id = fields.Many2one(related='tax_line_id.tax_group_id', string='Originator tax group',
         readonly=True, store=True,
diff --git a/addons/account/views/account_incoterms_view.xml b/addons/account/views/account_incoterms_view.xml
index 3b4d308a113..fca740cfe31 100644
--- a/addons/account/views/account_incoterms_view.xml
+++ b/addons/account/views/account_incoterms_view.xml
@@ -13,6 +13,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="account_incoterms_form" model="ir.ui.view">
             <field name="name">account.incoterms.form</field>
             <field name="model">account.incoterms</field>
@@ -29,15 +30,18 @@
                 </form>
             </field>
         </record>
+
         <record id="account_incoterms_view_search" model="ir.ui.view">
             <field name="name">account.incoterms.search</field>
             <field name="model">account.incoterms</field>
             <field name="arch" type="xml">
                 <search string="Incoterms">
-                    <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                 </search>
             </field>
         </record>
+
         <record id="action_incoterms_tree" model="ir.actions.act_window">
             <field name="name">Incoterms</field>
             <field name="res_model">account.incoterms</field>
diff --git a/addons/account/views/account_move_views.xml b/addons/account/views/account_move_views.xml
index 3f1ebebc8cb..be8999e48e2 100644
--- a/addons/account/views/account_move_views.xml
+++ b/addons/account/views/account_move_views.xml
@@ -292,37 +292,43 @@
             <field name="model">account.move.line</field>
             <field name="arch" type="xml">
                 <search string="Search Journal Items">
-                    <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Move"/>
+                    <field name="name" string="Journal Item" filter_domain="[
+                        '|', '|', '|',
+                        ('name', 'ilike', self), ('ref', 'ilike', self), ('account_id', 'ilike', self), ('partner_id', 'ilike', self)]"/>
                     <field name="date"/>
+                    <field name="account_id"/>
+                    <field name="partner_id"/>
+                    <field name="journal_id"/>
+                    <field name="move_id" string="Journal Entry" filter_domain="[
+                        '|'', '|', ('move_id.name', 'ilike', self), ('move_id.ref', 'ilike', self), ('move_id.partner_id', 'ilike', self)]"/>
+                    <field name="tax_ids" />
+                    <field name="tax_line_id" string="Originator Tax"/>
+                    <field name="reconcile_model_id"/>
+                    <separator/>
+                    <filter string="Unposted" name="unposted" domain="[('move_id.state', '=', 'draft')]" help="Unposted Journal Items"/>
+                    <filter string="Posted" name="posted" domain="[('move_id.state', '=', 'posted')]" help="Posted Journal Items"/>
                     <separator/>
-                    <filter string="Unposted" name="unposted" domain="[('move_id.state','=','draft')]" help="Unposted Journal Items"/>
-                    <filter name="posted" string="Posted" domain="[('move_id.state','=','posted')]" help="Posted Journal Items"/>
                     <filter string="To Check" name="to_check" domain="[('move_id.to_check', '=', True)]"/>
                     <separator/>
-                    <filter string="Sales" name="sales" domain="[('move_id.journal_id.type','=','sale')]" context="{'default_journal_type': 'sale'}"/>
-                    <filter string="Purchases" name="purchases" domain="[('move_id.journal_id.type','=','purchase')]" context="{'default_journal_type': 'purchase'}"/>
+                    <filter string="Unreconciled" domain="[('full_reconcile_id', '=', False), ('balance', '!=', 0), ('account_id.reconcile', '=', True)]" help="Journal items where matching number isn't set" name="unreconciled"/>
+                    <separator/>
+                    <filter string="Sales" name="sales" domain="[('move_id.journal_id.type', '=', 'sale')]" context="{'default_journal_type': 'sale'}"/>
+                    <filter string="Purchases" name="purchases" domain="[('move_id.journal_id.type', '=', 'purchase')]" context="{'default_journal_type': 'purchase'}"/>
                     <filter string="Bank" name="bank" domain="[('move_id.journal_id.type', '=', 'bank')]" context="{'default_journal_type': 'bank'}"/>
                     <filter string="Cash" name="cash" domain="[('move_id.journal_id.type', '=', 'cash')]" context="{'default_journal_type': 'cash'}"/>
-                    <filter string="Miscellaneous Operations" domain="[('move_id.journal_id.type','=','general')]" name="misc_filter" context="{'default_journal_type': 'general'}"/>
-                    <separator/>
-                    <filter string="Unreconciled" domain="[('full_reconcile_id', '=', False), ('balance','!=', 0), ('account_id.reconcile','=',True)]" help="Journal items where matching number isn't set" name="unreconciled"/>
+                    <filter string="Miscellaneous" domain="[('move_id.journal_id.type', '=', 'general')]" name="misc_filter" context="{'default_journal_type': 'general'}"/>
                     <separator/>
                     <filter string="Payable" domain="[('account_id.internal_type', '=', 'payable')]" help="From Payable accounts" name="payable"/>
                     <filter string="Receivable" domain="[('account_id.internal_type', '=', 'receivable')]" help="From Receivable accounts" name="receivable"/>
                     <separator/>
-                    <field name="account_id"/>
-                    <field name="partner_id"/>
-                    <field name="journal_id"/>
-                    <field name="move_id" string="Number (Move)"/>
-                    <field name="tax_line_id"/>
-                    <field name="tax_ids" />
-                    <field name="reconcile_model_id"/>
+                    <filter string="Date" name="date" date="date"/>
+                    <separator/>
                     <group expand="0" string="Group By">
-                        <filter string="Journal Entry" name="group_by_move" domain="[]" context="{'group_by':'move_id'}"/>
-                        <filter string="Account" name="group_by_account" domain="[]" context="{'group_by':'account_id'}"/>
-                        <filter string="Partner" name="group_by_partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Journal" name="journal" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="Date" name="groupby_date" domain="[]" context="{'group_by':'date'}"/>
+                        <filter string="Journal Entry" name="group_by_move" domain="[]" context="{'group_by': 'move_id'}"/>
+                        <filter string="Account" name="group_by_account" domain="[]" context="{'group_by': 'account_id'}"/>
+                        <filter string="Partner" name="group_by_partner" domain="[]" context="{'group_by': 'partner_id'}"/>
+                        <filter string="Journal" name="journal" domain="[]" context="{'group_by': 'journal_id'}"/>
+                        <filter string="Date" name="groupby_date" domain="[]" context="{'group_by': 'date'}"/>
                     </group>
                 </search>
             </field>
@@ -851,25 +857,29 @@
             <field name="model">account.move</field>
             <field name="arch" type="xml">
                 <search string="Search Move">
-                    <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Move"/>
+                    <field name="name" string="Journal Entry" filter_domain="['|', '|', ('name', 'ilike', self), ('ref', 'ilike', self), ('partner_id', 'ilike', self)]"/>
                     <field name="date"/>
-                    <filter string="Unposted" name="unposted" domain="[('state','=','draft')]" help="Unposted Journal Entries"/>
-                    <filter string="Posted" name="posted" domain="[('state','=','posted')]" help="Posted Journal Entries"/>
-                    <filter string="To Check" name="to_check" domain="[('to_check', '=', True)]"/>
-                    <separator/>
-                    <filter string="Sales" name="sales" domain="[('journal_id.type','=','sale')]" context="{'default_journal_type': 'sale'}"/>
-                    <filter string="Purchases" name="purchases" domain="[('journal_id.type','=','purchase')]" context="{'default_journal_type': 'purchase'}"/>
-                    <filter string="Bank Operations" name="bankoperations" domain="[('journal_id.type','=','bank')]" context="{'default_journal_type': 'bank'}"/>
-                    <filter string="Cash Operations" name="cashoperations" domain="[('journal_id.type','=','cash')]" context="{'default_journal_type': 'cash'}"/>
-                    <filter string="Miscellaneous Operations" domain="[('journal_id.type','=','general')]" name="misc_filter" context="{'default_journal_type': 'general'}"/>
-                    <separator/>
                     <field name="partner_id"/>
                     <field name="journal_id"/>
+                    <filter string="Unposted" name="unposted" domain="[('state', '=', 'draft')]" help="Unposted Journal Entries"/>
+                    <filter string="Posted" name="posted" domain="[('state', '=', 'posted')]" help="Posted Journal Entries"/>
+                    <separator/>
+                    <filter string="To Check" name="to_check" domain="[('to_check', '=', True)]"/>
+                    <separator/>
+                    <filter string="Sales" name="sales" domain="[('journal_id.type', '=', 'sale')]" context="{'default_journal_type': 'sale'}"/>
+                    <filter string="Purchases" name="purchases" domain="[('journal_id.type', '=', 'purchase')]" context="{'default_journal_type': 'purchase'}"/>
+                    <filter string="Bank" name="bankoperations" domain="[('journal_id.type', '=', 'bank')]" context="{'default_journal_type': 'bank'}"/>
+                    <filter string="Cash" name="cashoperations" domain="[('journal_id.type', '=', 'cash')]" context="{'default_journal_type': 'cash'}"/>
+                    <filter string="Miscellaneous" name="misc_filter" domain="[('journal_id.type', '=', 'general')]" context="{'default_journal_type': 'general'}"/>
+                    <separator/>
+                    <filter string="Date" name="date" date="date"/>
+                    <separator/>
                     <group expand="0" string="Group By">
-                        <filter string="Partner" name="partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Journal" name="journal" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Date" name="date" domain="[]" context="{'group_by':'date'}" help="Journal Entries by Date"/>
+                        <filter string="Partner" name="partner" domain="[]" context="{'group_by': 'partner_id'}"/>
+                        <filter string="Journal" name="journal" domain="[]" context="{'group_by': 'journal_id'}"/>
+                        <filter string="Status" name="status" domain="[]" context="{'group_by': 'state'}"/>
+                        <filter string="Date" name="by_date" domain="[]" context="{'group_by': 'date'}" help="Journal Entries by Date"/>
+                        <filter string="Company" name="by_company" domain="[]" context="{'group_by': 'company_id'}" groups="base.group_multi_company"/>
                     </group>
                 </search>
             </field>
@@ -881,34 +891,42 @@
             <field name="arch" type="xml">
                 <search string="Search Invoice">
                     <field name="name" string="Invoice"
-                           filter_domain="['|','|','|', '|', ('name','ilike',self), ('invoice_origin','ilike',self), ('ref', 'ilike', self), ('invoice_payment_ref', 'ilike', self), ('partner_id', 'child_of', self)]"/>
-                    <filter domain="[('invoice_user_id','=',uid)]" name="myinvoices" help="My Invoices"/>
+                           filter_domain="[
+                                '|', '|' , '|', '|',
+                                ('name', 'ilike', self), ('invoice_origin', 'ilike', self),
+                                ('ref', 'ilike', self), ('invoice_payment_ref', 'ilike', self),
+                                ('partner_id', 'child_of', self)]"/>
                     <field name="journal_id"/>
+                    <field name="partner_id" operator="child_of"/>
+                    <field name="invoice_user_id" string="Salesperson" domain="[('share', '=', False)]"/>
+                    <field name="date" string="Period"/>
+                    <filter domain="[('invoice_user_id', '=', uid)]" name="myinvoices" help="My Invoices"/>
                     <separator/>
-                    <filter name="draft" string="Draft" domain="[('state','=','draft')]"/>
+                    <filter name="draft" string="Draft" domain="[('state', '=', 'draft')]"/>
                     <filter name="unpaid" string="Open" domain="[('state', '=', 'posted'), ('invoice_payment_state', '=', 'not_paid')]"/>
                     <filter name="in_payment" string="In Payment" domain="[('invoice_payment_state', '=', 'in_payment')]"/>
                     <filter name="paid" string="Paid" domain="[('invoice_payment_state', '=', 'paid')]"/>
                     <filter name="late" string="Overdue" domain="['&amp;', ('invoice_date_due', '&lt;', time.strftime('%%Y-%%m-%%d')), ('state', '=', 'posted'), ('invoice_payment_state', '=', 'not_paid')]" help="Overdue invoices, maturity date passed"/>
                     <separator/>
-                    <field name="partner_id" operator="child_of"/>
-                    <field name="invoice_user_id" string="Salesperson" domain="[('share','=', False)]"/>
-                    <field name="date" string="Period"/>
+                    <filter name="invoice_date" string="Invoice Date" date="invoice_date"/>
+                    <filter name="due_date" string="Due Date" date="invoice_date_due"/>
+                    <separator/>
+                    <filter string="My Activities" name="activities_my" domain="[('activity_ids.user_id', '=', uid)]"/>
+                    <separator/>
                     <filter invisible="1" string="Late Activities" name="activities_overdue"
                         domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
                         help="Show all records which has next action date is before today"/>
                     <filter invisible="1" string="Today Activities" name="activities_today"
                         domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
                     <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
-                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))
-                        ]"/>
+                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
                     <group expand="0" string="Group By">
-                        <filter name="group_by_partner_id" string="Partner" context="{'group_by':'commercial_partner_id'}"/>
-                        <filter string="Salesperson" name="salesperson" context="{'group_by':'invoice_user_id'}"/>
-                        <filter name="status" string="Status" context="{'group_by':'state'}"/>
+                        <filter string="Partner" name="group_by_partner_id" context="{'group_by': 'commercial_partner_id'}"/>
+                        <filter string="Salesperson" name="salesperson" context="{'group_by': 'invoice_user_id'}"/>
+                        <filter string="Status" name="status" context="{'group_by': 'state'}"/>
                         <separator/>
-                        <filter string="Invoice Date" name="invoicedate" context="{'group_by':'invoice_date'}"/>
-                        <filter string="Due Date" name="duedate" context="{'group_by':'invoice_date_due'}"/>
+                        <filter string="Invoice Date" name="invoicedate" context="{'group_by': 'invoice_date'}"/>
+                        <filter string="Due Date" name="duedate" context="{'group_by': 'invoice_date_due'}"/>
                     </group>
                </search>
             </field>
diff --git a/addons/account/views/account_payment_view.xml b/addons/account/views/account_payment_view.xml
index 6cc672d4f24..0d4e51852da 100644
--- a/addons/account/views/account_payment_view.xml
+++ b/addons/account/views/account_payment_view.xml
@@ -80,27 +80,32 @@
             <field name="model">account.payment</field>
             <field name="arch" type="xml">
                 <search string="Payments">
-                    <field name="name" filter_domain="['|', ('name','ilike',self), ('communication','ilike',self)]" string="Description"/>
+                    <field name="name" string="Payment"
+                        filter_domain="['|', '|', ('name', 'ilike', self), ('partner_id', 'ilike', self), ('communication', 'ilike', self)]"/>
+                    <field name="partner_id" string="Customer/Vendor"/>
+                    <field name="journal_id"/>
                     <separator/>
-                    <field name="partner_id" />
-                    <field name="journal_id" />
-                    <field name="company_id" groups="base.group_multi_company" />
-                    <filter string="Vendor Payments" domain="[('partner_type','=','supplier')]" name="outbound_filter"/>
-                    <filter string="Customer Payments" domain="[('partner_type','=','customer')]" name="inbound_filter"/>
-                    <filter string="Transfers" domain="[('payment_type','=','transfer')]" name="transfers_filter"/>
+                    <filter string="Customer Payments" name="inbound_filter" domain="[('partner_type', '=', 'customer')]"/>
+                    <filter string="Vendor Payments" name="outbound_filter" domain="[('partner_type', '=', 'supplier')]"/>
+                    <filter string="Transfers" name="transfers_filter" domain="[('payment_type', '=', 'transfer')]"/>
                     <separator/>
-                    <filter string="Draft" domain="[('state','=','draft')]" name='state_draft'/>
-                    <filter string="Posted" domain="[('state','=','posted')]" name='state_posted'/>
-                    <filter string="Sent" domain="[('state','=','sent')]" name='state_sent'/>
-                    <filter string="Reconciled" name="reconciled" domain="[('state','=','reconciled')]"/>
+                    <filter string="Draft" name="state_draft" domain="[('state', '=', 'draft')]"/>
+                    <filter string="Posted" name="state_posted" domain="[('state', '=', 'posted')]"/>
+                    <filter string="Sent" name="state_sent" domain="[('state', '=', 'sent')]"/>
+                    <filter string="Reconciled" name="reconciled" domain="[('state', '=', 'reconciled')]"/>
                     <separator/>
-                    <filter string="Partner" name="partner" domain="[]" context="{'group_by': 'partner_id'}"/>
+                    <filter string="Payment Date" name="payment_date" date="payment_date"/>
+                    <separator/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <filter string="Customer/Vendor" name="partner" domain="[]" context="{'group_by': 'partner_id'}"/>
                     <filter string="Journal" name="journal" domain="[]" context="{'group_by': 'journal_id'}"/>
                     <filter string="Payment Method" name="paymentmethod" domain="[]" context="{'group_by': 'payment_method_id'}"/>
-                    <filter string="State" name="state" domain="[]" context="{'group_by': 'state'}"/>
+                    <filter string="Status" name="state" domain="[]" context="{'group_by': 'state'}"/>
+                    <filter string="Payment Date" name="groupby_payment_date" domain="[]" context="{'group_by': 'payment_date'}"/>
                     <filter string="Currency" name="currency" domain="[]" context="{'group_by': 'currency_id'}" groups="base.group_multi_currency"/>
                     <!-- company_id is not stored (cdca5d4751a979f6b694f02d88160843f81a77f5). But we can't break structure-->
-                    <filter string="Company" name="company" domain="[]" context="{'group_by': 'company_id'}" groups="base.group_multi_company" invisible="1" />
+                    <filter string="Company" name="company" domain="[]" context="{'group_by': 'company_id'}" groups="base.group_multi_company" invisible="1"/>
+                    <separator/>
                     <filter invisible="1" string="Late Activities" name="activities_overdue"
                         domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
                         help="Show all records which has next action date is before today"/>
diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml
index c735c8ccddc..18f65bc285a 100644
--- a/addons/account/views/account_view.xml
+++ b/addons/account/views/account_view.xml
@@ -118,6 +118,7 @@
               </p>
             </field>
         </record>
+
         <menuitem action="action_account_form" id="menu_action_account_form" parent="account.account_account_menu" groups="account.group_account_user" sequence="2"/>
 
         <!-- Account Journal -->
@@ -136,6 +137,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="account_journal_view_kanban" model="ir.ui.view">
             <field name="name">account.journal.kanban</field>
             <field name="model">account.journal</field>
@@ -159,22 +161,26 @@
                 </kanban>
             </field>
         </record>
+        
         <record id="view_account_journal_search" model="ir.ui.view">
             <field name="name">account.journal.search</field>
             <field name="model">account.journal</field>
             <field name="priority">1</field>
             <field name="arch" type="xml">
                 <search string="Search Account Journal">
-                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Journal"/>
-                    <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
-                    <filter name="sales" domain="[('type', '=', 'sale')]" string="Sales"/>
-                    <filter name="purchases" domain="[('type', '=', 'purchase')]" string="Purchases"/>
-                    <filter name="liquidity" domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity"/>
-                    <filter name="miscellaneous" domain="[('type', 'not in', ['sale', 'purchase', 'cash', 'bank'])]" string="Miscellaneous"/>
+                    <field name="name" string="Journal" filter_domain="['|', ('name', 'ilike', self), ('code', 'ilike', self)]"/>
                     <filter name="dashboard" string="Favorites" domain="[('show_on_dashboard', '=', True)]"/>
+                    <separator/>
+                    <filter name="sales" string="Sales" domain="[('type', '=', 'sale')]"/>
+                    <filter name="purchases" string="Purchases" domain="[('type', '=', 'purchase')]"/>
+                    <filter name="liquidity" string="Liquidity" domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]"/>
+                    <filter name="miscellaneous" string="Miscellaneous" domain="[('type', 'not in', ['sale', 'purchase', 'cash', 'bank'])]"/>
+                    <separator/>
+                    <filter name="inactive" string="Archived" domain="[('active', '=', False)]"/>
                 </search>
             </field>
         </record>
+
         <record id="view_account_journal_group_tree" model="ir.ui.view">
             <field name="name">account.journal.group.tree</field>
             <field name="model">account.journal.group</field>
@@ -188,6 +194,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="view_account_journal_group_form" model="ir.ui.view">
             <field name="name">account.journal.group.form</field>
             <field name="model">account.journal.group</field>
@@ -205,6 +212,7 @@
                 </form>
             </field>
         </record>
+
         <record id="view_account_journal_form" model="ir.ui.view">
             <field name="name">account.journal.form</field>
             <field name="model">account.journal</field>
@@ -401,9 +409,22 @@ action = model.setting_init_bank_account_action()
             </field>
         </record>
 
+        <record id="account_tag_view_search" model="ir.ui.view">
+            <field name="name">account.tag.view.search</field>
+            <field name="model">account.account.tag</field>
+            <field name="arch" type="xml">
+                <search>
+                    <field name="name"/>
+                    <separator/>
+                    <filter name="archived" string="Archived" domain="[('active', '=', False)]"/>
+                </search>
+            </field>
+        </record>
+
         <record id="account_tag_action" model="ir.actions.act_window">
             <field name="name">Account Tags</field>
             <field name="res_model">account.account.tag</field>
+            <field name="search_view_id" ref="account_tag_view_search"/>
             <field name="help" type="html">
               <p class="o_view_nocontent_smiling_face">
                 Add a new tag
@@ -1067,6 +1088,7 @@ action = model.setting_init_bank_account_action()
                 </kanban>
             </field>
         </record>
+
         <record id="view_account_tax_search" model="ir.ui.view">
             <field name="name">account.tax.search</field>
             <field name="model">account.tax</field>
@@ -1086,6 +1108,7 @@ action = model.setting_init_bank_account_action()
                 </search>
             </field>
         </record>
+
         <record id="account_tax_view_search" model="ir.ui.view">
             <field name="name">account.tax.search.filters</field>
             <field name="model">account.tax</field>
@@ -1231,6 +1254,7 @@ action = model.setting_init_bank_account_action()
                 </tree>
             </field>
         </record>
+
         <record id="view_payment_term_line_form" model="ir.ui.view">
             <field name="name">account.payment.term.line.form</field>
             <field name="model">account.payment.term.line</field>
@@ -1269,6 +1293,7 @@ action = model.setting_init_bank_account_action()
                 </form>
             </field>
         </record>
+
         <record id="view_payment_term_search" model="ir.ui.view">
             <field name="name">account.payment.term.search</field>
             <field name="model">account.payment.term</field>
@@ -1276,9 +1301,12 @@ action = model.setting_init_bank_account_action()
                 <search string="Payment Terms">
                     <field name="name" string="Payment Terms"/>
                     <field name="active"/>
+                    <separator/>
+                    <filter name="archived" string="Archived" domain="[('active', '=', False)]"/>
                 </search>
             </field>
         </record>
+
         <record id="view_payment_term_tree" model="ir.ui.view">
             <field name="name">account.payment.term.tree</field>
             <field name="model">account.payment.term</field>
@@ -1290,6 +1318,7 @@ action = model.setting_init_bank_account_action()
                 </tree>
             </field>
         </record>
+
         <record id="view_payment_term_form" model="ir.ui.view">
             <field name="name">account.payment.term.form</field>
             <field name="model">account.payment.term</field>
@@ -1315,6 +1344,7 @@ action = model.setting_init_bank_account_action()
                 </form>
             </field>
         </record>
+
         <record id="view_account_payment_term_kanban" model="ir.ui.view">
             <field name="name">account.payment.term.kanban</field>
             <field name="model">account.payment.term</field>
@@ -1333,6 +1363,7 @@ action = model.setting_init_bank_account_action()
                 </kanban>
             </field>
         </record>
+
         <record id="action_payment_term_form" model="ir.actions.act_window">
             <field name="name">Payment Terms</field>
             <field name="res_model">account.payment.term</field>
@@ -1367,6 +1398,7 @@ action = model.setting_init_bank_account_action()
                 </form>
             </field>
         </record>
+
         <record id="view_account_template_tree" model="ir.ui.view">
             <field name="name">account.account.template.tree</field>
             <field name="model">account.account.template</field>
@@ -1378,6 +1410,7 @@ action = model.setting_init_bank_account_action()
                 </tree>
             </field>
         </record>
+
         <record id="view_account_template_search" model="ir.ui.view">
             <field name="name">account.account.template.search</field>
             <field name="model">account.account.template</field>
@@ -1428,6 +1461,7 @@ action = model.setting_init_bank_account_action()
                 </form>
             </field>
         </record>
+
         <record id="view_account_chart_template_seacrh" model="ir.ui.view">
             <field name="name">account.chart.template.search</field>
             <field name="model">account.chart.template</field>
@@ -1446,6 +1480,7 @@ action = model.setting_init_bank_account_action()
                 </search>
             </field>
         </record>
+
         <record id="view_account_chart_template_tree" model="ir.ui.view">
             <field name="name">account.chart.template.tree</field>
             <field name="model">account.chart.template</field>
@@ -1526,6 +1561,7 @@ action = model.setting_init_bank_account_action()
                 </form>
             </field>
         </record>
+
         <record id="view_account_tax_template_tree" model="ir.ui.view">
             <field name="name">account.tax.template.tree</field>
             <field name="model">account.tax.template</field>
@@ -1536,18 +1572,22 @@ action = model.setting_init_bank_account_action()
                 </tree>
             </field>
         </record>
+
         <record id="view_account_tax_template_search" model="ir.ui.view">
             <field name="name">account.tax.template.search</field>
             <field name="model">account.tax.template</field>
             <field name="arch" type="xml">
                 <search string="Search Tax Templates">
-                    <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax Template"/>
-                    <filter string="Sale" name="sale" domain="[('type_tax_use','=','sale')]" help="Taxes used in Sales"/>
-                    <filter string="Purchase" name="purchase" domain="[('type_tax_use','=','purchase')]" help="Taxes used in Purchases"/>
+                    <field name="name" filter_domain="['|', ('name', 'ilike', self), ('description', 'ilike', self)]" string="Tax Template"/>
                     <field name="chart_template_id"/>
+                    <filter string="Sale" name="sale" domain="[('type_tax_use', '=', 'sale')]" help="Taxes used in Sales"/>
+                    <filter string="Purchase" name="purchase" domain="[('type_tax_use', '=', 'purchase')]" help="Taxes used in Purchases"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                 </search>
             </field>
         </record>
+
         <record id="action_account_tax_template_form" model="ir.actions.act_window">
             <field name="name">Tax Templates</field>
             <field name="res_model">account.tax.template</field>
@@ -1599,6 +1639,7 @@ action = model.setting_init_bank_account_action()
                 </form>
             </field>
         </record>
+
         <record id="view_account_position_template_tree" model="ir.ui.view">
             <field name="name">account.fiscal.position.template.tree</field>
             <field name="model">account.fiscal.position.template</field>
@@ -1632,6 +1673,7 @@ action = model.setting_init_bank_account_action()
                 </pivot>
             </field>
          </record>
+
         <record id="account_bank_statement_graph" model="ir.ui.view">
             <field name="name">account.bank.statement.graph</field>
             <field name="model">account.bank.statement</field>
diff --git a/addons/account_check_printing/views/account_payment_views.xml b/addons/account_check_printing/views/account_payment_views.xml
index 82a97e89edc..df880212f36 100644
--- a/addons/account_check_printing/views/account_payment_views.xml
+++ b/addons/account_check_printing/views/account_payment_views.xml
@@ -24,8 +24,10 @@
             <field name="model">account.payment</field>
             <field name="inherit_id" ref="account.view_account_payment_search"/>
             <field name="arch" type="xml">
-                <xpath expr="//filter[@name='state_sent']" position="before">
-                    <filter string="Checks To Print" domain="[('payment_method_id.code', '=', 'check_printing'), ('state','=','posted')]" name="checks_to_send"/>
+                <xpath expr="//filter[@name='activities_overdue']" position="before">
+                    <separator/>
+                    <filter name="checks_to_send" string="Checks to Print" domain="[('payment_method_id.code', '=', 'check_printing'), ('state', '=', 'posted')]"/>
+                    <separator/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/account_test/views/accounting_assert_test_views.xml b/addons/account_test/views/accounting_assert_test_views.xml
index b98b83611e9..01d1d59bda6 100644
--- a/addons/account_test/views/accounting_assert_test_views.xml
+++ b/addons/account_test/views/accounting_assert_test_views.xml
@@ -67,10 +67,24 @@ Example:
             </field>
         </record>
 
+        <record id="accounting_assert_test_view_search" model="ir.ui.view">
+            <field name="name">accounting.assert.test.view.search</field>
+            <field name="model">accounting.assert.test</field>
+            <field name="arch" type="xml">
+                <search string="Search Account Test">
+                    <field string="Name" name="name"/>
+                    <field string="Description" name="desc"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+                </search>
+            </field>
+        </record>
+
         <record model="ir.actions.act_window" id="action_accounting_assert">
             <field name="name">Accounting Tests</field>
             <field name="res_model">accounting.assert.test</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="accounting_assert_test_view_search"/>
             <field name="help" type="html">
               <p class="o_view_nocontent_smiling_face">
                 Create a new accounting test
diff --git a/addons/analytic/views/analytic_account_views.xml b/addons/analytic/views/analytic_account_views.xml
index 0c69afcf4c1..d9707c97177 100644
--- a/addons/analytic/views/analytic_account_views.xml
+++ b/addons/analytic/views/analytic_account_views.xml
@@ -36,6 +36,17 @@
             </field>
         </record>
 
+        <record id="account_analytic_tag_view_search" model="ir.ui.view">
+            <field name="name">account.analytic.tag.view.search</field>
+            <field name="model">account.analytic.tag</field>
+            <field name="arch" type="xml">
+                <search string="Search Analytic Tags">
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+                </search>
+            </field>
+        </record>
+
         <record id="account_analytic_tag_action" model="ir.actions.act_window">
             <field name="name">Analytic Tags</field>
             <field name="res_model">account.analytic.tag</field>
@@ -228,11 +239,12 @@
             <field name="model">account.analytic.account</field>
             <field name="arch" type="xml">
                 <search string="Analytic Account">
-                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/>
+                    <field name="name" filter_domain="['|', ('name', 'ilike', self), ('code', 'ilike', self)]" string="Analytic Account"/>
                     <field name="partner_id"/>
+                    <separator/>
                     <filter string="Archived" domain="[('active', '=', False)]" name="inactive"/>
                     <group expand="0" string="Group By...">
-                        <filter string="Associated Partner" name="associatedpartner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Associated Partner" name="associatedpartner" domain="[]" context="{'group_by': 'partner_id'}"/>
                     </group>
                 </search>
             </field>
@@ -266,7 +278,6 @@
             </field>
         </record>
 
-
         <record id="view_account_analytic_line_form" model="ir.ui.view">
             <field name="name">account.analytic.line.form</field>
             <field name="model">account.analytic.line</field>
@@ -294,6 +305,7 @@
                 </form>
             </field>
         </record>
+
         <record id="view_account_analytic_line_filter" model="ir.ui.view">
             <field name="name">account.analytic.line.select</field>
             <field name="model">account.analytic.line</field>
@@ -303,13 +315,15 @@
                     <field name="date"/>
                     <field name="account_id"/>
                     <field name="tag_ids" widget="many2many_tags"/>
+                    <filter string="Date" name="date" date="date"/>
                     <group string="Group By..." expand="0" name="groupby">
-                        <filter string="Analytic Account" context="{'group_by':'account_id'}" name="account_id"/>
-                        <filter string="Tasks Date" context="{'group_by':'date'}" name="group_date"/>
+                        <filter string="Analytic Account" name="account_id" context="{'group_by': 'account_id'}"/>
+                        <filter string="Date" name="group_date" context="{'group_by': 'date'}"/>
                     </group>
                 </search>
             </field>
         </record>
+
         <record id="view_account_analytic_line_graph" model="ir.ui.view">
             <field name="name">account.analytic.line.graph</field>
             <field name="model">account.analytic.line</field>
@@ -321,6 +335,7 @@
                 </graph>
             </field>
         </record>
+
         <record id="view_account_analytic_line_pivot" model="ir.ui.view">
             <field name="name">account.analytic.line.pivot</field>
             <field name="model">account.analytic.line</field>
diff --git a/addons/base_automation/views/base_automation_view.xml b/addons/base_automation/views/base_automation_view.xml
index d9e370d8c47..569222f5faf 100644
--- a/addons/base_automation/views/base_automation_view.xml
+++ b/addons/base_automation/views/base_automation_view.xml
@@ -58,6 +58,8 @@
                 <search>
                     <field name="name"/>
                     <field name="model_id"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                 </search>
             </field>
         </record>
diff --git a/addons/calendar/views/calendar_views.xml b/addons/calendar/views/calendar_views.xml
index 297c0ac2a47..01c3b571cd2 100644
--- a/addons/calendar/views/calendar_views.xml
+++ b/addons/calendar/views/calendar_views.xml
@@ -252,7 +252,7 @@
         <field name="model">calendar.event</field>
         <field name="arch" type="xml">
             <search string="Search Meetings">
-                <field name="name" string="Meeting" filter_domain="[('name','ilike',self)]"/>
+                <field name="name" string="Meeting" filter_domain="[('name', 'ilike', self)]"/>
                 <field name="partner_ids"/>
                 <field name="categ_ids"/>
                 <field name="user_id"/>
@@ -260,10 +260,11 @@
                 <field name="privacy" string="Privacy"/>
                 <filter string="My Meetings" help="My Meetings" name="mymeetings" context='{"mymeetings": 1}'/>
                 <separator/>
+                <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                 <group expand="0" string="Group By">
-                    <filter string="Responsible" name="responsible" domain="[]" context="{'group_by':'user_id'}"/>
-                    <filter string="Availability" name="availability" domain="[]" context="{'group_by':'show_as'}"/>
-                    <filter string="Privacy" name="privacy" domain="[]" context="{'group_by':'privacy'}"/>
+                    <filter string="Responsible" name="responsible" domain="[]" context="{'group_by': 'user_id'}"/>
+                    <filter string="Availability" name="availability" domain="[]" context="{'group_by': 'show_as'}"/>
+                    <filter string="Privacy" name="privacy" domain="[]" context="{'group_by': 'privacy'}"/>
                 </group>
             </search>
         </field>
diff --git a/addons/crm/report/crm_activity_report_views.xml b/addons/crm/report/crm_activity_report_views.xml
index 17266c870fa..68cb4a9d891 100644
--- a/addons/crm/report/crm_activity_report_views.xml
+++ b/addons/crm/report/crm_activity_report_views.xml
@@ -48,28 +48,29 @@
                     <field name="team_id" context="{'invisible_team': False}"/>
                     <field name="author_id" string="Assigned To"/>
                     <separator groups="crm.group_use_lead"/>
-                    <filter name="lead" string="Leads" domain="[('lead_type','=', 'lead')]" help="Show only lead" groups="crm.group_use_lead"/>
-                    <filter name="opportunity" string="Opportunities" domain="[('lead_type','=','opportunity')]" help="Show only opportunity" groups="crm.group_use_lead"/>
+                    <filter string="Leads" name="lead" domain="[('lead_type', '=', 'lead')]" help="Show only lead" groups="crm.group_use_lead"/>
+                    <filter string="Opportunities" name="opportunity" domain="[('lead_type', '=', 'opportunity')]" help="Show only opportunity" groups="crm.group_use_lead"/>
                     <separator/>
-                    <filter string="Won" name="won"
-                            domain="[('stage_id.is_won', '=', True)]"/>
+                    <filter string="Won" name="won" domain="[('stage_id.is_won', '=', True)]"/>
                     <separator/>
                     <filter string="Completed Last 365 Days" name="completion_date" domain="[
                         ('date', '>=', (datetime.datetime.combine(context_today() + relativedelta(days=-365), datetime.time(0,0,0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S')),
                         ('date', '&lt;', (datetime.datetime.combine(context_today(), datetime.time(0,0,0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S'))]"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                     <group expand="1" string="Group By">
-                        <filter string="Subtype" name="group_by_subtype" context="{'group_by':'subtype_id'}"/>
-                        <filter string="Activity Type" name="group_by_activity_type" context="{'group_by':'mail_activity_type_id'}"/>
-                        <filter string="Assigned To" name="group_by_author_id" context="{'group_by':'author_id'}"/>
-                        <filter string="Completion Date" name="group_by_completion_date" context="{'group_by':'date:month'}"/>
+                        <filter string="Activity" name="group_by_activity_type" context="{'group_by': 'mail_activity_type_id'}"/>
+                        <filter string="Type" name="group_by_subtype" context="{'group_by': 'subtype_id'}"/>
+                        <filter string="Assigned To" name="group_by_author_id" context="{'group_by': 'author_id'}"/>
+                        <filter string="Completion Date" name="group_by_completion_date" context="{'group_by': 'date:month'}"/>
                         <separator/>
-                        <filter string="Salesperson" name="group_by_user_id" context="{'group_by':'user_id'}"/>
-                        <filter string="Sales Team" name="saleschannel" context="{'group_by':'team_id'}"/>
-                        <filter string="Stage" name="stage" context="{'group_by':'stage_id'}"/>
-                        <filter string="Creation Date" name="group_by_lead_date_creation" context="{'group_by':'lead_create_date'}"/>
-                        <filter string="Company" name="company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <filter string="Expected Closing" name="group_by_date_deadline" context="{'group_by':'date_deadline'}"/>
-                        <filter string="Closed Date" name="group_by_date_closed" context="{'group_by':'date_closed'}"/>
+                        <filter string="Salesperson" name="group_by_user_id" context="{'group_by': 'user_id'}"/>
+                        <filter string="Sales Team" name="saleschannel" context="{'group_by': 'team_id'}"/>
+                        <filter string="Stage" name="stage" context="{'group_by': 'stage_id'}"/>
+                        <filter string="Company" name="company" context="{'group_by': 'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Creation Date" name="group_by_lead_date_creation" context="{'group_by': 'lead_create_date'}"/>
+                        <filter string="Expected Closing" name="group_by_date_deadline" context="{'group_by': 'date_deadline'}"/>
+                        <filter string="Closed Date" name="group_by_date_closed" context="{'group_by': 'date_closed'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index f2040741795..ad6b411205e 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -445,33 +445,40 @@
                     <field name="tag_ids" string="Tag" filter_domain="[('tag_ids', 'ilike', self)]"/>
                     <field name="user_id"/>
                     <field name="team_id"/>
-                    <field name="city"/>
                     <field name="country_id"/>
+                    <field name="city"/>
                     <field name="create_date"/>
+                    <field name="source_id"/>
                     <field name="medium_id"/>
                     <field name="campaign_id"/>
-                    <field name="source_id"/>
                     <separator />
                     <filter string="My Leads"
                             name="assigned_to_me"
                             domain="[('user_id', '=', uid)]"
                             help="Leads that are assigned to me"/>
-                    <filter string="Unassigned Leads" name="unassigned_leads"
-                        domain="[('user_id','=', False), ('type', '=', 'lead')]" help="No salesperson"/>
+                    <filter string="Unassigned" name="unassigned_leads"
+                            domain="[('user_id','=', False), ('type', '=', 'lead')]"
+                            help="Leads that are not assigned"/>
                     <separator />
-                    <filter string="Lost Leads" name="lost"
+                    <filter string="Lost" name="lost"
                             domain="['&amp;', ('probability', '=', 0), ('active', '=', False)]"/>
                     <separator/>
+                    <filter string="Creation Date" name="creation_date" date="create_date"/>
+                    <separator/>
+                    <filter string="Activities Todo" name="activities_my"
+                            domain="[('activity_ids.user_id', '=', uid)]"/>
+                    <separator/>
                     <filter invisible="1" string="Late Activities" name="activities_overdue"
                             domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
                             help="Show all opportunities for which the next action date is before today"/>
                     <filter invisible="1" string="Today Activities" name="activities_today"
                             domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
                     <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
-                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))
-                        ]"/>
+                            domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
                     <filter string="Exception Activities" name="activities_exception"
-                        domain="[('activity_exception_decoration', '!=', False)]"/>
+                            domain="[('activity_exception_decoration', '!=', False)]"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                     <group expand="0" string="Group By">
                         <filter string="Salesperson" name="salesperson" context="{'group_by':'user_id'}"/>
                         <filter string="Sales Team" name="saleschannel" context="{'group_by':'team_id'}"/>
@@ -768,52 +775,54 @@
             <field name="priority">15</field>
             <field name="arch" type="xml">
                 <search string="Search Opportunities">
-                    <field name="name" string="Opportunity" filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
+                    <field name="name" string="Opportunity" filter_domain="[
+                        '|', '|', '|', '|',
+                        ('partner_id', 'ilike', self),
+                        ('partner_name', 'ilike', self),
+                        ('email_from', 'ilike', self),
+                        ('name', 'ilike', self),
+                        ('contact_name', 'ilike', self)]"/>
+                    <field name="partner_id" operator="child_of" string="Customer" filter_domain="[
+                        '|', '|', '|',
+                        ('partner_id', 'ilike', self),
+                        ('partner_name', 'ilike', self),
+                        ('email_from', 'ilike', self),
+                        ('contact_name', 'ilike', self)]"/>
                     <field name="tag_ids" string="Tag" filter_domain="[('tag_ids', 'ilike', self)]"/>
-                    <field name="stage_id" domain="[]"/>
                     <field name="user_id"/>
                     <field name="team_id"/>
-                    <field name="partner_id" operator="child_of" string="Customer"/>
-                    <field name="city"/>
+                    <field name="stage_id" domain="[]"/>
                     <field name="country_id"/>
-                    <field name="activity_type_id"/>
-                    <field name="activity_summary"/>
-                    <field name="probability"/>
-                    <field name="lost_reason"/>
-                    <field name="date_conversion"/>
-                    <field name="campaign_id"/>
+                    <field name="city"/>
                     <separator/>
                     <filter string="My Pipeline" name="assigned_to_me"
                         domain="[('user_id', '=', uid)]"
                         help="Opportunities that are assigned to me"/>
                     <filter string="Unassigned" name="unassigned"
-                        domain="[('user_id','=', False)]" help="No salesperson"/>
+                        domain="[('user_id', '=', False)]" help="No salesperson"/>
                     <filter string="Open Opportunities" name="open_opportunities"
-                            domain="[('probability', '&lt;', 100), ('type', '=', 'opportunity')]"
-                            help="Open Opportunities"/>
+                        domain="[('probability', '&lt;', 100), ('type', '=', 'opportunity')]"
+                        help="Open Opportunities"/>
                     <separator/>
-                    <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction','=',True)]"/>
+                    <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction', '=', True)]"/>
                     <separator/>
-                    <filter string="Overdue Opportunities" name="overdue_opp"
-                            domain="[('date_deadline', '&lt;', context_today().strftime('%Y-%m-%d')), ('date_closed', '=', False)]"
-                            help="Opportunities with a date of Expected Closing which is in the past"/>
                     <filter string="Creation Date" name="creation_date" date="create_date"/>
-                    <filter string="Expected Closing" name="close_this_month" date="date_deadline"/>
                     <filter string="Closed Date" name="close_date" date="date_closed"/>
                     <separator/>
                     <filter string="Won" name="won" domain="['&amp;', ('active', '=', True), ('stage_id.is_won', '=', True)]"/>
                     <filter string="Lost" name="lost" domain="['&amp;', ('active', '=', False), ('probability', '=', 0)]"/>
                     <separator/>
                     <filter invisible="1" string="Late Activities" name="activities_overdue"
-                            domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
-                            help="Show all opportunities for which the next action date is before today"/>
+                        domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
+                        help="Show all opportunities for which the next action date is before today"/>
                     <filter invisible="1" string="Today Activities" name="activities_today"
-                            domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
+                        domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
                     <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
-                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))
-                        ]"/>
+                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
                     <filter string="Exception Activities" name="activities_exception"
                         domain="[('activity_exception_decoration', '!=', False)]"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                     <group expand="0" string="Group By" colspan="16">
                         <filter string="Salesperson" name="salesperson" context="{'group_by':'user_id'}"/>
                         <filter string="Sales Team" name="saleschannel" context="{'group_by':'team_id'}"/>
@@ -828,8 +837,8 @@
                         <separator orientation="vertical" />
                         <filter string="Creation Date" context="{'group_by':'create_date:month'}" name="month"/>
                         <filter string="Conversion Date" name="date_conversion" context="{'group_by': 'date_conversion'}" groups="crm.group_use_lead"/>
+                        <filter string="Expected Closing" name="date_deadline" context="{'group_by':'date_deadline'}"/>
                         <filter string="Closed Date" name="date_closed" context="{'group_by':'date_closed'}"/>
-                        <filter string="Expected Closing Date" name="date_deadline" context="{'group_by':'date_deadline'}"/>
                     </group>
                 </search>
             </field>
@@ -843,8 +852,9 @@
             <field name="model">crm.lost.reason</field>
             <field name="arch" type="xml">
                 <search string="Search Opportunities">
-                    <filter string="Include archived" name="archived"
-                            domain="['|', ('active', '=', True), ('active', '=', False)]"/>
+                    <filter string="Include archived" name="archived" domain="['|', ('active', '=', True), ('active', '=', False)]"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                 </search>
             </field>
         </record>
diff --git a/addons/crm_iap_lead_website/views/crm_reveal_views.xml b/addons/crm_iap_lead_website/views/crm_reveal_views.xml
index 88c43fd3b9d..6683d03ee9c 100644
--- a/addons/crm_iap_lead_website/views/crm_reveal_views.xml
+++ b/addons/crm_iap_lead_website/views/crm_reveal_views.xml
@@ -100,10 +100,23 @@
         </field>
     </record>
 
+    <record id="crm_reveal_rule_view_search" model="ir.ui.view">
+        <field name="name">crm.reveal.rule.view.search</field>
+        <field name="model">crm.reveal.rule</field>
+        <field name="arch" type="xml">
+            <search string="Search CRM Reveal Rule">
+                <field string="Rule" name="name"/>
+                <separator/>
+                <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+            </search>
+        </field>
+    </record>
+
     <record id="crm_reveal_rule_action" model="ir.actions.act_window">
         <field name="name">Visits to Leads Rules</field>
         <field name="res_model">crm.reveal.rule</field>
         <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="crm_reveal_rule_view_search"/>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
                 Create a conversion rule
diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml
index 7efda890e9e..f01e918f9bc 100644
--- a/addons/delivery/views/delivery_view.xml
+++ b/addons/delivery/views/delivery_view.xml
@@ -34,7 +34,8 @@
                 <search string="Delivery Carrier">
                     <field name="name" string="Carrier" />
                     <field name="delivery_type"/>
-                    <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                     <group expand="1" string="Group By">
                         <filter string="Provider" name="provider" context="{'group_by':'delivery_type', 'residual_visible':True}"/>
                     </group>
diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml
index c0b096dbb24..2bb308f6d12 100644
--- a/addons/event/views/event_views.xml
+++ b/addons/event/views/event_views.xml
@@ -382,20 +382,23 @@
             <field name="model">event.event</field>
             <field name="arch" type="xml">
                 <search string="Events">
-                    <field name="name" string="Events"/>
+                    <field name="name" string="Event"/>
+                    <field name="event_type_id"/>
+                    <field name="user_id"/>
                     <filter string="My Events" name="myevents" help="My Events" domain="[('user_id', '=', uid)]"/>
-                    <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction','=',True)]"/>
+                    <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction', '=', True)]"/>
                     <separator/>
-                    <filter name="confirm" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
+                    <filter string="Confirmed" name="confirm" domain="[('state', '=', 'confirm')]" help="Confirmed events"/>
                     <filter string="Unconfirmed" name="draft" domain="[('state', '=', 'draft')]" help="Events in New state"/>
                     <separator/>
                     <filter string="Upcoming/Running" name="upcoming"
-                        domain="['&amp;', ('state', '!=', 'cancel'), ('date_end','&gt;=', datetime.datetime.combine(context_today(), datetime.time(0,0,0)))]" help="Upcoming events from today" />
+                        domain="['&amp;', ('state', '!=', 'cancel'), ('date_end', '&gt;=', datetime.datetime.combine(context_today(), datetime.time(0,0,0)))]" help="Upcoming events from today" />
                     <filter string="Online Events" name="online_events" help="Online Events" domain="[('is_online', '=', True)]"/>
-                    <field name="event_type_id"/>
-                    <field name="user_id"/>
                     <separator/>
-                    <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
+                    <filter string="Start Date" name="start_date" date="date_begin"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+                    <separator/>
                     <filter invisible="1" string="Late Activities" name="activities_overdue"
                         domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
                         help="Show all records which has next action date is before today"/>
@@ -407,9 +410,9 @@
                         domain="[('activity_exception_decoration', '!=', False)]"/>
                     <group expand="0" string="Group By">
                         <filter string="Responsible" name="responsible" context="{'group_by': 'user_id'}"/>
-                        <filter string="Event Category" name="event_type_id" context="{'group_by':'event_type_id'}"/>
-                        <filter string="Status" name="status" context="{'group_by':'state'}"/>
-                        <filter string="Start Date" name="date_begin" domain="[]" context="{'group_by':'date_begin'}"/>
+                        <filter string="Event Category" name="event_type_id" context="{'group_by': 'event_type_id'}"/>
+                        <filter string="Status" name="status" context="{'group_by': 'state'}"/>
+                        <filter string="Start Date" name="date_begin" domain="[]" context="{'group_by': 'date_begin'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/fetchmail/views/fetchmail_views.xml b/addons/fetchmail/views/fetchmail_views.xml
index 8c24f939cd5..811046f2e93 100644
--- a/addons/fetchmail/views/fetchmail_views.xml
+++ b/addons/fetchmail/views/fetchmail_views.xml
@@ -75,10 +75,12 @@
             <field name="arch" type="xml">
                 <search string="Search Incoming Mail Servers">
                     <field name="name" string="Incoming Mail Server"/>
-                    <filter string="IMAP" name="imap" domain="[('server_type','=','imap')]" help="Server type IMAP."/>
-                    <filter string="POP" name="pop" domain="[('server_type','=','pop')]" help="Server type POP."/>
+                    <filter string="IMAP" name="imap" domain="[('server_type', '=', 'imap')]" help="Server type IMAP."/>
+                    <filter string="POP" name="pop" domain="[('server_type', '=', 'pop')]" help="Server type POP."/>
                     <separator/>
-                    <filter string="SSL" name="ssl" domain="[('is_ssl','=',True)]" help="If SSL required."/>
+                    <filter string="SSL" name="ssl" domain="[('is_ssl', '=', True)]" help="If SSL required."/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                 </search>
             </field>
         </record>
diff --git a/addons/fleet/views/fleet_vehicle_cost_views.xml b/addons/fleet/views/fleet_vehicle_cost_views.xml
index 451f340d538..45511641bbe 100644
--- a/addons/fleet/views/fleet_vehicle_cost_views.xml
+++ b/addons/fleet/views/fleet_vehicle_cost_views.xml
@@ -334,26 +334,27 @@
         <field name="model">fleet.vehicle.log.contract</field>
         <field name="arch" type="xml">
             <search string="Vehicles Contracts">
-                <field name="vehicle_id" string="Vehicle" filter_domain="[('vehicle_id.name','ilike', self)]"/>
-                <field name="purchaser_id" string="Driver" filter_domain="[('purchaser_id','child_of', self)]"/>
-                <field name="insurer_id" string="Vendor" filter_domain="[('insurer_id','child_of', self)]"/>
+                <field name="vehicle_id" string="Vehicle" filter_domain="[('vehicle_id.name', 'ilike', self)]"/>
+                <field name="purchaser_id" string="Driver" filter_domain="[('purchaser_id', 'child_of', self)]"/>
+                <field name="insurer_id" string="Vendor" filter_domain="[('insurer_id', 'child_of', self)]"/>
                 <field name="cost_subtype_id" string="Service Type" filter_domain="[('cost_ids.cost_subtype_id', 'ilike', self)]"/>
-                <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
-                <filter string="In Progress" name="open" domain="[('state', 'in', ['open','diesoon'])]"/>
+                <filter string="In Progress" name="open" domain="[('state', 'in', ['open', 'diesoon'])]"/>
                 <filter string="Expired" name="expired" domain="[('state', '=', 'expired')]"/>
                 <filter string="Expiring Soon" name="expire_soon" domain="[('state', '=', 'diesoon')]"/>
+                <separator/>
+                <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+                <separator/>
                 <filter invisible="1" string="Late Activities" name="activities_overdue"
                     domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
                     help="Show all records which has next action date is before today"/>
                 <filter invisible="1" string="Today Activities" name="activities_today"
                     domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
                 <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
-                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))
-                        ]"/>
+                    domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
                 <filter string="Exception Activities" name="activities_exception"
-                        domain="[('activity_exception_decoration', '!=', False)]"/>
+                    domain="[('activity_exception_decoration', '!=', False)]"/>
                 <group expand="0" string="Group By">
-                    <filter string="Vehicle" name="vehicle" context="{'group_by':'vehicle_id'}"/>
+                    <filter string="Vehicle" name="vehicle" context="{'group_by': 'vehicle_id'}"/>
                 </group>
             </search>
         </field>
diff --git a/addons/fleet/views/fleet_vehicle_views.xml b/addons/fleet/views/fleet_vehicle_views.xml
index d0f175358d3..ee8ead77a26 100644
--- a/addons/fleet/views/fleet_vehicle_views.xml
+++ b/addons/fleet/views/fleet_vehicle_views.xml
@@ -166,34 +166,34 @@
         <field name="model">fleet.vehicle</field>
         <field name="arch" type="xml">
             <search string="All vehicles">
-                <field name="name" filter_domain="['|', ('name','ilike',self), ('license_plate','ilike',self)]" string="Vehicle"/>
-                <field name="log_drivers" filter_domain="[('log_drivers.driver_id.name', 'ilike', self)]" string="Drivers History"/>
-                <field name="driver_id"/>
+                <field string="Vehicle" name="name" filter_domain="['|', ('name', 'ilike', self), ('license_plate', 'ilike', self)]"/>
+                <field string="Drivers" name="log_drivers" filter_domain="[('log_drivers.driver_id.name', 'ilike', self)]"/>
+                <field string="Current Driver" name="driver_id"/>
                 <field name="future_driver_id"/>
                 <field name="tag_ids"/>
                 <field name="location"/>
-                <field name="state_id"/>
-                <filter name="available" string="Is Available"
+                <field string="Status" name="state_id"/>
+                <filter string="Available" name="available"
                     domain="['&amp;', ('future_driver_id', '=', False), '|', ('driver_id', '=', False), ('plan_to_change_car', '=', True)]"/>
                 <filter name="planned" string="Planned for Change" domain="[('plan_to_change_car', '=', True)]"/>
                 <separator/>
-                <filter name="alert_true" domain="['|',('contract_renewal_due_soon','=',True),('contract_renewal_overdue','=',True)]" string="Has Alert(s)"/>
+                <filter string="Need Action" name="alert_true" domain="['|', ('contract_renewal_due_soon', '=', True), ('contract_renewal_overdue', '=', True)]"/>
+                <separator/>
+                <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                 <separator/>
-                <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
                 <filter invisible="1" string="Late Activities" name="activities_overdue"
                     domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
                     help="Show all records which has next action date is before today"/>
                 <filter invisible="1" string="Today Activities" name="activities_today"
                     domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
                 <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
-                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))
-                        ]"/>
+                    domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
                 <filter string="Exception Activities" name="activities_exception"
-                        domain="[('activity_exception_decoration', '!=', False)]"/>
+                    domain="[('activity_exception_decoration', '!=', False)]"/>
                 <group expand="1" string="Group By">
-                    <filter name="groupby_status" context="{'group_by' : 'state_id'}" string="Status"/>
-                    <filter name="groupby_model" context="{'group_by' : 'model_id'}" string="Model"/>
-                    <filter name="groupby_make" context="{'group_by' : 'brand_id'}" string="Make"/>
+                    <filter string="Status" name="groupby_status" context="{'group_by': 'state_id'}"/>
+                    <filter string="Model" name="groupby_model" context="{'group_by': 'model_id'}"/>
+                    <filter string="Brand" name="groupby_make" context="{'group_by': 'brand_id'}"/>
                 </group>
            </search>
         </field>
@@ -369,12 +369,12 @@
         <field name="model">fleet.vehicle.odometer</field>
         <field name="arch" type="xml">
             <search string="Vehicles odometers" >
-                <field name="vehicle_id" />
+                <field name="vehicle_id"/>
+                <field name="driver_id"/>
                 <field name="value"/>
-                <field name="unit"/>
                 <field name="date"/>
                 <group expand="0" string="Group By">
-                    <filter name="groupby_vehicle" context="{'group_by' : 'vehicle_id'}" string="Vehicle"/>
+                    <filter name="groupby_vehicle" context="{'group_by': 'vehicle_id'}" string="Vehicle"/>
                 </group>
             </search>
         </field>
diff --git a/addons/gamification/views/badge.xml b/addons/gamification/views/badge.xml
index 6b16b9e7417..804b314f817 100644
--- a/addons/gamification/views/badge.xml
+++ b/addons/gamification/views/badge.xml
@@ -1,9 +1,22 @@
 <odoo>
     <!-- Badge views -->
+    <record id="gamification_badge_view_search" model="ir.ui.view">
+        <field name="name">gamification.badge.view.search</field>
+        <field name="model">gamification.badge</field>
+        <field name="arch" type="xml">
+            <search string="Search Badge">
+                <field name="name"/>
+                <separator/>
+                <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+            </search>
+        </field>
+    </record>
+
     <record id="badge_list_action" model="ir.actions.act_window">
         <field name="name">Badges</field>
         <field name="res_model">gamification.badge</field>
         <field name="view_mode">kanban,tree,form</field>
+        <field name="search_view_id" ref="gamification_badge_view_search"/>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
                 Create a new badge
@@ -15,6 +28,7 @@
         </field>
     </record>
 
+    
     <record id="badge_list_view" model="ir.ui.view">
         <field name="name">Badge List</field>
         <field name="model">gamification.badge</field>
diff --git a/addons/google_drive/views/google_drive_views.xml b/addons/google_drive/views/google_drive_views.xml
index fd96658acd2..2790bfff9a7 100644
--- a/addons/google_drive/views/google_drive_views.xml
+++ b/addons/google_drive/views/google_drive_views.xml
@@ -83,12 +83,25 @@
             </field>
         </record>
 
+        <record id="google_drive_config_view_search" model="ir.ui.view">
+            <field name="name">google.drive.config.view.search</field>
+            <field name="model">google.drive.config</field>
+            <field name="arch" type="xml">
+                <search string="Search Google Drive Config">
+                    <field name="name"/>
+                    <separator/>
+                    <filter name="archived" string="Archived" domain="[('active', '=', False)]"/>
+                </search>
+            </field>
+        </record>
+
         <record id='action_google_drive_users_config' model='ir.actions.act_window'>
             <field name='name'>Templates</field>
             <field name='res_model'>google.drive.config</field>
             <field name='type'>ir.actions.act_window</field>
             <field name="view_mode">tree,kanban,form</field>
-            <field name='view_id' ref='view_google_drive_config_tree' />
+            <field name='view_id' ref='view_google_drive_config_tree'/>
+            <field name="search_view_id" ref="google_drive_config_view_search"/>
             <field name="help" type="html">
                 <p class="o_view_nocontent_smiling_face">
                     Add a new template
diff --git a/addons/hr/views/hr_employee_public_views.xml b/addons/hr/views/hr_employee_public_views.xml
index 139f237bd47..bebbe6df9a4 100644
--- a/addons/hr/views/hr_employee_public_views.xml
+++ b/addons/hr/views/hr_employee_public_views.xml
@@ -11,6 +11,8 @@
                     <field name="job_title" string="Job Title"/>
                     <field name="department_id" string="Department"/>
                     <field name="company_id" string="Company"/>
+                    <separator/>
+                    <filter name="archived" string="Archived" domain="[('active', '=', False)]"/>
                     <group expand="0" string="Group By">
                         <filter name="group_manager" string="Manager" domain="[]" context="{'group_by':'parent_id'}"/>
                         <filter name="group_department" string="Department" domain="[]" context="{'group_by':'department_id'}"/>
diff --git a/addons/hr/views/hr_employee_views.xml b/addons/hr/views/hr_employee_views.xml
index 7a088421ae3..c672daa66ea 100644
--- a/addons/hr/views/hr_employee_views.xml
+++ b/addons/hr/views/hr_employee_views.xml
@@ -7,14 +7,14 @@
             <field name="model">hr.employee</field>
             <field name="arch" type="xml">
                 <search string="Employees">
-                    <field name="name" string="Employees" filter_domain="['|',('work_email','ilike',self),('name','ilike',self)]"/>
-                    <field name="department_id" operator="child_of"/>
-                    <field name="category_ids" groups="hr.group_hr_manager"/>
-                    <field name="job_title" />
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
+                    <field name="name" string="Employee" filter_domain="['|', ('work_email', 'ilike', self), ('name', 'ilike', self)]"/>
+                    <field name="category_ids" groups="hr.group_hr_user"/>
+                    <field name="job_id"/>
                     <separator/>
                     <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction', '=', True)]"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+                    <separator/>
                     <filter invisible="1" string="Late Activities" name="activities_overdue"
                         domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"/>
                     <filter invisible="1" string="Today Activities" name="activities_today"
@@ -22,11 +22,9 @@
                     <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
                         domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
                     <group expand="0" string="Group By">
-                        <filter name="group_manager" string="Manager" domain="[]" context="{'group_by':'parent_id'}"/>
-                        <filter name="group_coach" string="Coach" domain="[]" context="{'group_by':'coach_id'}"/>
-                        <filter name="group_department" string="Department" domain="[]" context="{'group_by':'department_id'}"/>
-                        <filter name="group_job" string="Job" domain="[]" context="{'group_by':'job_id'}"/>
-                        <filter name="group_company" string="Company" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter name="group_manager" string="Manager" domain="[]" context="{'group_by': 'parent_id'}"/>
+                        <filter name="group_department" string="Department" domain="[]" context="{'group_by': 'department_id'}"/>
+                        <filter name="group_job" string="Job" domain="[]" context="{'group_by': 'job_id'}"/>
                     </group>
                     <searchpanel>
                         <field name="company_id" groups="base.group_multi_company" icon="fa-building"/>
diff --git a/addons/hr/views/hr_job_views.xml b/addons/hr/views/hr_job_views.xml
index 5d89c225606..838f4b2b04f 100644
--- a/addons/hr/views/hr_job_views.xml
+++ b/addons/hr/views/hr_job_views.xml
@@ -89,16 +89,16 @@
             <field name="model">hr.job</field>
             <field name="arch" type="xml">
                 <search string="Jobs">
-                    <field name="name" string="Job"/>
-                    <filter domain="[('state','=','open')]" name="in_position" string="In Position"/>
-                    <filter domain="[('state','=','recruit')]" string="In Recruitment" name="in_recruitment"/>
+                    <field name="name" string="Job Position"/>
                     <field name="department_id" operator="child_of"/>
+                    <filter name="in_position" string="In Position" domain="[('state', '=', 'open')]"/>
+                    <filter name="in_recruitment" string="In Recruitment" domain="[('state', '=', 'recruit')]"/>
                     <separator/>
-                    <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction','=',True)]"/>
+                    <filter name="message_needaction" string="Unread Messages" domain="[('message_needaction', '=', True)]"/>
                     <group expand="0" string="Group By">
-                        <filter string="Department" name="department" domain="[]" context="{'group_by':'department_id'}"/>
-                        <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Company" name="company" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Department" name="department" domain="[]" context="{'group_by': 'department_id'}"/>
+                        <filter string="Status" name="status" domain="[]" context="{'group_by': 'state'}"/>
+                        <filter string="Company" name="company" domain="[]" context="{'group_by': 'company_id'}" groups="base.group_multi_company"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/hr/views/hr_plan_views.xml b/addons/hr/views/hr_plan_views.xml
index f94a7e39195..15647929b11 100644
--- a/addons/hr/views/hr_plan_views.xml
+++ b/addons/hr/views/hr_plan_views.xml
@@ -8,6 +8,8 @@
             <field name="arch" type="xml">
                 <search string="Plan">
                     <field name="name"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                 </search>
             </field>
         </record>
diff --git a/addons/hr_attendance/views/hr_attendance_view.xml b/addons/hr_attendance/views/hr_attendance_view.xml
index 0d973f92243..5443b969ce9 100644
--- a/addons/hr_attendance/views/hr_attendance_view.xml
+++ b/addons/hr_attendance/views/hr_attendance_view.xml
@@ -71,13 +71,12 @@
                 <field name="department_id" operator="child_of"/>
                 <filter string="My Attendances" name="myattendances" domain="[('employee_id.user_id.id', '=', uid)]" />
                 <separator/>
-                <filter name="check_in_filter" string="Check In Date" date="check_in" default_period="last_month"/>
+                <filter string="Check In" name="check_in_filter" date="check_in" default_period="last_month"/>
                 <filter string="No Check Out" name="nocheckout" domain="[('check_out', '=', False)]" />
                 <group expand="0" string="Group By">
-                    <filter name="employee" string="Employee" context="{'group_by':'employee_id'}"/>
-                    <separator/>
-                    <filter name="groupby_name" string="Check In Date" context="{'group_by': 'check_in'}"/>
-                    <filter name="groupby_check_out" string="Check Out Date" context="{'group_by': 'check_out'}"/>
+                    <filter string="Employee" name="employee" context="{'group_by': 'employee_id'}"/>
+                    <filter string="Check In" name="groupby_name" context="{'group_by': 'check_in'}"/>
+                    <filter string="Check Out" name="groupby_check_out" context="{'group_by': 'check_out'}"/>
                 </group>
             </search>
         </field>
diff --git a/addons/hr_attendance/views/hr_employee_view.xml b/addons/hr_attendance/views/hr_employee_view.xml
index 65a68bc63c9..665a8ed0a98 100644
--- a/addons/hr_attendance/views/hr_employee_view.xml
+++ b/addons/hr_attendance/views/hr_employee_view.xml
@@ -110,20 +110,6 @@
         </field>
     </record>
 
-     <!--Inherit employee search view -->
-    <record id="view_employee_filter_inherit_hr_attendance" model="ir.ui.view">
-        <field name="name">hr.employee.filter.inherit.attendance</field>
-        <field name="model">hr.employee</field>
-        <field name="inherit_id" ref="hr.view_employee_filter"/>
-        <field name="arch" type="xml">
-            <xpath expr="//filter[@name='inactive']" position="before">
-                <filter string="Signed In" name="signed_in" domain="[('last_attendance_id.check_out', '=', False)]"/>
-                <filter string="Signed Out" name="signed_out" domain="['|', ('last_attendance_id', '=', False), ('last_attendance_id.check_out', '!=', False)]"/>
-                <separator/>
-            </xpath>
-        </field>
-    </record>
-
     <!-- employee kanban view specifically for hr_attendance (to check in/out) -->
     <record id="hr_employees_view_kanban" model="ir.ui.view">
         <field name="name">hr.employee.kanban</field>
diff --git a/addons/hr_contract/views/hr_contract_views.xml b/addons/hr_contract/views/hr_contract_views.xml
index d6cb731b628..5ab887b44d0 100644
--- a/addons/hr_contract/views/hr_contract_views.xml
+++ b/addons/hr_contract/views/hr_contract_views.xml
@@ -94,25 +94,24 @@
             <field name="model">hr.contract</field>
             <field name="arch" type="xml">
                 <search string="Search Contract">
-                    <field name="name" string="Contracts"/>
+                    <field name="name" string="Contract"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
-                    <field name="resource_calendar_id"/>
                     <field name="employee_id"/>
+                    <field name="job_id"/>
                     <field name="department_id" operator="child_of"/>
-                    <field name="state"/>
+                    <field name="resource_calendar_id"/>
                     <filter string="Running" name="running" domain="[('state', '=', 'open')]"/>
-                    <filter string="To Renew / Expires Soon" name="to_renew" domain="['&amp;', ('state', '=', 'open'), ('kanban_state', '=', 'blocked')]"/>
+                    <filter string="Need Action" name="to_renew" domain="['&amp;', ('state', '=', 'open'), ('kanban_state', '=', 'blocked')]"/>
                     <separator />
-                    <filter string="Current Employee" name="current_employee" domain="[('employee_id.active','=',True)]"/>
+                    <filter string="Employed" name="current_employee" domain="[('employee_id.active', '=', True)]"/>
                     <separator/>
                     <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                     <separator/>
-                    <filter string="Important Messages" name="message_needaction" domain="[('message_needaction','=',True)]"/>
                     <group expand="0" string="Group By">
-                        <filter string="Employee" name="employee" domain="[]" context="{'group_by':'employee_id'}"/>
-                        <filter string="Job" name="job" domain="[]" context="{'group_by':'job_id'}"/>
-                        <filter string="State" name='group_by_state' domain="[]" context="{'group_by': 'state'}"/>
+                        <filter string="Employee" name="employee" domain="[]" context="{'group_by': 'employee_id'}"/>
+                        <filter string="Job Position" name="job" domain="[]" context="{'group_by': 'job_id'}"/>
+                        <filter string="Status" name='group_by_state' domain="[]" context="{'group_by': 'state'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml
index e72faf0c602..8bea970b848 100644
--- a/addons/hr_expense/views/hr_expense_views.xml
+++ b/addons/hr_expense/views/hr_expense_views.xml
@@ -201,43 +201,41 @@
             </field>
         </record>
 
-        <record id="view_hr_expense_filter" model="ir.ui.view">
-            <field name="name">hr.expense.filter</field>
+        <record id="hr_expense_view_search" model="ir.ui.view">
+            <field name="name">hr.expense.view.search</field>
             <field name="model">hr.expense</field>
             <field name="arch" type="xml">
                 <search string="Expense">
-                    <field name="name" string="Expenses" filter_domain="['|',('employee_id','ilike',self),('name','ilike',self)]"/>
+                    <field string="Expense" name="name" filter_domain="['|', '|', ('employee_id', 'ilike', self), ('name', 'ilike', self), ('product_id', 'ilike', self)]"/>
                     <field name="date"/>
                     <field name="employee_id"/>
-                    <field name="product_id"/>
                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
-                    <filter string="My Team Expenses" name="my_team_expenses" domain="[('employee_id.parent_id.user_id', '=', uid)]" groups="hr_expense.group_hr_expense_team_approver" help="Expenses of Your Team Member"/>
                     <filter string="My Expenses" name="my_expenses" domain="[('employee_id.user_id', '=', uid)]"/>
+                    <filter string="My Team" name="my_team_expenses" domain="[('employee_id.parent_id.user_id', '=', uid)]" groups="hr_expense.group_hr_expense_team_approver" help="Expenses of Your Team Member"/>
                     <separator />
-                    <filter domain="[('sheet_id', '=', False)]" string="To report" name="no_report"/>
-                    <filter domain="[('sheet_id', '!=', False)]" string="Reported" name="submitted" help="Confirmed Expenses"/>
-                    <filter domain="[('state', '=', 'refused')]" string="Refused" name="refused" help="Refused Expenses"/>
-                    <filter domain="['|', ('state', '=', 'approved'), ('state', '=', 'done')]" string="Approved" name="approved" help="Actual expense sheets, not the refused ones"/>
+                    <filter string="To Report" name="no_report" domain="[('sheet_id', '=', False)]"/>
+                    <filter string="Refused" name="refused" domain="[('state', '=', 'refused')]" help="Refused Expenses"/>
                     <separator />
-                    <filter domain="[('employee_id.active', '=', False)]" string="Former Employees" name="inactive" groups="hr_expense.group_hr_expense_user,hr_expense.group_hr_expense_manager"/>
+                    <filter string="Date" name="date" date="date"/>
+                    <separator />
+                    <filter string="Former Employees" name="inactive" domain="[('employee_id.active', '=', False)]" groups="hr_expense.group_hr_expense_user,hr_expense.group_hr_expense_manager"/>
+                    <separator/>
                     <filter invisible="1" string="Late Activities" name="activities_overdue"
                         domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
                         help="Show all records which has next action date is before today"/>
                     <filter invisible="1" string="Today Activities" name="activities_today"
                         domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
                     <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
-                            domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))
-                            ]"/>
+                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
                     <filter string="Exception Activities" name="activities_exception"
                         domain="[('activity_exception_decoration', '!=', False)]"/>
                     <group expand="0" string="Group By">
-                        <filter string="Report" name="report" domain="[]" context="{'group_by': 'sheet_id'}"/>
                         <filter string="Employee" name="employee" domain="[]" context="{'group_by': 'employee_id'}"/>
-                        <filter string="Company" name="company" domain="[]" context="{'group_by': 'company_id'}" groups="base.group_multi_company"/>
                         <filter string="Product" name="product" domain="[]" context="{'group_by': 'product_id'}"/>
                         <filter string="Analytic Account" name="analyticacc" domain="[]" context="{'group_by': 'analytic_account_id'}" groups="analytic.group_analytic_accounting"/>
-                        <filter string="Date" name="expensesmonth" domain="[]" context="{'group_by': 'date'}" help="Expense Date"/>
                         <filter string="Status" name="status" domain="[]" context="{'group_by': 'state'}"/>
+                        <filter string="Date" name="expensesmonth" domain="[]" context="{'group_by': 'date'}" help="Expense Date"/>
+                        <filter string="Company" name="company" domain="[]" context="{'group_by': 'company_id'}" groups="base.group_multi_company"/>
                     </group>
                 </search>
             </field>
@@ -267,7 +265,7 @@
             <field name="name">All Expenses</field>
             <field name="res_model">hr.expense</field>
             <field name="view_mode">graph,pivot,tree,kanban,form,activity</field>
-            <field name="search_view_id" ref="view_hr_expense_filter"/>
+            <field name="search_view_id" ref="hr_expense_view_search"/>
             <field name="help" type="html">
               <p class="o_view_nocontent_smiling_face">
                 Create a new expense
@@ -279,7 +277,7 @@
             <field name="name">My Expenses</field>
             <field name="res_model">hr.expense</field>
             <field name="view_mode">tree,kanban,form,graph,pivot,activity</field>
-            <field name="search_view_id" ref="view_hr_expense_filter"/>
+            <field name="search_view_id" ref="hr_expense_view_search"/>
             <field name="context">{'search_default_my_expenses': 1, 'search_default_no_report': 1}</field>
             <field name="help" type="html">
               <p class="o_view_nocontent_smiling_face">
@@ -613,22 +611,20 @@
         </record>
 
 
-        <record id="view_hr_expense_sheet_filter" model="ir.ui.view">
-            <field name="name">hr.expense.sheet.filter</field>
+        <record id="hr_expense_sheet_view_search" model="ir.ui.view">
+            <field name="name">hr.expense.sheet.view.search</field>
             <field name="model">hr.expense.sheet</field>
             <field name="arch" type="xml">
                 <search string="Expense">
-                    <field name="name" string="Expenses"/>
+                    <field string="Expense Report" name="name"/>
                     <field name="accounting_date"/>
-                    <field name="state"/>
                     <separator />
                     <field name="employee_id"/>
-                    <field name="department_id" operator="child_of" string="Department"/>
-                    <field name="journal_id"/>
+                    <field string="Department" name="department_id" operator="child_of"/>
+                    <field string="Journal" name="journal_id"/>
                     <filter string="My Reports" name="my_reports" domain="[('employee_id.user_id', '=', uid)]"/>
-                    <filter string="My Team Reports" name="my_team_reports" domain="[('employee_id.parent_id.user_id', '=', uid)]" groups="hr_expense.group_hr_expense_manager" help="Expenses of Your Team Member"/>
+                    <filter string="My Team" name="my_team_reports" domain="[('employee_id.parent_id.user_id', '=', uid)]" groups="hr_expense.group_hr_expense_manager" help="Expenses of Your Team Member"/>
                     <separator />
-                    <filter domain="[('state', '=', 'draft')]" string="Draft" name="draft" help="Expenses in Draft"/>
                     <filter domain="[('state', '=', 'submit')]" string="To Approve" name="submitted" help="Confirmed Expenses"/>
                     <filter domain="[('state', '=', 'approve')]" string="To Post" name="to_post" help="Approved Expenses"/>
                     <filter domain="['|', ('state', '=', 'approve'), ('state', '=', 'post')]" string="To Pay" name="approved" help="Expenses to Invoice"/>
@@ -650,7 +646,7 @@
                         <filter string="Department" name="department" domain="[]" context="{'group_by': 'department_id'}"/>
                         <filter string="Company" name="company" domain="[]" context="{'group_by': 'company_id'}" groups="base.group_multi_company"/>
                         <filter string="Date" name="expenses_month" domain="[]" context="{'group_by': 'accounting_date'}" help="Expenses by Date"/>
-                        <filter string="State" domain="[]" context="{'group_by': 'state'}" name="state"/>
+                        <filter string="Status" domain="[]" context="{'group_by': 'state'}" name="state"/>
                     </group>
                 </search>
             </field>
@@ -681,7 +677,7 @@
             <field name="name">My Expense Reports</field>
             <field name="res_model">hr.expense.sheet</field>
             <field name="view_mode">tree,kanban,form,pivot,graph,activity</field>
-            <field name="search_view_id" ref="view_hr_expense_sheet_filter"/>
+            <field name="search_view_id" ref="hr_expense_sheet_view_search"/>
             <field name="domain">[('employee_id.user_id', '=', uid), ('state', '!=', 'cancel')]</field>
             <field name="context">{'search_default_my_reports': 1}</field>
             <field name="help" type="html">
@@ -697,7 +693,7 @@
             <field name="name">Expense Reports to Approve</field>
             <field name="res_model">hr.expense.sheet</field>
             <field name="view_mode">tree,kanban,form,pivot,graph,activity</field>
-            <field name="search_view_id" ref="view_hr_expense_sheet_filter"/>
+            <field name="search_view_id" ref="hr_expense_sheet_view_search"/>
             <field name="domain">[]</field>
             <field name="context">{'search_default_submitted': 1}</field>
             <field name="help" type="html">
@@ -711,7 +707,7 @@
             <field name="name">Expense Reports To Post</field>
             <field name="res_model">hr.expense.sheet</field>
             <field name="view_mode">tree,kanban,form,pivot,graph</field>
-            <field name="search_view_id" ref="view_hr_expense_sheet_filter"/>
+            <field name="search_view_id" ref="hr_expense_sheet_view_search"/>
             <field name="domain">[]</field>
             <field name="context">{'search_default_to_post': 1}</field>
             <field name="help" type="html">
@@ -727,7 +723,7 @@
             <field name="name">Expense Reports To Pay</field>
             <field name="res_model">hr.expense.sheet</field>
             <field name="view_mode">tree,kanban,form,pivot,graph</field>
-            <field name="search_view_id" ref="view_hr_expense_sheet_filter"/>
+            <field name="search_view_id" ref="hr_expense_sheet_view_search"/>
             <field name="domain">[]</field>
             <field name="context">{'search_default_approved': 1}</field>
             <field name="help" type="html">
@@ -743,7 +739,7 @@
             <field name="name">All Expense Reports</field>
             <field name="res_model">hr.expense.sheet</field>
             <field name="view_mode">graph,pivot,tree,kanban,form</field>
-            <field name="search_view_id" ref="view_hr_expense_sheet_filter"/>
+            <field name="search_view_id" ref="hr_expense_sheet_view_search"/>
             <field name="domain">[]</field>
             <field name="context">{}</field>
             <field name="help" type="html">
@@ -760,7 +756,7 @@
             <field name="res_model">hr.expense.sheet</field>
             <field name="view_mode">tree,kanban,form,pivot,graph</field>
             <field name="context">{'search_default_submitted': 1}</field>
-            <field name="search_view_id" ref="view_hr_expense_sheet_filter"/>
+            <field name="search_view_id" ref="hr_expense_sheet_view_search"/>
             <field name="view_id" ref="view_hr_expense_sheet_tree"/>
             <field name="help" type="html">
               <p class="o_view_nocontent_smiling_face">
@@ -776,7 +772,7 @@
             <field name="res_model">hr.expense.sheet</field>
             <field name="view_mode">tree,kanban,form,pivot,graph</field>
             <field name="context">{'search_default_to_post': 1}</field>
-            <field name="search_view_id" ref="view_hr_expense_sheet_filter"/>
+            <field name="search_view_id" ref="hr_expense_sheet_view_search"/>
             <field name="view_id" ref="view_hr_expense_sheet_tree"/>
             <field name="help" type="html">
               <p class="o_view_nocontent_smiling_face">
@@ -792,7 +788,7 @@
             <field name="res_model">hr.expense.sheet</field>
             <field name="view_mode">tree,kanban,form,pivot,graph</field>
             <field name="context">{'search_default_approved': 1}</field>
-            <field name="search_view_id" ref="view_hr_expense_sheet_filter"/>
+            <field name="search_view_id" ref="hr_expense_sheet_view_search"/>
             <field name="view_id" ref="view_hr_expense_sheet_tree"/>
             <field name="help" type="html">
               <p class="o_view_nocontent_smiling_face">
@@ -807,7 +803,7 @@
             <field name="name">Expense Reports to Approve</field>
             <field name="res_model">hr.expense.sheet</field>
             <field name="view_mode">tree,kanban,form,pivot,graph</field>
-            <field name="search_view_id" ref="view_hr_expense_sheet_filter"/>
+            <field name="search_view_id" ref="hr_expense_sheet_view_search"/>
             <field name="context">{
                 'search_default_submitted': 1,
                 'search_default_department_id': [active_id],
diff --git a/addons/hr_holidays/views/hr_views.xml b/addons/hr_holidays/views/hr_views.xml
index 1b0048e0878..253d21df7f9 100644
--- a/addons/hr_holidays/views/hr_views.xml
+++ b/addons/hr_holidays/views/hr_views.xml
@@ -102,7 +102,7 @@
         <field name="model">hr.employee</field>
         <field name="inherit_id" ref="hr.view_employee_filter"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='department_id']" position="after">
+            <xpath expr="//field[@name='job_id']" position="after">
                 <filter name="is_absent" string="Absent Today" domain="[('is_absent', '=', True)]"/>
             </xpath>
         </field>
diff --git a/addons/hr_maintenance/models/equipment.py b/addons/hr_maintenance/models/equipment.py
index a9dce11960e..4818a8cab6b 100644
--- a/addons/hr_maintenance/models/equipment.py
+++ b/addons/hr_maintenance/models/equipment.py
@@ -6,8 +6,8 @@ from odoo import api, fields, models, tools
 class MaintenanceEquipment(models.Model):
     _inherit = 'maintenance.equipment'
 
-    employee_id = fields.Many2one('hr.employee', string='Assigned to Employee', tracking=True)
-    department_id = fields.Many2one('hr.department', string='Assigned to Department', tracking=True)
+    employee_id = fields.Many2one('hr.employee', string='Assigned Employee', tracking=True)
+    department_id = fields.Many2one('hr.department', string='Assigned Department', tracking=True)
     equipment_assign_to = fields.Selection(
         [('department', 'Department'), ('employee', 'Employee'), ('other', 'Other')],
         string='Used By',
diff --git a/addons/hr_maintenance/views/maintenance_views.xml b/addons/hr_maintenance/views/maintenance_views.xml
index 68043e17aed..806a8fa85b9 100644
--- a/addons/hr_maintenance/views/maintenance_views.xml
+++ b/addons/hr_maintenance/views/maintenance_views.xml
@@ -10,8 +10,8 @@
             <xpath expr="field[@name='user_id']" position="after">
                 <field name="employee_id"/>
             </xpath>
-            <xpath expr="//filter[@name='my_requests']" position="replace">
-                <filter string="My Requests" name="my_requests" domain="['|', ('employee_id.user_id', '=', uid), ('department_id.manager_id.user_id', '=', uid)]"/>
+            <xpath expr="//filter[@name='my_maintenances']" position="replace">
+                <filter string="My Maintenances" name="my_maintenances" domain="['|', ('employee_id.user_id', '=', uid), ('department_id.manager_id.user_id', '=', uid)]"/>
             </xpath>
             <xpath expr="//filter[@name='created_by']" position="replace">
                 <filter string='Created By' name='created_by' domain="[]" context="{'group_by': 'employee_id'}"/>
diff --git a/addons/hr_recruitment/views/hr_job_views.xml b/addons/hr_recruitment/views/hr_job_views.xml
index b0023e06adf..462df73223c 100644
--- a/addons/hr_recruitment/views/hr_job_views.xml
+++ b/addons/hr_recruitment/views/hr_job_views.xml
@@ -99,7 +99,7 @@
         <field name="model">hr.job</field>
         <field name="inherit_id" ref="hr.view_job_filter" />
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='name']" position="after">
+            <xpath expr="//field[@name='department_id']" position="after">
                 <filter string="My Job Positions" name="my_positions" domain="[('user_id', '=', uid)]"/>
             </xpath>
             <xpath expr="//group" position="after">
diff --git a/addons/hr_recruitment/views/hr_recruitment_views.xml b/addons/hr_recruitment/views/hr_recruitment_views.xml
index 1697e9f2490..0db6020aa0b 100644
--- a/addons/hr_recruitment/views/hr_recruitment_views.xml
+++ b/addons/hr_recruitment/views/hr_recruitment_views.xml
@@ -185,25 +185,31 @@
         </field>
     </record>
 
-    <record id="view_crm_case_jobs_filter" model="ir.ui.view">
+    <record id="hr_applicant_view_search_bis" model="ir.ui.view">
         <field name="name">hr.applicant.view.search</field>
         <field name="model">hr.applicant</field>
         <field name="arch" type="xml">
             <search string="Search Applicants">
-                <field name="partner_name" filter_domain="['|', ('name', 'ilike', self), ('partner_name', 'ilike', self)]" string="Subject / Applicant"/>
-                <field name="email_from" filter_domain="[('email_from', 'ilike', self)]" string="Email"/>
-                <filter string="My Applications" name="my_applications" domain="[('user_id', '=', uid)]"/>
-                <filter string="Unassigned" name="unassigned" domain="[('user_id', '=', False)]"/>
-                <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction','=',True)]"/>
-                <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
+                <field string="Applicant" name="partner_name"
+                    filter_domain="['|', '|', ('name', 'ilike', self), ('partner_name', 'ilike', self), ('email_from', 'ilike', self)]"/>
+                <field string="Email" name="email_from" filter_domain="[('email_from', 'ilike', self)]"/>
                 <field name="job_id"/>
                 <field name="department_id" operator="child_of"/>
                 <field name="user_id"/>
                 <field name="stage_id" domain="[]"/>
+                <field name="categ_ids"/>
+                <field name="attachment_ids" filter_domain="[('attachment_ids.index_content', 'ilike', self)]" string="Attachments"/>
+                <filter string="My Applications" name="my_applications" domain="[('user_id', '=', uid)]"/>
+                <filter string="Unassigned" name="unassigned" domain="[('user_id', '=', False)]"/>
                 <separator/>
                 <filter string="Ready for Next Stage" name="done" domain="[('kanban_state', '=', 'done')]"/>
                 <filter string="Blocked" name="blocked" domain="[('kanban_state', '=', 'blocked')]"/>
-                <filter string="In progress" name="in_progress" domain="[('kanban_state', '=', 'normal')]"/>
+                <separator/>
+                <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction', '=', True)]"/>
+                <separator/>
+                <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+                <separator/>
+                <filter string="My Activities" name="activities_my" domain="[('activity_ids.user_id', '=', uid)]"/>
                 <separator/>
                 <filter invisible="1" string="Late Activities" name="activities_overdue"
                     domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
@@ -211,20 +217,17 @@
                 <filter invisible="1" string="Today Activities" name="activities_today"
                     domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
                 <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
-                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))
-                        ]"/>
+                    domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
                 <filter string="Exception Activities" name="activities_exception"
-                        domain="[('activity_exception_decoration', '!=', False)]"/>
-                <field name="categ_ids"/>
-                <field name="attachment_ids" filter_domain="[('attachment_ids.index_content', 'ilike', self)]" string="Attachments"/>
+                    domain="[('activity_exception_decoration', '!=', False)]"/>
                 <separator/>
                 <group expand="0" string="Group By">
-                    <filter string="Responsible" name="responsible" domain="[]"  context="{'group_by':'user_id'}"/>
-                    <filter string="Job" name="job" domain="[]" context="{'group_by':'job_id'}"/>
-                    <filter string="Degree" name="degree" domain="[]" context="{'group_by':'type_id'}"/>
-                    <filter string="Stage" name="stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                    <filter string="Creation Date" name="creation_date" context="{'group_by':'create_date'}"/>
-                    <filter string="Last Stage Update" name="last_stage_update" context="{'group_by':'date_last_stage_update'}"/>
+                    <filter string="Responsible" name="responsible" domain="[]"  context="{'group_by': 'user_id'}"/>
+                    <filter string="Job" name="job" domain="[]" context="{'group_by': 'job_id'}"/>
+                    <filter string="Degree" name="degree" domain="[]" context="{'group_by': 'type_id'}"/>
+                    <filter string="Stage" name="stage" domain="[]" context="{'group_by': 'stage_id'}"/>
+                    <filter string="Creation Date" name="creation_date" context="{'group_by': 'create_date'}"/>
+                    <filter string="Last Stage Update" name="last_stage_update" context="{'group_by': 'date_last_stage_update'}"/>
                 </group>
            </search>
         </field>
@@ -369,7 +372,7 @@
         <field name="name">Applications</field>
         <field name="res_model">hr.applicant</field>
         <field name="view_mode">kanban,tree,form,graph,calendar,pivot</field>
-        <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
+        <field name="search_view_id" ref="hr_applicant_view_search_bis"/>
         <field name="context">{'search_default_job_id': [active_id], 'default_job_id': active_id}</field>
         <field name="help" type="html">
               <p class="o_view_nocontent_empty_folder">
@@ -406,12 +409,9 @@
         <field name="model">hr.job</field>
         <field name="inherit_id" ref="hr.view_job_filter"/>
         <field name="arch" type="xml">
-            <field name="department_id" positon="after">
-                <separator/>
-                <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction','=',True)]"/>
-            </field>
             <xpath expr="//filter[@name='in_position']" position="before">
-                <filter string="My Favorites"  name="my_favorite_jobs" domain="[('favorite_user_ids', 'in', uid)]"/>
+                <filter string="My Favorites" name="my_favorite_jobs" domain="[('favorite_user_ids', 'in', uid)]"/>
+                <separator/>
             </xpath>
         </field>
     </record>
@@ -519,7 +519,7 @@
         <field name="res_model">hr.applicant</field>
         <field name="view_mode">kanban,tree,form,pivot,graph,calendar,activity</field>
         <field name="view_id" eval="False"/>
-        <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
+        <field name="search_view_id" ref="hr_applicant_view_search_bis"/>
         <field name="context">{}</field>
         <field name="help" type="html">
           <p class="o_view_nocontent_empty_folder">
@@ -852,7 +852,7 @@ action = act
         <field name="model">hr.employee</field>
         <field name="inherit_id" ref="hr.view_employee_filter"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='department_id']" position="after">
+            <xpath expr="//field[@name='job_id']" position="after">
                 <filter name="newly_hired_employee" string="Newly Hired" domain="[('newly_hired_employee', '=', True)]" groups="hr_recruitment.group_hr_recruitment_user"/>
             </xpath>
         </field>
@@ -910,6 +910,8 @@ action = act
                 <filter string="Ongoing" name="ongoing" domain="[('active', '=', True)]"/>
                 <filter string="Refused" name="refused" domain="[('active', '=', False)]"/>
                 <separator/>
+                <filter string="Archived" name="archived" domain="[('active', '=', False)]"/>
+                <separator/>
                 <group expand="0" string="Extended Filters">
                     <field name="priority"/>
                     <field name="stage_id"/>
diff --git a/addons/hr_skills/views/hr_views.xml b/addons/hr_skills/views/hr_views.xml
index 1929cc49b48..f7dd96cc199 100644
--- a/addons/hr_skills/views/hr_views.xml
+++ b/addons/hr_skills/views/hr_views.xml
@@ -16,7 +16,7 @@
         <field name="model">hr.employee</field>
         <field name="inherit_id" ref="hr.view_employee_filter"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='job_title']" position="after">
+            <xpath expr="//field[@name='job_id']" position="after">
                 <field name="employee_skill_ids"/>
                 <field name="resume_line_ids" string="Resumé" filter_domain="['|', ('resume_line_ids.name', 'ilike', self), ('resume_line_ids.description', 'ilike', self)]"/>
             </xpath>
diff --git a/addons/hr_timesheet/views/hr_timesheet_views.xml b/addons/hr_timesheet/views/hr_timesheet_views.xml
index 131a8dbe565..260009012eb 100644
--- a/addons/hr_timesheet/views/hr_timesheet_views.xml
+++ b/addons/hr_timesheet/views/hr_timesheet_views.xml
@@ -124,14 +124,15 @@
                     <separator/>
                     <filter name="month" string="Date" date="date"/>
                     <group expand="0" string="Group By">
-                        <filter string="Employee" name="groupby_employee" domain="[]" context="{'group_by':'employee_id'}"/>
-                        <filter string="Project" name="groupby_project" domain="[]" context="{'group_by':'project_id'}"/>
-                        <filter string="Task" name="groupby_task" domain="[]" context="{'group_by':'task_id'}"/>
-                        <filter string="Timesheet Date" name="groupby_date" domain="[]" context="{'group_by':'date'}" help="Timesheet by Date"/>
+                        <filter string="Employee" name="groupby_employee" domain="[]" context="{'group_by': 'employee_id'}"/>
+                        <filter string="Project" name="groupby_project" domain="[]" context="{'group_by': 'project_id'}"/>
+                        <filter string="Task" name="groupby_task" domain="[]" context="{'group_by': 'task_id'}"/>
+                        <filter string="Date" name="groupby_date" domain="[]" context="{'group_by': 'date'}" help="Timesheet by Date"/>
                     </group>
                 </search>
             </field>
         </record>
+
         <record id="view_kanban_account_analytic_line" model="ir.ui.view">
             <field name="name">account.analytic.line.kanban</field>
             <field name="model">account.analytic.line</field>
diff --git a/addons/hr_work_entry/views/hr_work_entry_views.xml b/addons/hr_work_entry/views/hr_work_entry_views.xml
index 1071b2d8205..0b138b579cd 100644
--- a/addons/hr_work_entry/views/hr_work_entry_views.xml
+++ b/addons/hr_work_entry/views/hr_work_entry_views.xml
@@ -89,21 +89,36 @@
             <search string="Search Work Entry">
                 <field name="employee_id"/>
                 <field name="name"/>
-                <filter string="My Work Entries" domain="[('employee_id.user_id','=',uid)]" name="my_work_entries"/>
-                <filter string="With error" domain="[('state','=', 'conflict')]" name="work_entries_error"/>
+                <filter name="my_work_entries" string="My Entries" domain="[('employee_id.user_id', '=', uid)]"/>
+                <filter name="work_entries_error" string="Conflicting" domain="[('state', '=', 'conflict')]"/>
                 <filter name="date_filter" string="Date" date="date_start"/>
-                <filter name="group_employee" string="Employee" context="{'group_by':'employee_id'}"/>
-                <filter name="group_work_entry_type" string="Type" context="{'group_by':'work_entry_type_id'}"/>
+                <filter name="group_employee" string="Employee" context="{'group_by': 'employee_id'}"/>
+                <filter name="group_work_entry_type" string="Type" context="{'group_by': 'work_entry_type_id'}"/>
+                <separator/>
+                <filter name="archived" string="Archived" domain="[('active', '=', False)]"/>
             </search>
         </field>
     </record>
 
     <!-- HR WORK ENTRY TYPE -->
 
+    <record id="hr_work_entry_type_view_search" model="ir.ui.view">
+        <field name="name">hr.work.entry.type.view.search</field>
+        <field name="model">hr.work.entry.type</field>
+        <field name="arch" type="xml">
+            <search string="Search Work Entry Type">
+                <field name="name"/>
+                <separator/>
+                <filter name="archived" string="Archived" domain="[('active', '=', False)]"/>
+            </search>
+        </field>
+    </record>
+
     <record id="hr_work_entry_type_action" model="ir.actions.act_window">
         <field name="name">Work Entry Types</field>
         <field name="res_model">hr.work.entry.type</field>
         <field name="view_mode">kanban,tree,form</field>
+        <field name="search_view_id" ref="hr_work_entry_type_view_search"/>
     </record>
 
     <record id="hr_work_entry_type_view_tree" model="ir.ui.view">
diff --git a/addons/im_livechat/views/im_livechat_channel_views.xml b/addons/im_livechat/views/im_livechat_channel_views.xml
index 807bc64a7c7..2dfe2a7149b 100644
--- a/addons/im_livechat/views/im_livechat_channel_views.xml
+++ b/addons/im_livechat/views/im_livechat_channel_views.xml
@@ -160,7 +160,15 @@
             </field>
         </record>
 
-
+        <record id="im_livechat_channel_view_search" model="ir.ui.view">
+            <field name="name">im.livechat.channel.view.search</field>
+            <field name="model">im_livechat.channel</field>
+            <field name="arch" type="xml">
+                <search string="LiveChat Channel Search">
+                    <field name="name" string="Channel"/>
+                </search>
+            </field>
+        </record>
 
         <!-- im_livechat.channel.rule -->
         <record id="im_livechat_channel_rule_view_tree" model="ir.ui.view">
diff --git a/addons/lunch/views/lunch_alert_views.xml b/addons/lunch/views/lunch_alert_views.xml
index fefea3ca7e5..040a86b3e7d 100644
--- a/addons/lunch/views/lunch_alert_views.xml
+++ b/addons/lunch/views/lunch_alert_views.xml
@@ -7,6 +7,7 @@
             <search string="Search">
                 <field name="message"/>
                 <filter name="inactive_today" string="Currently inactive" domain="[('available_today', '=', False)]"/>
+                <separator/>
                 <filter name="active" string="Active" domain="[('active', '=', True)]"/>
                 <filter name="inactive" string="Archived" domain="[('active', '=', False)]"/>
             </search>
diff --git a/addons/lunch/views/lunch_orders_views.xml b/addons/lunch/views/lunch_orders_views.xml
index 92915aeaf47..6bd0a5078ce 100644
--- a/addons/lunch/views/lunch_orders_views.xml
+++ b/addons/lunch/views/lunch_orders_views.xml
@@ -7,17 +7,20 @@
         <field name="arch" type="xml">
             <search string="Search">
                 <field name="name" string="Product" filter_domain="['|', ('name', 'ilike', self), ('note', 'ilike', self)]"/>
-                <filter name='is_mine' string="My Orders" domain="[('user_id','=',uid)]"/>
+                <field name="user_id"/>
+                <filter name='is_mine' string="My Orders" domain="[('user_id', '=', uid)]"/>
                 <separator/>
-                <filter name="not_confirmed" string="Not Received" domain="[('state','!=',('confirmed'))]"/>
-                <filter name="confirmed" string="Received" domain="[('state','=','confirmed')]"/>
-                <filter name="cancelled" string="Cancelled" domain="[('state','=','cancelled')]"/>
+                <filter name="not_confirmed" string="Not Received" domain="[('state', '!=', ('confirmed'))]"/>
+                <filter name="confirmed" string="Received" domain="[('state', '=', 'confirmed')]"/>
+                <filter name="cancelled" string="Cancelled" domain="[('state', '=', 'cancelled')]"/>
                 <separator/>
                 <filter name="date_filter" string="Today" domain="[('date', '=', context_today().strftime('%Y-%m-%d'))]" />
-                <field name="user_id"/>
+                <separator/>
+                <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                 <group expand="0" string="Group By">
-                    <filter name="group_by_supplier" string="By Vendor" context="{'group_by':'supplier_id'}"/>
-                    <filter name="group_by_date" string="Order Date" context="{'group_by':'date:day'}" help="Vendor Orders by Date"/>
+                    <filter name="group_by_user" string="User" context="{'group_by': 'user_id'}"/>
+                    <filter name="group_by_supplier" string="Vendor" context="{'group_by': 'supplier_id'}"/>
+                    <filter name="group_by_date" string="Order Date" context="{'group_by': 'date:day'}" help="Vendor Orders by Date"/>
                 </group>
             </search>
         </field>
diff --git a/addons/lunch/views/lunch_product_views.xml b/addons/lunch/views/lunch_product_views.xml
index e328753add1..fb0159f85f0 100644
--- a/addons/lunch/views/lunch_product_views.xml
+++ b/addons/lunch/views/lunch_product_views.xml
@@ -5,14 +5,15 @@
         <field name="model">lunch.product</field>
         <field name="arch" type="xml">
             <search string="Product Search">
-                <field name="name"/>
-                <field name="category_id"/>
+                <field name="name" string="Product"/>
+                <field name="category_id" string="Category"/>
                 <field name="supplier_id"/>
                 <field name="description"/>
-                <filter name="inactive" string="Archived" domain="[('active','=',False)]"/>
+                <separator/>
+                <filter name="inactive" string="Archived" domain="[('active', '=', False)]"/>
                 <group expand="0" string="Group By">
                     <filter name="group_by_supplier" string="Vendor" context="{'group_by': 'supplier_id'}"/>
-                    <filter name="group_by_category" string="Product Category" context="{'group_by': 'category_id'}"/>
+                    <filter name="group_by_category" string="Category" context="{'group_by': 'category_id'}"/>
                 </group>
                 <searchpanel>
                     <field name="category_id" select="multi" string="Categories" icon="fa-cutlery" color="#875A7B"/>
diff --git a/addons/lunch/views/lunch_supplier_views.xml b/addons/lunch/views/lunch_supplier_views.xml
index 84370caa55e..620375abd73 100644
--- a/addons/lunch/views/lunch_supplier_views.xml
+++ b/addons/lunch/views/lunch_supplier_views.xml
@@ -102,9 +102,22 @@
         </field>
     </record>
 
+    <record id="lunch_supplier_view_search" model="ir.ui.view">
+        <field name="name">lunch.supplier.view.search</field>
+        <field name="model">lunch.supplier</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="name"/>
+                <separator/>
+                <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+            </search>
+        </field>
+    </record>
+
     <record id="lunch_vendors_action" model="ir.actions.act_window">
         <field name="name">Vendors</field>
         <field name="res_model">lunch.supplier</field>
         <field name="view_mode">kanban,tree,form</field>
+        <field name="search_view_id" ref="lunch_supplier_view_search"/>
     </record>
 </odoo>
diff --git a/addons/mail/views/mail_message_views.xml b/addons/mail/views/mail_message_views.xml
index 59857349544..723ec9fa33e 100644
--- a/addons/mail/views/mail_message_views.xml
+++ b/addons/mail/views/mail_message_views.xml
@@ -113,9 +113,6 @@
                             name="message_needaction" help="Unread messages"
                             domain="[('needaction', '=', True)]"/>
                     <separator/>
-                    <filter string="Has attachments"
-                            name="attachments"
-                            domain="[('attachment_ids', '!=', False)]"/>
                 </search>
             </field>
         </record>
diff --git a/addons/maintenance/views/maintenance_views.xml b/addons/maintenance/views/maintenance_views.xml
index 7b3e9446d3f..48b5d767780 100644
--- a/addons/maintenance/views/maintenance_views.xml
+++ b/addons/maintenance/views/maintenance_views.xml
@@ -6,41 +6,44 @@
         <field name="name">equipment.request.search</field>
         <field name="model">maintenance.request</field>
         <field name="arch" type="xml">
-            <search string="maintenance Request Search">
-                <field name="name"/>
+            <search string="Maintenance Request Search">
+                <field name="name" string="Request"/>
                 <field name="category_id"/>
                 <field name="user_id"/>
                 <field name="equipment_id"/>
                 <field name="owner_user_id"/>
                 <field name="stage_id"/>
                 <field name="maintenance_team_id"/>
-                <filter string="My Requests" name="my_requests" domain="[('user_id', '=', uid)]"/>
+                <filter string="My Maintenances" name="my_maintenances" domain="[('user_id', '=', uid)]"/>
+                <separator/>
+                <filter string="To Do" name="todo" domain="[('stage_id.done', '=', False)]"/>
                 <separator/>
-                <filter string="To do" domain="[('stage_id.done', '=', False)]" name="todo"/>
                 <filter string="Blocked" name="kanban_state_block" domain="[('kanban_state', '=', 'blocked')]"/>
-                <filter string="In Progress" name="progress" domain="[('kanban_state', '=', 'normal')]"/>
-                <filter string="Done" name="done" domain="[('kanban_state', '=', 'done')]"/>
-                <filter string="Top Priorities" name="top_priority" domain="[('priority', '=', '3')]"/>
+                <filter string="Ready" name="done" domain="[('kanban_state', '=', 'done')]"/>
+                <separator/>
+                <filter string="High-priority" name="high_priority" domain="[('priority', '=', '3')]"/>
+                <separator/>
+                <filter string="Unscheduled" name="unscheduled" domain="[('schedule_date', '=', False)]"/>
+                <separator/>
+                <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction', '=', True)]"/>
+                <separator/>
+                <filter string="My Activities" name="activities_my" domain="[('activity_ids.user_id', '=', uid)]"/>
                 <separator/>
-                <filter string="Unscheduled Maintenance" domain="[('schedule_date', '=', False)]" name="unscheduled"/>
                 <filter invisible="1" string="Late Activities" name="activities_overdue"
                     domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
                     help="Show all records which has next action date is before today"/>
                 <filter invisible="1" string="Today Activities" name="activities_today"
                     domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
                 <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
-                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))
-                        ]"/>
+                    domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
                 <filter string="Exception Activities" name="activities_exception"
-                        domain="[('activity_exception_decoration', '!=', False)]"/>
+                    domain="[('activity_exception_decoration', '!=', False)]"/>
                 <separator/>
-                <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction','=',True)]"/>
-                <separator/>
-                <filter string="Archived" name="inactive" domain="[('archive','=',True)]"/>
+                <filter string="Archived" name="inactive" domain="[('archive', '=', True)]"/>
                 <group  expand='0' string='Group by...'>
-                    <filter string='Assigned' name="assigned" domain="[]" context="{'group_by': 'user_id'}"/>
+                    <filter string='Assigned to' name="assigned" domain="[]" context="{'group_by': 'user_id'}"/>
                     <filter string='Category' name="category" domain="[]" context="{'group_by' : 'category_id'}"/>
-                    <filter string='Stages' name="stages" domain="[]" context="{'group_by' : 'stage_id'}"/>
+                    <filter string='Stage' name="stages" domain="[]" context="{'group_by' : 'stage_id'}"/>
                     <filter string='Created By' name='created_by' domain="[]" context="{'group_by': 'owner_user_id'}"/>
                 </group>
             </search>
@@ -503,31 +506,36 @@
         <field name="model">maintenance.equipment</field>
         <field name="arch" type="xml">
             <search string="Search">
-                <field name="name"  filter_domain="['|','|','|',('name','ilike',self),('model','ilike',self),('serial_no','ilike',self),('partner_ref', 'ilike', self)]"/>
-                <field name="category_id"/>
+                <field string="Equipment" name="name" filter_domain="[
+                    '|', '|', '|',
+                    ('name', 'ilike', self), ('model', 'ilike', self), ('serial_no', 'ilike', self), ('partner_ref', 'ilike', self)]"/>
+                <field string="Category" name="category_id"/>
                 <field name="owner_user_id"/>
+                <filter string="My Equipments" name="my" domain="[('owner_user_id', '=', uid)]"/>
+                <filter string="Assigned" name="assigned" domain="[('owner_user_id', '!=', False)]"/>
+                <filter string="Unassigned" name="available" domain="[('owner_user_id', '=', False)]"/>
+                <separator/>
                 <filter string="Under Maintenance" name="under_maintenance" domain="[('maintenance_open_count', '&gt;', 0)]"/>
                 <separator/>
-                <filter string="Assigned" name="assigned" domain="[('owner_user_id', '!=', False)]"/>
-                <filter string="Available" name="available" domain="[('owner_user_id', '=', False)]"/>
+                <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction','=',True)]"/>
+                <separator/>
+                <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+                <separator/>
+                <filter string="My Activities" name="activities_my" domain="[('activity_ids.user_id', '=', uid)]"/>
                 <separator/>
-                <filter string="My Equipments" name="my" domain="[('owner_user_id', '=', uid)]"/>
-                <filter string="Archived" domain="[('active', '=', False)]" name="inactive"/>
                 <filter invisible="1" string="Late Activities" name="activities_overdue"
                     domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
                     help="Show all records which has next action date is before today"/>
                 <filter invisible="1" string="Today Activities" name="activities_today"
                     domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
                 <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
-                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))
-                        ]"/>
+                    domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
                 <filter string="Exception Activities" name="activities_exception"
-                        domain="[('activity_exception_decoration', '!=', False)]"/>
+                    domain="[('activity_exception_decoration', '!=', False)]"/>
                 <separator/>
-                <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction','=',True)]"/>
-                <!-- <filter string="Archived" name="inactive" domain="[('active','=',False)]"/> -->
+                <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
                 <group  expand='0' string='Group by...'>
-                    <filter string='Technicians' name="technicians" domain="[]" context="{'group_by': 'technician_user_id'}"/>
+                    <filter string='Technician' name="technicians" domain="[]" context="{'group_by': 'technician_user_id'}"/>
                     <filter string='Category' name="category" domain="[]" context="{'group_by': 'category_id'}"/>
                     <filter string='Owner' name="owner" domain="[]" context="{'group_by': 'owner_user_id'}"/>
                     <filter string='Vendor' name="vendor" domain="[]" context="{'group_by': 'partner_id'}"/>
@@ -934,6 +942,7 @@
         <field name="model">maintenance.team</field>
         <field name="arch" type="xml">
             <search string="Search">
+                <field string="Team" name="name"/>
                 <filter string="Archived" domain="[('active', '=', False)]" name="inactive"/>
             </search>
         </field>
diff --git a/addons/mass_mailing/views/mailing_list_views.xml b/addons/mass_mailing/views/mailing_list_views.xml
index ff743ca5313..6ee9811931f 100644
--- a/addons/mass_mailing/views/mailing_list_views.xml
+++ b/addons/mass_mailing/views/mailing_list_views.xml
@@ -8,7 +8,6 @@
             <search string="Mailing Lists">
                 <field name="name"/>
                 <field name="create_date"/>
-                <field name="is_public"/>
                 <filter name="inactive" string="Archived" domain="[('active','=',False)]"/>
                 <group expand="0" string="Group By">
                     <filter string="Creation Period" name="group_create_date"
diff --git a/addons/mass_mailing/views/mailing_mailing_views.xml b/addons/mass_mailing/views/mailing_mailing_views.xml
index 32125871dd0..fe5b5ad2f1b 100644
--- a/addons/mass_mailing/views/mailing_mailing_views.xml
+++ b/addons/mass_mailing/views/mailing_mailing_views.xml
@@ -6,21 +6,19 @@
             <field name="model">mailing.mailing</field>
             <field name="arch" type="xml">
                <search string="Mailings">
-                    <field name="name" string="Mailings"/>
+                    <field name="name" string="Mailing" filter_domain="['|', ('name', 'ilike', self), ('subject', 'ilike', self)]"/>
+                    <field name="campaign_id" string="Campaign"/>
                     <field name="mailing_type" invisible="1"/>
-                    <field name="campaign_id"/>
                     <filter string="My Mailings" name="assigned_to_me"
                             domain="[('user_id', '=', uid)]"
                             help="Mailings that are assigned to me"/>
-                    <filter name="inactive" string="Archived" domain="[('active','=',False)]"/>
+                    <separator/>
+                    <filter name="inactive" string="Archived" domain="[('active', '=', False)]"/>
                     <group expand="0" string="Group By">
-                        <filter string="Status" name="group_state"
-                            context="{'group_by': 'state'}"/>
-                        <filter string="Sent By" name="sent_by" domain="[]"
-                            context="{'group_by':'email_from'}"/>
+                        <filter string="Status" name="group_state" context="{'group_by': 'state'}"/>
+                        <filter string="Sent By" name="sent_by" domain="[]" context="{'group_by': 'email_from'}"/>
                         <separator/>
-                        <filter string="Sent Period" name="sent_date"
-                            domain="[]" context="{'group_by':'sent_date'}"/>
+                        <filter string="Sent Period" name="sent_date" domain="[]" context="{'group_by': 'sent_date'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/membership/views/partner_views.xml b/addons/membership/views/partner_views.xml
index d4c5aea3396..6945df9b5de 100644
--- a/addons/membership/views/partner_views.xml
+++ b/addons/membership/views/partner_views.xml
@@ -25,19 +25,23 @@
             <field name="arch" type="xml">
                 <search string="Membership Partners">
                     <field name="name"
-                       filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]"/>
+                       filter_domain="['|', '|', ('name', 'ilike', self), ('parent_id', 'ilike', self), ('ref' , '=', self)]"/>
                     <field name="category_id"/>
                     <field name="membership_start" invisible="1"/>
                     <field name="membership_stop" string="End Membership Date"/>
+                    <filter name="customer" string="Customers" domain="[('customer' ,'=', True)]"/>
+                    <filter name="supplier" string="Vendors" domain="[('supplier', '=', True)]"/>
                     <separator/>
-                    <filter name="all_non_members" domain="[('membership_state', 'in', ['none','canceled','old','waiting'])]" string="All non Members" help="None/Canceled/Old/Waiting"/>
-                    <filter name="all_members" domain="[('membership_state', 'in', ['invoiced','paid','free'])]" string="All Members" help="Invoiced/Paid/Free"/>
+                    <filter name="all_members" string="Members" domain="[('membership_state', 'in', ['invoiced', 'paid', 'free'])]" help="Invoiced/Paid/Free"/>
+                    <separator/>
+                    <filter string="Start Date" name="start_date" date="membership_start"/>
+                    <filter string="End Date" name="end_date" date="membership_stop"/>
                     <group expand="0" string="Group By" colspan="10" col="8">
                         <filter string="Salesperson" name="salesperson" domain="[]" context="{'group_by' : 'user_id'}"/>
-                        <filter string="Associate Member" name = "associate" domain="[]" context="{'group_by':'associate_member'}"/>
-                        <filter string=" Membership State" name="membership_state" domain="[]" context="{'group_by':'membership_state'}"/>
-                        <filter string="Start Date" name="start_month" help="Starting Date Of Membership" domain="[]" context="{'group_by':'membership_start'}"/>
-                        <filter string="End Date" name="end_month" help="Ending Date Of Membership" domain="[]" context="{'group_by':'membership_stop'}"/>
+                        <filter string="Associate Member" name = "associate" domain="[]" context="{'group_by': 'associate_member'}"/>
+                        <filter string="Membership State" name="membership_state" domain="[]" context="{'group_by': 'membership_state'}"/>
+                        <filter string="Start Date" name="start_month" help="Starting Date Of Membership" domain="[]" context="{'group_by': 'membership_start'}"/>
+                        <filter string="End Date" name="end_month" help="Ending Date Of Membership" domain="[]" context="{'group_by': 'membership_stop'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/mrp/models/mrp_bom.py b/addons/mrp/models/mrp_bom.py
index 9d9a884f766..b6fedb9a79b 100644
--- a/addons/mrp/models/mrp_bom.py
+++ b/addons/mrp/models/mrp_bom.py
@@ -40,7 +40,7 @@ class MrpBom(models.Model):
         'Quantity', default=1.0,
         digits='Unit of Measure', required=True)
     product_uom_id = fields.Many2one(
-        'uom.uom', 'Product Unit of Measure',
+        'uom.uom', 'Unit of Measure',
         default=_get_default_product_uom_id, required=True,
         help="Unit of Measure (Unit of Measure) is the unit of measurement for the inventory control", domain="[('category_id', '=', product_uom_category_id)]")
     product_uom_category_id = fields.Many2one(related='product_id.uom_id.category_id')
diff --git a/addons/mrp/views/mrp_bom_views.xml b/addons/mrp/views/mrp_bom_views.xml
index 2af174b2f67..d95920abd24 100644
--- a/addons/mrp/views/mrp_bom_views.xml
+++ b/addons/mrp/views/mrp_bom_views.xml
@@ -106,7 +106,8 @@
                 </form>
             </field>
         </record>
-       <record id="mrp_bom_tree_view" model="ir.ui.view">
+
+        <record id="mrp_bom_tree_view" model="ir.ui.view">
             <field name="name">mrp.bom.tree</field>
             <field name="model">mrp.bom</field>
             <field name="arch" type="xml">
@@ -154,22 +155,23 @@
             <field name="model">mrp.bom</field>
             <field name="arch" type="xml">
                 <search string="Search Bill Of Material">
-                    <field name="code" filter_domain="['|',('code','ilike',self),('product_tmpl_id','ilike',self)]"/>
-                    <field name="bom_line_ids" string="Components"/>
+                    <field name="code" string="Bill of Materials" filter_domain="['|', ('code', 'ilike', self), ('product_tmpl_id', 'ilike', self)]"/>
                     <field name="product_tmpl_id" string="Product"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
-                    <separator/>
+                    <field name="bom_line_ids" string="Component"/>
+                    <filter string="Manufacturing" name="normal" domain="[('type', '=', 'normal')]"/>
                     <filter string="Kit" name="phantom" domain="[('type', '=', 'phantom')]"/>
-                    <filter string="Normal" name="normal" domain="[('type', '=', 'normal')]"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                     <group expand="0" string="Group By...">
-                        <filter string="Product" name="product" domain="[]" context="{'group_by':'product_tmpl_id'}"/>
+                        <filter string="Product" name="product" domain="[]" context="{'group_by': 'product_tmpl_id'}"/>
                         <filter string='BoM Type' name="group_by_type" domain="[]" context="{'group_by' : 'type'}"/>
-                        <filter string="Routings" name="routings" domain="[]" context="{'group_by':'routing_id'}"/>
+                        <filter string='Unit of Measure' name="default_unit_of_measure" domain="[]" context="{'group_by' : 'product_uom_id'}"/>
+                        <filter string="Routing" name="routings" domain="[]" context="{'group_by': 'routing_id'}"/>
                    </group>
                 </search>
             </field>
         </record>
+
         <record id="mrp_bom_form_action" model="ir.actions.act_window">
             <field name="name">Bills of Materials</field>
             <field name="type">ir.actions.act_window</field>
@@ -188,6 +190,7 @@
               </p>
             </field>
         </record>
+
         <menuitem id="menu_mrp_bom_form_action"
             action="mrp_bom_form_action"
             parent="menu_mrp_bom"
diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml
index b373e7f5043..09a9c79bf3d 100644
--- a/addons/mrp/views/mrp_production_views.xml
+++ b/addons/mrp/views/mrp_production_views.xml
@@ -274,6 +274,7 @@
                 </kanban>
             </field>
         </record>
+
         <record id="view_production_calendar" model="ir.ui.view">
             <field name="name">mrp.production.calendar</field>
             <field name="model">mrp.production</field>
@@ -288,6 +289,7 @@
                 </calendar>
             </field>
         </record>
+
         <record id="view_production_gantt" model="ir.ui.view">
             <field name="name">mrp.production.gantt</field>
             <field name="model">mrp.production</field>
@@ -296,6 +298,7 @@
                 </gantt>
             </field>
         </record>
+
         <record id="view_production_pivot" model="ir.ui.view">
             <field name="name">mrp.production.pivot</field>
             <field name="model">mrp.production</field>
@@ -305,6 +308,7 @@
                 </pivot>
             </field>
         </record>
+
         <record id="view_production_graph" model="ir.ui.view">
             <field name="name">mrp.production.graph</field>
             <field name="model">mrp.production</field>
@@ -314,19 +318,25 @@
                 </graph>
             </field>
         </record>
+
         <record id="view_mrp_production_filter" model="ir.ui.view">
             <field name="name">mrp.production.select</field>
             <field name="model">mrp.production</field>
             <field name="arch" type="xml">
                 <search string="Search Production">
-                    <field name="name" string="Production" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
-                    <filter string="To Do" name="todo" domain="[('state','in',('draft', 'confirmed', 'planned','progress', 'to_close'))]"
+                    <field name="name" string="Manufacturing Order" filter_domain="['|', ('name', 'ilike', self), ('origin', 'ilike', self)]"/>
+                    <field name="product_id"/>
+                    <field name="move_raw_ids" string="Component" filter_domain="[('move_raw_ids.product_id', 'ilike', self)]"/>
+                    <field name="name" string="Work Center" filter_domain="[('routing_id.operation_ids.workcenter_id', 'ilike', self)]"/>
+                    <field name="routing_id" groups="mrp.group_mrp_routings"/>
+                    <field name="origin"/>
+                    <filter string="To Do" name="todo" domain="[('state', 'in', ('draft', 'confirmed', 'planned','progress', 'to_close'))]"
                         help="Manufacturing Orders which are in confirmed state."/>
                     <separator/>
-                    <filter string="Draft" name="filter_draft" domain="[('state','=','draft')]"/>
-                    <filter string="Confirmed" name="filter_confirmed" domain="[('state','=','confirmed')]"/>
-                    <filter string="Planned" name="filter_planned" domain="[('state','=','planned')]" groups="mrp.group_mrp_routings"/>
-                    <filter string="In Progress" name="filter_in_progress" domain="[('state','=','progress')]"/>
+                    <filter string="Draft" name="filter_draft" domain="[('state', '=', 'draft')]"/>
+                    <filter string="Confirmed" name="filter_confirmed" domain="[('state', '=', 'confirmed')]"/>
+                    <filter string="Planned" name="filter_planned" domain="[('state', '=', 'planned')]" groups="mrp.group_mrp_routings"/>
+                    <filter string="In Progress" name="filter_in_progress" domain="[('state', '=', 'progress')]"/>
                     <filter string="To Close" name="filter_to_close" domain="[('state', '=', 'to_close')]"/>
                     <filter string="Done" name="filter_done" domain="[('state', '=', 'done')]"/>
                     <filter string="Cancelled" name="filter_cancel" domain="[('state', '=', 'cancel')]"/>
@@ -334,29 +344,25 @@
                     <filter string="Waiting for Material" name="waiting" domain="[('reservation_state', 'in', ('waiting', 'confirmed'))]"/>
                     <filter string="Material Available" name="filter_ready" domain="[('reservation_state', '=', 'assigned')]"/>
                     <separator/>
-                    <filter string="Late" domain="['&amp;', ('date_deadline', '&lt;', current_date), ('state', '=', 'confirmed')]"
-                        name="late" help="Production started late"/>
+                    <filter string="Late" name="late" help="Production started late"
+                        domain="['&amp;', ('date_deadline', '&lt;', current_date), ('state', '=', 'confirmed')]"/>
+                    <filter string="My Activities" name="activities_my" domain="[('activity_ids.user_id', '=', uid)]"/>
                     <separator/>
-                    <field name="product_id"/>
-                    <field name="move_raw_ids" string="Components" filter_domain="[('move_raw_ids.product_id','ilike',self)]"/>
-                    <field name="name" string="Work Center" filter_domain="[('routing_id.operation_ids.workcenter_id','ilike',self)]"/>
-                    <field name="routing_id" groups="mrp.group_mrp_routings"/>
                     <filter invisible="1" string="Late Activities" name="activities_overdue"
                         domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
                         help="Show all records which has next action date is before today"/>
                     <filter invisible="1" string="Today Activities" name="activities_today"
                         domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
                     <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
-                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))
-                        ]"/>
+                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
                     <filter string="Exception Activities" name="activities_exception"
                         domain="[('activity_exception_decoration', '!=', False)]"/>
                     <group expand="0" string="Group By...">
-                        <filter string="Product" name="product" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Routing" name="routing" domain="[]" context="{'group_by':'routing_id'}" groups="mrp.group_mrp_routings"/>
-                        <filter string="Scheduled Date" name="scheduled_date" domain="[]" context="{'group_by':'date_deadline'}" help="Scheduled Date by Month"/>
+                        <filter string="Product" name="product" domain="[]" context="{'group_by': 'product_id'}"/>
+                        <filter string="Routing" name="routing" domain="[]" context="{'group_by': 'routing_id'}" groups="mrp.group_mrp_routings"/>
                         <filter string="Status" name="status" domain="[]" context="{'group_by': 'state'}"/>
                         <filter string="Material Availability" name="groupby_reservation_state" domain="[]" context="{'group_by': 'reservation_state'}"/>
+                        <filter string="Scheduled Date" name="scheduled_date" domain="[]" context="{'group_by': 'date_planned_start'}" help="Scheduled Date by Month"/>
                     </group>
                </search>
             </field>
@@ -396,32 +402,32 @@
             parent="menu_mrp_manufacturing"
             sequence="1"/>
 
-    <record id="mrp_production_report" model="ir.actions.act_window">
-        <field name="name">Manufacturing Orders</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">mrp.production</field>
-        <field name="view_mode">graph,pivot,form</field>
-        <field name="target">current</field>
-    </record>
+        <record id="mrp_production_report" model="ir.actions.act_window">
+            <field name="name">Manufacturing Orders</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.production</field>
+            <field name="view_mode">graph,pivot,form</field>
+            <field name="target">current</field>
+        </record>
 
-    <menuitem id="menu_mrp_workorder_todo"
+        <menuitem id="menu_mrp_workorder_todo"
+                name="Work Orders"
+                action="mrp_workorder_todo"
+                parent="menu_mrp_manufacturing"
+                groups="group_mrp_routings"/>
+
+        <menuitem id="menu_mrp_production_report"
+            name="Manufacturing Orders"
+            parent="menu_mrp_reporting"
+            action="mrp_production_report"
+            sequence="11"/>
+
+        <menuitem id="menu_mrp_work_order_report"
             name="Work Orders"
-            action="mrp_workorder_todo"
-            parent="menu_mrp_manufacturing"
-            groups="group_mrp_routings"/>
-
-    <menuitem id="menu_mrp_production_report"
-          name="Manufacturing Orders"
-          parent="menu_mrp_reporting"
-          action="mrp_production_report"
-          sequence="11"/>
-
-    <menuitem id="menu_mrp_work_order_report"
-          name="Work Orders"
-          parent="menu_mrp_reporting"
-          action="mrp_workorder_report"
-          groups="group_mrp_routings"
-          sequence="11"/>
+            parent="menu_mrp_reporting"
+            action="mrp_workorder_report"
+            groups="group_mrp_routings"
+            sequence="11"/>
 
         <record id="act_product_mrp_production" model="ir.actions.act_window">
             <field name="context">{'search_default_product_id': [active_id]}</field>
@@ -430,11 +436,11 @@
             <field name="view_id" ref="mrp_production_tree_view"/>
         </record>
 
-    <record id="action_mrp_production_form" model="ir.actions.act_window">
-        <field name="name">Manufacturing Orders</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">mrp.production</field>
-        <field name="view_mode">form</field>
-    </record>
+        <record id="action_mrp_production_form" model="ir.actions.act_window">
+            <field name="name">Manufacturing Orders</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.production</field>
+            <field name="view_mode">form</field>
+        </record>
     </data>
 </odoo>
diff --git a/addons/mrp/views/mrp_routing_views.xml b/addons/mrp/views/mrp_routing_views.xml
index b67865f424a..3513a152194 100644
--- a/addons/mrp/views/mrp_routing_views.xml
+++ b/addons/mrp/views/mrp_routing_views.xml
@@ -14,6 +14,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="mrp_routing_workcenter_form_view" model="ir.ui.view">
             <field name="name">mrp.routing.workcenter.form</field>
             <field name="model">mrp.routing.workcenter</field>
@@ -62,7 +63,6 @@
             </field>
         </record>
 
-
         <!-- Routings -->
         <record id="mrp_routing_form_view" model="ir.ui.view">
             <field name="name">mrp.routing.form</field>
@@ -104,6 +104,7 @@
                 </form>
             </field>
         </record>
+
         <record id="mrp_routing_tree_view" model="ir.ui.view">
             <field name="name">mrp.routing.tree</field>
             <field name="model">mrp.routing</field>
@@ -145,12 +146,12 @@
             <field name="model">mrp.routing</field>
             <field name="arch" type="xml">
                 <search string="Routing">
-                    <field name="name" string="Routing" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
-                    <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="name" string="Routing" filter_domain="['|', ('name', 'ilike', self), ('code', 'ilike', self)]"/>
+                    <filter name="inactive" string="Archived" domain="[('active', '=', False)]"/>
                 </search>
             </field>
         </record>
+
         <record id="mrp_routing_action" model="ir.actions.act_window">
             <field name="name">Routings</field>
             <field name="type">ir.actions.act_window</field>
@@ -168,6 +169,7 @@
               </p>
             </field>
         </record>
+
         <menuitem id="menu_mrp_routing_action"
           action="mrp_routing_action"
           parent="menu_mrp_bom"
diff --git a/addons/mrp/views/mrp_unbuild_views.xml b/addons/mrp/views/mrp_unbuild_views.xml
index 574455a30f0..b6ffddf674a 100644
--- a/addons/mrp/views/mrp_unbuild_views.xml
+++ b/addons/mrp/views/mrp_unbuild_views.xml
@@ -16,7 +16,6 @@
             <field name="arch" type="xml">
                 <search string="Search">
                     <field name="product_id"/>
-                    <field name="state"/>
                     <field name="mo_id"/>
                     <group expand="0" string="Filters">
                         <filter name="draft" string="Draft" domain="[('state', '=', 'draft')]"/>
@@ -27,10 +26,9 @@
                         <filter invisible="1" string="Today Activities" name="activities_today"
                             domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
                         <filter invisible="1" string="Future Activitie" name="activities_upcoming_all"
-                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))
-                        ]"/>
+                            domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
                         <filter string="Exception Activities" name="activities_exception"
-                        domain="[('activity_exception_decoration', '!=', False)]"/>
+                            domain="[('activity_exception_decoration', '!=', False)]"/>
                     </group>
                     <group expand='0' string='Group by...'>
                         <filter string='Product' name="productgroup" context="{'group_by': 'product_id'}"/>
diff --git a/addons/mrp/views/mrp_workcenter_views.xml b/addons/mrp/views/mrp_workcenter_views.xml
index cc3004eed97..6a8535057ea 100644
--- a/addons/mrp/views/mrp_workcenter_views.xml
+++ b/addons/mrp/views/mrp_workcenter_views.xml
@@ -376,10 +376,10 @@
             <field name="model">mrp.workcenter</field>
             <field name="arch" type="xml">
                 <search string="Search for mrp workcenter">
-                    <field name="name" string="Mrp Workcenter" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
-                    <filter string="Archived" name="archived" domain="[('active','=',False)]"/>
+                    <field name="name" string="Work Center" filter_domain="['|', ('name', 'ilike', self), ('code', 'ilike', self)]"/>
+                    <filter name="archived" string="Archived" domain="[('active', '=', False)]"/>
                     <group expand="0" string="Group By...">
-                        <filter string="Company" name="company" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Company" name="company" domain="[]" context="{'group_by': 'company_id'}" groups="base.group_multi_company"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/mrp/views/mrp_workorder_views.xml b/addons/mrp/views/mrp_workorder_views.xml
index d5d22fbfd5f..bf80f6f0d8f 100644
--- a/addons/mrp/views/mrp_workorder_views.xml
+++ b/addons/mrp/views/mrp_workorder_views.xml
@@ -265,16 +265,16 @@
         <field name="model">mrp.workorder</field>
         <field name="arch" type="xml">
             <search string="Search Work Orders">
-                <field name="name" string="Work Orders"/>
-                <field name="date_planned_start"/>
-                <field name="state"/>
-                <filter string="In Progress" name="progress" domain="[('state','=','progress')]"/>
-                <filter string="Ready" name="ready" domain="[('state','=','ready')]"/>
-                <filter string="Pending" name="pending" domain="[('state','=','pending')]"/>
-                <filter string="Finished" name="finish" domain="[('state','=','done')]"/>
-                <filter string="Available" name="available" domain="[('production_availability','=', 'assigned')]"/>
+                <field name="name" string="Work Order"/>
+                <field name="workcenter_id"/>
+                <field name="production_id"/>
+                <filter string="In Progress" name="progress" domain="[('state', '=', 'progress')]"/>
+                <filter string="Ready" name="ready" domain="[('state', '=', 'ready')]"/>
+                <filter string="Pending" name="pending" domain="[('state', '=', 'pending')]"/>
+                <filter string="Finished" name="finish" domain="[('state', '=', 'done')]"/>
+                <filter string="Available" name="available" domain="[('production_availability', '=', 'assigned')]"/>
                 <separator/>
-                <filter string="Late" name="late" domain="['&amp;', ('date_planned_start','&lt;', current_date), ('state', '=', 'ready')]"
+                <filter string="Late" name="late" domain="['&amp;', ('date_planned_start', '&lt;', current_date), ('state', '=', 'ready')]"
                     help="Production started late"/>
                 <filter invisible="1" string="Late Activities" name="activities_overdue"
                     domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
@@ -284,14 +284,12 @@
                 <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
                     domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
                 <filter string="Exception Activities" name="activities_exception"
-                        domain="[('activity_exception_decoration', '!=', False)]"/>
-                <field name="workcenter_id"/>
-                <field name="production_id"/>
+                    domain="[('activity_exception_decoration', '!=', False)]"/>
                 <group expand="0" string="Group By">
-                    <filter string="Work Center" name="work_center" domain="[]" context="{'group_by':'workcenter_id'}"/>
-                    <filter string="Production" name="production" domain="[]" context="{'group_by':'production_id'}"/>
-                    <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Scheduled Date" name="scheduled_month" domain="[]" context="{'group_by':'date_planned_start'}"/>
+                    <filter string="Work Center" name="work_center" domain="[]" context="{'group_by': 'workcenter_id'}"/>
+                    <filter string="Manufacturing Order" name="production" domain="[]" context="{'group_by': 'production_id'}"/>
+                    <filter string="Status" name="status" domain="[]" context="{'group_by': 'state'}"/>
+                    <filter string="Scheduled Date" name="scheduled_month" domain="[]" context="{'group_by': 'date_planned_start'}"/>
                 </group>
              </search>
         </field>
diff --git a/addons/payment/views/payment_views.xml b/addons/payment/views/payment_views.xml
index fdeffbbbaf0..f4c4cfc7c05 100644
--- a/addons/payment/views/payment_views.xml
+++ b/addons/payment/views/payment_views.xml
@@ -336,6 +336,8 @@
             <field name='arch' type='xml'>
                 <search string='Payment Tokens'>
                     <field name='partner_id'/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                 </search>
             </field>
         </record>
diff --git a/addons/point_of_sale/views/pos_config_view.xml b/addons/point_of_sale/views/pos_config_view.xml
index 6bd60a08d32..091ef107bb9 100644
--- a/addons/point_of_sale/views/pos_config_view.xml
+++ b/addons/point_of_sale/views/pos_config_view.xml
@@ -505,8 +505,8 @@
         <field name="arch" type="xml">
             <search string="Point of Sale Config">
                 <field name="name"/>
-                <filter string="Inactive" name="inactive" domain="[('active', '=', False)]" />
                 <field name="picking_type_id" />
+                <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
             </search>
         </field>
     </record>
diff --git a/addons/point_of_sale/views/pos_order_view.xml b/addons/point_of_sale/views/pos_order_view.xml
index 54d62b79c54..80f5ed270ea 100644
--- a/addons/point_of_sale/views/pos_order_view.xml
+++ b/addons/point_of_sale/views/pos_order_view.xml
@@ -180,6 +180,7 @@
             </p>
         </field>
     </record>
+
     <record id="action_pos_sale_graph" model="ir.actions.act_window">
         <field name="name">Orders</field>
         <field name="type">ir.actions.act_window</field>
@@ -187,6 +188,7 @@
         <field name="view_mode">graph,tree,kanban,form</field>
         <field name="domain">[('state', 'not in', ['draft', 'cancel', 'invoiced'])]</field>
     </record>
+
     <record id="view_pos_order_tree" model="ir.ui.view">
         <field name="name">pos.order.tree</field>
         <field name="model">pos.order</field>
@@ -312,20 +314,19 @@
             <search string="Search Sales Order">
                 <field name="name"/>
                 <field name="date_order"/>
-                <filter string="New" name="new" domain="[('state','=','draft')]"/>
-                <filter string="Done" name="done" domain="[('state','in',('paid','invoiced','done'))]"/>
-                <filter string="Invoiced" name="invoiced" domain="[('state','=','invoiced')]"/>
-                <filter string="Posted" name="posted" domain="[('state','=','done')]"/>
                 <field name="user_id"/>
                 <field name="partner_id"/>
                 <field name="session_id"/>
-                <field name="config_id"/>
+                <filter string="Invoiced" name="invoiced" domain="[('state', '=', 'invoiced')]"/>
+                <filter string="Posted" name="posted" domain="[('state', '=', 'done')]"/>
+                <separator/>
+                <filter string="Order Date" name="order_date" date="date_order"/>
                 <group expand="0" string="Group By">
-                    <filter string="Customer" name="customer" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <filter name="user_id" domain="[]" context="{'group_by':'user_id'}"/>
-                    <filter string="Session" name="session" domain="[]" context="{'group_by':'session_id'}"/>
-                    <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Order Date" name="order_month" domain="[]" context="{'group_by':'date_order'}"/>
+                    <filter string="Session" name="session" domain="[]" context="{'group_by': 'session_id'}"/>
+                    <filter string="User" name="user_id" domain="[]" context="{'group_by': 'user_id'}"/>
+                    <filter string="Customer" name="customer" domain="[]" context="{'group_by': 'partner_id'}"/>
+                    <filter string="Status" name="status" domain="[]" context="{'group_by': 'state'}"/>
+                    <filter string="Order Date" name="order_month" domain="[]" context="{'group_by': 'date_order'}"/>
                 </group>
             </search>
         </field>
diff --git a/addons/point_of_sale/views/pos_session_view.xml b/addons/point_of_sale/views/pos_session_view.xml
index 4ac0e5345be..08354e8fe6c 100644
--- a/addons/point_of_sale/views/pos_session_view.xml
+++ b/addons/point_of_sale/views/pos_session_view.xml
@@ -177,17 +177,20 @@
         <field name="model">pos.session</field>
         <field name="arch" type="xml">
             <search string="Point of Sale Session">
-                <field name="name" />
-                <filter name="open_sessions" string="Open" domain="[('state', '=', 'opened')]" />
+                <field name="name"/>
+                <field name="config_id" />
+                <field name="user_id" />
+                <filter name="my_sessions" string="My Sessions" domain="[('user_id', '=', uid)]"/>
+                <separator/>    
+                <filter name="open_sessions" string="In Progress" domain="[('state', '=', 'opened')]"/>
                 <separator/>
                 <filter string="Start Today" name="start_at_filter" domain="[
                     ('start_at', '>=', (datetime.datetime.combine(context_today(), datetime.time(0,0,0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S')),
                     ('start_at', '&lt;', (datetime.datetime.combine(context_today() + relativedelta(days=1), datetime.time(0,0,0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S'))]"/>
-                <field name="config_id" />
-                <field name="user_id" />
                 <group expand="0" string="Group By">
-                    <filter string="User" name="user" domain="[]" context="{'group_by' : 'user_id'}" />
-                    <filter string="Point of Sale" name="point_of_sale" domain="[]" context="{'group_by': 'config_id'}" />
+                    <filter string="Responsible" name="user" domain="[]" context="{'group_by' : 'user_id'}"/>
+                    <filter string="Point of Sale" name="point_of_sale" domain="[]" context="{'group_by': 'config_id'}"/>
+                    <filter string="Opening Date" name="start_date" domain="[]" context="{'group_by': 'start_at'}"/>
                 </group>
             </search>
         </field>
diff --git a/addons/pos_hr/views/pos_order_view.xml b/addons/pos_hr/views/pos_order_view.xml
index 8423ecb4384..98b74cba1cc 100644
--- a/addons/pos_hr/views/pos_order_view.xml
+++ b/addons/pos_hr/views/pos_order_view.xml
@@ -17,11 +17,11 @@
         <field name="model">pos.order</field>
         <field name="inherit_id" ref="point_of_sale.view_pos_order_filter"/>
         <field name="arch" type="xml">
-            <xpath expr="//filter[@name='posted']" position='after'>
-                <field name="employee_id"/>
+            <xpath expr="//field[@name='user_id']" position="replace">
+                <field name="cashier"/>
             </xpath>
-            <xpath expr="//filter[@name='customer']" position='after'>
-                <filter string="Cashier" name="employee_id" domain="[]" context="{'group_by':'employee_id'}"/>
+            <xpath expr="//filter[@name='user_id']" position="replace">
+                <filter string="Cashier" name="by_cashier" domain="[]" context="{'group_by': 'cashier'}"/>
             </xpath>
         </field>
     </record>
diff --git a/addons/project/report/project_report_views.xml b/addons/project/report/project_report_views.xml
index 19d86602ee7..a81e86dd51e 100644
--- a/addons/project/report/project_report_views.xml
+++ b/addons/project/report/project_report_views.xml
@@ -62,7 +62,7 @@
                     <field name="user_id"/>
                     <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="stage_id"/>
-                    <filter string="Unassigned" name="unassigned" domain="[('user_id','=',False)]"/>
+                    <filter string="Unassigned" name="unassigned" domain="[('user_id', '=', False)]"/>
                     <separator/>
                     <filter string="New" name="new" domain="[('stage_id.sequence', '&lt;=', 1)]"/>
                     <group expand="0" string="Extended Filters">
@@ -70,13 +70,11 @@
                         <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <group expand="1" string="Group By">
-                        <filter string="Project" name="project" context="{'group_by':'project_id'}"/>
-                        <filter string="Task" name="task" context="{'group_by':'name'}"/>
-                        <filter string="Assigned to" name="User" context="{'group_by':'user_id'}"/>
-                        <filter string="Stage" name="Stage" context="{'group_by':'stage_id'}"/>
-                        <filter string="Company" name="company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <separator/>
-                        <filter string="Assignation Date" name="assignation_month" context="{'group_by':'date_assign:month'}"/>
+                        <filter string="Project" name="project" context="{'group_by': 'project_id'}"/>
+                        <filter string="Assigned to" name="User" context="{'group_by': 'user_id'}"/>
+                        <filter string="Stage" name="Stage" context="{'group_by':' stage_id'}"/>
+                        <filter string="Assignation Date" name="assignation_month" context="{'group_by': 'date_assign:month'}"/>
+                        <filter string="Company" name="company" context="{'group_by': 'company_id'}" groups="base.group_multi_company"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index 56850cce140..072935a00c5 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -16,41 +16,42 @@
             <field name="model">project.task</field>
             <field name="arch" type="xml">
                <search string="Tasks">
-                    <field name="name" string="Tasks"/>
+                    <field name="name" string="Task"/>
                     <field name="tag_ids"/>
-                    <field name="partner_id" operator="child_of"/>
-                    <field name="project_id"/>
                     <field name="user_id"/>
+                    <field name="partner_id" operator="child_of"/>
                     <field name="stage_id"/>
-                    <filter string="My Tasks" name="my_tasks" domain="[('user_id','=',uid)]"/>
-                    <filter string="My Followed Tasks" name="my_followed_tasks" domain="[('message_is_follower', '=', True)]" />
+                    <field name="project_id"/>
+                    <filter string="My Tasks" name="my_tasks" domain="[('user_id', '=', uid)]"/>
+                    <filter string="Followed Tasks" name="my_followed_tasks" domain="[('message_is_follower', '=', True)]" />
                     <filter string="Unassigned" name="unassigned" domain="[('user_id', '=', False)]"/>
                     <separator/>
-                    <filter string="Starred" name="starred" domain="[('priority','in',[1, 2])]"/>
+                    <filter string="Starred" name="starred" domain="[('priority', 'in', [1, 2])]"/>
                     <separator/>
-                    <filter string="Opened" name="opened" domain="[('stage_id.fold','=',False)]"/>
+                    <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction', '=', True)]"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+                    <separator/>
+                    <filter string="My Activities" name="activities_my"
+                        domain="[('activity_ids.user_id', '=', uid)]"/>
                     <separator/>
-                    <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction','=',True)]"/>
-                    <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
                     <filter invisible="1" string="Late Activities" name="activities_overdue"
                         domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
                         help="Show all records which has next action date is before today"/>
                     <filter invisible="1" string="Today Activities" name="activities_today"
                         domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
                     <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
-                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))
-                        ]"/>
+                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
                     <filter string="Exception Activities" name="activities_exception"
                         domain="[('activity_exception_decoration', '!=', False)]"/>
                     <separator/>
                     <filter string="Rated tasks" name="rating_task" domain="[('rating_last_value', '!=', 0.0)]" groups="project.group_project_rating"/>
                     <group expand="0" string="Group By">
-                        <filter string="Project" name="project" context="{'group_by':'project_id'}"/>
-                        <filter string="Task" name="task" context="{'group_by':'name'}"/>
-                        <filter string="Assigned to" name="user" context="{'group_by':'user_id'}"/>
-                        <filter string="Stage" name="stage" context="{'group_by':'stage_id'}"/>
-                        <filter string="Company" name="company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <filter string="Create Date" name="group_create_date" context="{'group_by': 'create_date'}"/>
+                        <filter string="Stage" name="stage" context="{'group_by': 'stage_id'}"/>
+                        <filter string="Assigned to" name="user" context="{'group_by': 'user_id'}"/>
+                        <filter string="Project" name="project" context="{'group_by': 'project_id'}"/>
+                        <filter string="Creation Date" name="group_create_date" context="{'group_by': 'create_date'}"/>
+                        <filter string="Company" name="company" context="{'group_by': 'company_id'}" groups="base.group_multi_company"/>
                     </group>
                 </search>
             </field>
@@ -184,14 +185,14 @@
             <field name="model">project.project</field>
             <field name="arch" type="xml">
                 <search string="Search Project">
-                    <field name="name" string="Project Name"/>
+                    <field name="name" string="Project"/>
+                    <field name="user_id" string="Project Manager"/>
+                    <field name="partner_id" string="Customer" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <filter string="My Favorites" name="my_projects" domain="[('favorite_user_ids', 'in', uid)]"/>
                     <separator/>
-                    <filter string="Followed by Me" name="followed_by_me" domain="[('message_is_follower','=',True)]"/>
+                    <filter string="Followed" name="followed_by_me" domain="[('message_is_follower', '=', True)]"/>
                     <separator/>
-                    <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
-                    <field name="user_id" string="Project Manager"/>
-                    <field name="partner_id" string="Contact" filter_domain="[('partner_id', 'child_of', self)]"/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                     <group expand="0" string="Group By">
                         <filter string="Project Manager" name="Manager" context="{'group_by': 'user_id'}"/>
                         <filter string="Customer" name="Partner" context="{'group_by': 'partner_id'}"/>
diff --git a/addons/purchase/views/purchase_views.xml b/addons/purchase/views/purchase_views.xml
index 4fd68ace317..f42b85bf063 100644
--- a/addons/purchase/views/purchase_views.xml
+++ b/addons/purchase/views/purchase_views.xml
@@ -357,35 +357,73 @@
             <field name="model">purchase.order</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
-                    <field name="name" string="Reference"/>
-                    <field name="partner_ref" optional="hide"/>
+                    <field name="name" string="Order"
+                        filter_domain="['|', '|', ('name', 'ilike', self), ('partner_ref', 'ilike', self), ('partner_id', 'child_of', self)]"/>
                     <field name="partner_id" operator="child_of"/>
-                    <field name="product_id"/>
-                    <field name="create_uid"/>
                     <field name="user_id"/>
-                    <filter name="my_purchases" string="My Purchases" domain="[('user_id','=', uid)]"/>
+                    <field name="product_id"/>
+                    <filter name="my_purchases" string="My Purchases" domain="[('user_id', '=', uid)]"/>
                     <separator/>
-                    <filter name="draft" string="Quotations" domain="[('state','in',('draft','sent','to approve'))]"/>
-                    <filter name="approved" string="Purchase Orders" domain="[('state','in',('purchase','done'))]"/>
+                    <filter name="draft" string="RFQs" domain="[('state', 'in', ('draft', 'sent', 'to approve'))]"/>
+                    <filter name="approved" string="Purchase Orders" domain="[('state', 'in', ('purchase', 'done'))]"/>
                     <filter name="to_approve" string="To Approve" domain="[('state', '=', 'to approve')]"/>
                     <separator/>
-                    <filter name="not_invoiced" string="Waiting Bills" domain="[('invoice_status','=', 'to invoice')]" help="Purchase orders that include lines not invoiced."/>
-                    <filter name="invoiced" string="Bills Received" domain="[('invoice_status','=', 'invoiced')]" help="Purchase orders that have been invoiced."/>
+                    <filter name="order_date" string="Order Date" date="date_order"/>
+                    <separator/>
+                    <filter string="My Activities" name="activities_my"
+                        domain="[('activity_ids.user_id', '=', uid)]"/>
+                    <separator/>
                     <filter invisible="1" string="Late Activities" name="activities_overdue"
                         domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
                         help="Show all records which has next action date is before today"/>
                     <filter invisible="1" string="Today Activities" name="activities_today"
                         domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
                     <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
-                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))
-                        ]"/>
+                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
                     <filter string="Exception Activities" name="activities_exception"
                         domain="[('activity_exception_decoration', '!=', False)]"/>
                     <group expand="0" string="Group By">
-                        <filter string="Vendor" name="vendor" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Purchase Representative" name="representative" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Order Date" name="order_date" domain="[]" context="{'group_by':'date_order'}"/>
-                        <filter string="Expected Date" name="expected_date" domain="[]" context="{'group_by':'date_planned'}"/>
+                        <filter string="Vendor" name="vendor" domain="[]" context="{'group_by': 'partner_id'}"/>
+                        <filter string="Purchase Representative" name="representative" domain="[]" context="{'group_by': 'user_id'}"/>
+                        <filter string="Order Date" name="order_date" domain="[]" context="{'group_by': 'date_order'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="purchase_order_view_search" model="ir.ui.view">
+            <field name="name">purchase.order.select</field>
+            <field name="model">purchase.order</field>
+            <field name="arch" type="xml">
+                <search string="Search Purchase Order">
+                    <field name="name" string="Order"
+                        filter_domain="['|', '|', ('name', 'ilike', self), ('partner_ref', 'ilike', self), ('partner_id', 'child_of', self)]"/>
+                    <field name="partner_id" operator="child_of"/>
+                    <field name="user_id"/>
+                    <field name="product_id"/>
+                    <filter name="my_Orders" string="My Orders" domain="[('user_id', '=', uid)]"/>
+                    <separator/>
+                    <filter name="not_invoiced" string="Waiting Bills" domain="[('invoice_status', '=', 'to invoice')]" help="Purchase orders that include lines not invoiced."/>
+                    <filter name="invoiced" string="Bills Received" domain="[('invoice_status', '=', 'invoiced')]" help="Purchase orders that have been invoiced."/>
+                    <separator/>    
+                    <filter name="order_date" string="Order Date" date="date_order"/>
+                    <separator/>
+                    <filter string="My Activities" name="activities_my"
+                        domain="[('activity_ids.user_id', '=', uid)]"/>
+                    <separator/>
+                    <filter invisible="1" string="Late Activities" name="activities_overdue"
+                        domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
+                        help="Show all records which has next action date is before today"/>
+                    <filter invisible="1" string="Today Activities" name="activities_today"
+                        domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
+                    <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
+                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
+                    <filter string="Exception Activities" name="activities_exception"
+                        domain="[('activity_exception_decoration', '!=', False)]"/>
+                    <group expand="0" string="Group By">
+                        <filter string="Vendor" name="vendor" domain="[]" context="{'group_by': 'partner_id'}"/>
+                        <filter string="Purchase Representative" name="representative" domain="[]" context="{'group_by': 'user_id'}"/>
+                        <filter string="Order Date" name="order_date" domain="[]" context="{'group_by': 'date_order'}"/>
                     </group>
                 </search>
             </field>
@@ -456,6 +494,30 @@
             </field>
         </record>
 
+        <record id="purchase_order_view_tree" model="ir.ui.view">
+            <field name="name">purchase.order.view.tree</field>
+            <field name="model">purchase.order</field>
+            <field name="arch" type="xml">
+                <tree decoration-bf="message_unread==True" decoration-muted="state=='cancel'" decoration-info="state in ('wait','confirmed')" string="Purchase Order">
+                    <field name="message_unread" invisible="1"/>
+                    <field name="partner_ref" optional="hide"/>
+                    <field name="name" string="Reference"/>
+                    <field name="date_order" invisible="not context.get('quotation_only', False)" optional="show"/>
+                    <field name="date_approve" invisible="context.get('quotation_only', False)" optional="show"/>
+                    <field name="partner_id"/>
+                    <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}" optional="show"/>
+                    <field name="date_planned" invisible="context.get('quotation_only', False)" optional="show"/>
+                    <field name="user_id" optional="show"/>
+                    <field name="origin" optional="show"/>
+                    <field name="amount_untaxed" sum="Total Untaxed amount" string="Untaxed" widget="monetary" optional="hide"/>
+                    <field name="amount_total" sum="Total amount" widget="monetary" optional="show"/>
+                    <field name="currency_id" invisible="1"/>
+                    <field name="state" invisible="1"/>
+                    <field name="invoice_status" optional="show"/>
+                </tree>
+            </field>
+        </record>
+
         <record id="purchase_order_view_activity" model="ir.ui.view">
             <field name="name">purchase.order.activity</field>
             <field name="model">purchase.order</field>
@@ -486,6 +548,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_mode">tree,kanban,form,pivot,graph,calendar,activity</field>
+            <field name="view_id" ref="purchase_order_tree"/>
             <field name="domain">[]</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
             <field name="context">{'quotation_only': True}</field>
@@ -507,8 +570,9 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_mode">tree,kanban,form,pivot,graph,calendar,activity</field>
+            <field name="view_id" ref="purchase_order_view_tree"/>
             <field name="domain">[('state','in',('purchase', 'done'))]</field>
-            <field name="search_view_id" ref="view_purchase_order_filter"/>
+            <field name="search_view_id" ref="purchase_order_view_search"/>
             <field name="help" type="html">
               <p class="o_view_nocontent_smiling_face">
                 Create a quotation
diff --git a/addons/purchase_requisition/models/purchase_requisition.py b/addons/purchase_requisition/models/purchase_requisition.py
index c150385114e..9e6b0ff479c 100644
--- a/addons/purchase_requisition/models/purchase_requisition.py
+++ b/addons/purchase_requisition/models/purchase_requisition.py
@@ -45,7 +45,7 @@ class PurchaseRequisition(models.Model):
     def _get_type_id(self):
         return self.env['purchase.requisition.type'].search([], limit=1)
 
-    name = fields.Char(string='Agreement Reference', required=True, copy=False, default='New', readonly=True)
+    name = fields.Char(string='Reference', required=True, copy=False, default='New', readonly=True)
     origin = fields.Char(string='Source Document')
     order_count = fields.Integer(compute='_compute_orders_number', string='Number of Orders')
     vendor_id = fields.Many2one('res.partner', string="Vendor", domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]")
@@ -53,11 +53,12 @@ class PurchaseRequisition(models.Model):
     ordering_date = fields.Date(string="Ordering Date", tracking=True)
     date_end = fields.Datetime(string='Agreement Deadline', tracking=True)
     schedule_date = fields.Date(string='Delivery Date', index=True, help="The expected and scheduled delivery date where all the products are received", tracking=True)
-    user_id = fields.Many2one('res.users', string='Purchase Representative', default= lambda self: self.env.user)
+    user_id = fields.Many2one('res.users', string='Purchase Representative', default=lambda self: self.env.user)
     description = fields.Text()
     company_id = fields.Many2one('res.company', string='Company', required=True, default=lambda self: self.env.company)
     purchase_ids = fields.One2many('purchase.order', 'requisition_id', string='Purchase Orders', states={'done': [('readonly', True)]})
     line_ids = fields.One2many('purchase.requisition.line', 'requisition_id', string='Products to Purchase', states={'done': [('readonly', True)]}, copy=True)
+    product_id = fields.Many2one('product.product', related='line_ids.product_id', string='Product', readonly=False)
     state = fields.Selection(PURCHASE_REQUISITION_STATES,
                               'Status', tracking=True, required=True,
                               copy=False, default='draft')
diff --git a/addons/purchase_requisition/views/purchase_requisition_views.xml b/addons/purchase_requisition/views/purchase_requisition_views.xml
index 792a2f5ca00..92896f8f204 100644
--- a/addons/purchase_requisition/views/purchase_requisition_views.xml
+++ b/addons/purchase_requisition/views/purchase_requisition_views.xml
@@ -259,14 +259,15 @@
             <field name="model">purchase.requisition</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Agreements">
-                    <field name="name" string="Purchase Agreements" filter_domain="['|', ('name','ilike',self), ('origin','ilike',self)]"/>
-                    <field name="type_id"/>
-                    <filter name="draft" string="Draft" domain="[('state','=','draft')]" help="New Agreements"/>
-                    <filter string="Confirmed" name="confirmed" domain="[('state','in',('in_progress','open'))]" help="In negotiation"/>
-                    <filter string="Done" name="done" domain="[('state','=','done')]"/>
+                    <field name="name" string="Reference" filter_domain="['|', ('name', 'ilike', self), ('origin', 'ilike', self)]"/>
+                    <field name="user_id"/>
+                    <field name="product_id"/>
+                    <filter string="My Agreements" name="my_agreements" domain="[('user_id', '=', uid)]"/>
+                    <separator/>
+                    <filter string="Draft" name="draft" domain="[('state', '=', 'draft')]" help="New Agreements"/>
+                    <filter string="Confirmed" name="confirmed" domain="[('state', 'in', ('in_progress', 'open'))]" help="In negotiation"/>
+                    <filter string="Done" name="done" domain="[('state', '=', 'done')]"/>
                     <separator/>
-                    <filter string="Unassigned" name="unassigned" domain="[('user_id','=', False)]" help="Unassigned  Requisition"/>
-                    <filter string="My Agreements" name="my_agreements" domain="[('user_id','=', uid)]"/>
                     <filter invisible="1" string="Late Activities" name="activities_overdue"
                         domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
                         help="Show all records which has next action date is before today"/>
@@ -276,13 +277,10 @@
                         domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
                     <filter string="Exception Activities" name="activities_exception"
                         domain="[('activity_exception_decoration', '!=', False)]"/>
-                    <field name="user_id" />
                     <group expand="0" string="Group By">
-                        <filter string="Purchase Representative" name="representative" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Source" name="source" domain="[]" context="{'group_by':'origin'}"/>
-                        <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Ordering Date" name="ordering_date" domain="[]" context="{'group_by':'ordering_date'}"/>
-                        <filter string="End Date" name="end_month" domain="[]" context="{'group_by':'date_end'}"/>
+                        <filter string="Purchase Representative" name="representative" domain="[]" context="{'group_by': 'user_id'}"/>
+                        <filter string="Status" name="status" domain="[]" context="{'group_by': 'state'}"/>
+                        <filter string="Ordering Date" name="ordering_date" domain="[]" context="{'group_by': 'ordering_date'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/repair/views/repair_views.xml b/addons/repair/views/repair_views.xml
index e1cd6e9f6f2..bfb7fd40941 100644
--- a/addons/repair/views/repair_views.xml
+++ b/addons/repair/views/repair_views.xml
@@ -241,40 +241,39 @@
     </record>
 
     <record id="view_repair_order_form_filter" model="ir.ui.view">
-          <field name="name">repair.select</field>
-          <field name="model">repair.order</field>
-          <field name="arch" type="xml">
-              <search string="Search Repair Orders">
-                  <field name="name" string="Repair Orders"/>
-                  <field name="state"/>
-                  <filter string="Quotations" name="quotations" domain="[('state','=','draft')]"/>
-                  <filter string="Confirmed" domain="[('state','=','confirmed')]" name="current" />
-                  <filter string="Ready To Repair" name="ready_to_repair" domain="[('state','=','ready')]"/>
-                  <separator/>
-                  <filter string="Invoiced" name="invoiced" domain="[('invoiced','=',True)]"/>
-                  <field name="product_id"/>
-                  <field name="operations"/>
-                  <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
-                  <filter invisible="1" string="Late Activities" name="activities_overdue"
-                      domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
-                      help="Show all records which has next action date is before today"/>
-                  <filter invisible="1" string="Today Activities" name="activities_today"
-                      domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
-                  <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
-                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))
-                        ]"/>
-                  <filter string="Exception Activities" name="activities_exception"
-                        domain="[('activity_exception_decoration', '!=', False)]"/>
-                  <group expand="0" string="Group By">
-                      <filter string="Partner" name="partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                      <filter string="Create Date" name="createDate" domain="[]" context="{'group_by': 'create_date'}"/>
-                      <filter string="Product" name="product" domain="[]" context="{'group_by':'product_id'}"/>
-                      <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/>
-                      <filter string="Warranty Expiration" name="guarantee_limit" domain="[]" context="{'group_by':'guarantee_limit'}"/>
-                      <filter string="Company" name="company" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                  </group>
-              </search>
-          </field>
+        <field name="name">repair.select</field>
+        <field name="model">repair.order</field>
+        <field name="arch" type="xml">
+            <search string="Search Repair Orders">
+                <field name="name" string="Repair Order" filter_domain="['|', ('name', 'ilike', self), ('product_id', 'ilike', self)]"/>
+                <field name="product_id"/>
+                <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
+                <filter string="Quotations" name="quotations" domain="[('state', '=', 'draft')]"/>
+                <filter string="Confirmed" domain="[('state', '=', 'confirmed')]" name="current" />
+                <filter string="Ready To Repair" name="ready_to_repair" domain="[('state', '=', 'ready')]"/>
+                <separator/>
+                <filter string="Invoiced" name="invoiced" domain="[('invoiced', '=', True)]"/>
+                <separator/>
+                <filter string="My Activities" name="activities_my" domain="[('activity_ids.user_id', '=', uid)]"/>
+                <separator/>
+                <filter invisible="1" string="Late Activities" name="activities_overdue"
+                    domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
+                    help="Show all records which has next action date is before today"/>
+                <filter invisible="1" string="Today Activities" name="activities_today"
+                    domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
+                <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
+                    domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
+                <filter string="Exception Activities" name="activities_exception"
+                    domain="[('activity_exception_decoration', '!=', False)]"/>
+                <group expand="0" string="Group By">
+                    <filter string="Customer" name="partner" domain="[]" context="{'group_by': 'partner_id'}"/>
+                    <filter string="Product" name="product" domain="[]" context="{'group_by': 'product_id'}"/>
+                    <filter string="Status" name="status" domain="[]" context="{'group_by': 'state'}"/>
+                    <filter string="Warranty Expiration" name="guarantee_limit" domain="[]" context="{'group_by': 'guarantee_limit'}"/>
+                    <filter string="Company" name="company" domain="[]" context="{'group_by': 'company_id'}" groups="base.group_multi_company"/>
+                </group>
+            </search>
+        </field>
     </record>
 
     <record id="view_repair_graph" model="ir.ui.view">
diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml
index c3ac5ec6e64..7933255c4a7 100644
--- a/addons/sale/views/sale_views.xml
+++ b/addons/sale/views/sale_views.xml
@@ -685,37 +685,37 @@
                 </xpath>
             </field>
         </record>
+
         <record id="view_sales_order_filter" model="ir.ui.view">
             <field name="name">sale.order.list.select</field>
             <field name="model">sale.order</field>
             <field name="priority" eval="15"/>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
-                    <field name="name" string="Sales Order" filter_domain="['|','|',('name','ilike',self),('client_order_ref','ilike',self),('partner_id','child_of',self)]"/>
+                    <field name="name" string="Order" filter_domain="['|', '|', ('name', 'ilike', self), ('client_order_ref', 'ilike', self), ('partner_id', 'child_of', self)]"/>
                     <field name="partner_id" operator="child_of"/>
                     <field name="user_id"/>
                     <field name="team_id" string="Sales Team"/>
+                    <field name="order_line" string="Product" filter_domain="[('order_line.product_id', 'ilike', self)]"/>
                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                     <!-- We only allow to search on the following sale order line fields (product, name) because the other fields, such as price, quantity, ...
                         will not be searched as often, and if they need to be searched it's usually in the context of products
                         and then they can be searched from the page listing the sale order lines related to a product (from the product itself).
                     -->
-                    <field name="order_line" string="Product" filter_domain="[('order_line.product_id', 'ilike', self)]"/>
-                    <filter string="My Orders" domain="[('user_id','=',uid)]" name="my_sale_orders_filter"/>
+                    <filter string="My Orders" domain="[('user_id', '=', uid)]" name="my_sale_orders_filter"/>
                     <filter invisible="1" string="Late Activities" name="activities_overdue"
                         domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
                         help="Show all records which has next action date is before today"/>
                     <filter invisible="1" string="Today Activities" name="activities_today"
                         domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
                     <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
-                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))
-                        ]"/>
+                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
                     <filter string="Exception Activities" name="activities_exception"
                         domain="[('activity_exception_decoration', '!=', False)]"/>
                     <group expand="0" string="Group By">
-                        <filter string="Salesperson" name="salesperson" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter name="customer" string="Customer" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Order Date" name="order_month" domain="[]" context="{'group_by':'date_order'}"/>
+                        <filter string="Salesperson" name="salesperson" domain="[]" context="{'group_by': 'user_id'}"/>
+                        <filter name="customer" string="Customer" domain="[]" context="{'group_by': 'partner_id'}"/>
+                        <filter string="Order Date" name="order_month" domain="[]" context="{'group_by': 'date_order'}"/>
                     </group>
                </search>
             </field>
diff --git a/addons/sale_coupon/views/sale_coupon_program_views.xml b/addons/sale_coupon/views/sale_coupon_program_views.xml
index 3a7125aec84..db87e052f84 100644
--- a/addons/sale_coupon/views/sale_coupon_program_views.xml
+++ b/addons/sale_coupon/views/sale_coupon_program_views.xml
@@ -125,9 +125,10 @@
         <field name="arch" type="xml">
             <search>
                 <field name="name"/>
+                <filter string="Expired" name="expired" domain="[('rule_date_to', '&lt;', datetime.datetime.now())]" help="Expired Programs"/>
+                <separator/>
                 <filter string="Active" name="active" domain="[('active', '=', True)]" help="Opened Programs"/>
                 <filter string="Closed" name="closed" domain="[('active', '=', False)]" help="Closed Programs"/>
-                <filter string="Expired" name="expired" domain="[('rule_date_to', '&lt;', datetime.datetime.now())]" help="Expired Programs"/>
             </search>
         </field>
     </record>
diff --git a/addons/sale_timesheet/views/hr_timesheet_views.xml b/addons/sale_timesheet/views/hr_timesheet_views.xml
index 64a5f86b1f5..cbba736a967 100644
--- a/addons/sale_timesheet/views/hr_timesheet_views.xml
+++ b/addons/sale_timesheet/views/hr_timesheet_views.xml
@@ -7,8 +7,6 @@
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
             <field name="arch" type="xml">
                 <xpath expr="//filter[@name='month']" position="before">
-                    <field name="timesheet_invoice_type"/>
-                    <field name="timesheet_invoice_id"/>
                     <filter name="billable_time" string="Billed on Timesheets" domain="[('timesheet_invoice_type', '=', 'billable_time')]"/>
                     <filter name="billable_fixed" string="Billed at a Fixed Price" domain="[('timesheet_invoice_type', '=', 'billable_fixed')]"/>
                     <filter name="non_billable" string="Non Billable Tasks" domain="[('timesheet_invoice_type', '=', 'non_billable')]"/>
diff --git a/addons/sale_timesheet/views/project_task_views.xml b/addons/sale_timesheet/views/project_task_views.xml
index 89e89b004b1..eae595102b3 100644
--- a/addons/sale_timesheet/views/project_task_views.xml
+++ b/addons/sale_timesheet/views/project_task_views.xml
@@ -43,18 +43,6 @@
         </field>
     </record>
 
-    <record id="project_project_view_search" model="ir.ui.view">
-        <field name="name">project.project.search.inherit</field>
-        <field name="model">project.project</field>
-        <field name="inherit_id" ref="project.view_project_project_filter"/>
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='name']" position="after">
-                <field name="display_name" filter_domain="[('name','=',self)]" string="Exact name"/>
-                <field name="sale_line_id"/>
-            </xpath>
-        </field>
-    </record>
-
         <record id="view_sale_service_inherit_form2" model="ir.ui.view">
             <field name="name">sale.service.form.view.inherit</field>
             <field name="model">project.task</field>
@@ -102,9 +90,8 @@
         <field name="model">project.task</field>
         <field name="inherit_id" ref="project.view_task_search_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='stage_id']" position="after">
-                <field name="sale_line_id"/>
-                <field name="sale_order_id"/>
+            <xpath expr="//field[@name='stage_id']" position="before">
+                <field name="sale_order_id" string="Sale Order" filter_domain="['|', ('sale_order_id', 'ilike', self), ('sale_line_id', 'ilike', self)]"/>
             </xpath>
         </field>
     </record>
diff --git a/addons/stock/views/stock_inventory_views.xml b/addons/stock/views/stock_inventory_views.xml
index 68dcafb8fa3..60bed4e131d 100644
--- a/addons/stock/views/stock_inventory_views.xml
+++ b/addons/stock/views/stock_inventory_views.xml
@@ -100,19 +100,18 @@
         <field name="model">stock.inventory</field>
         <field name="arch" type="xml">
             <search string="Search Inventory">
-                <field name="name" string="Inventory Reference"/>
-                <field name="date"/>
-                <field name="company_id" groups="base.group_multi_company"/>
-                <field name="product_ids" string="Inventory Product" filter_domain="['|', ('product_ids', 'ilike', self), ('line_ids.product_id','ilike',self)]"/>
+                <field name="name" string="Reference"/>
+                <field name="product_ids" string="Product" filter_domain="['|', ('product_ids', 'ilike', self), ('line_ids.product_id','ilike',self)]"/>
                 <filter string="Draft" name="draft" domain="[('state', '=', 'draft')]"/>
                 <filter string="In Progress" name="confirm" domain="[('state', '=', 'confirm')]"/>
                 <filter string="Validated" name="done" domain="[('state', '=', 'done')]"/>
+                <separator/>
+                <filter string="Inventory Date" name="inventory_date" date="date"/>
                 <group expand="0" string="Group By">
-                    <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Inventories Date" name="inventories_month" domain="[]" context="{'group_by':'date'}" help="Physical Inventories by Date"/>
+                    <filter string="Status" name="status" domain="[]" context="{'group_by': 'state'}"/>
+                    <filter string="Inventory Date" name="inventories_month" domain="[]" context="{'group_by': 'date'}" help="Physical Inventories by Date"/>
                 </group>
             </search>
-
         </field>
     </record>
 
@@ -127,6 +126,7 @@
                 <field name="product_ids" widget="many2many_tags" optional="hide"/>
                 <field name="company_id" groups="base.group_multi_company" optional="show"/>
                 <field name="state"/>
+                <field name="company_id" groups="base.group_multi_company"/>
             </tree>
         </field>
     </record>
diff --git a/addons/stock/views/stock_move_line_views.xml b/addons/stock/views/stock_move_line_views.xml
index 4dfed49dd49..64ac5cd5b8f 100644
--- a/addons/stock/views/stock_move_line_views.xml
+++ b/addons/stock/views/stock_move_line_views.xml
@@ -68,21 +68,21 @@
             <search string="Stock Moves">
                 <field name="picking_id" string="Reference"/>
                 <field name="product_id"/>
-                <field name="location_id" groups="stock.group_stock_multi_locations"/>
-                <field name="location_dest_id" groups="stock.group_stock_multi_locations"/>
+                <field name="location_id" string="Source Location" groups="stock.group_stock_multi_locations"/>
+                <field name="location_dest_id" string="Destination Location" groups="stock.group_stock_multi_locations"/>
                 <separator/>
-                <filter string="To Do" name="todo" domain="[('state','not in', ['done', 'draft'])]"/>
-                <filter string="Done" name="done" domain="[('state','=','done')]"/>
+                <filter string="To Do" name="todo" domain="[('state', 'not in', ['done', 'draft'])]"/>
+                <filter string="Done" name="done" domain="[('state', '=', 'done')]"/>
                 <separator/>
-                <filter string="Receptions" name="incoming" domain="[('picking_id.picking_type_id.code','=','incoming')]"/>
-                <filter string="Deliveries" name="outgoing" domain="[('picking_id.picking_type_id.code','=','outgoing')]"/>
-                <filter string="Internal" name="internal" domain="[('picking_id.picking_type_id.code','=','internal')]"/>
-                <filter string="Manufacturing" name="manufacturing" domain="[('picking_id.picking_type_id.code','=','mrp_operation')]"/>
-
+                <filter string="Incoming" name="incoming" domain="[('picking_id.picking_type_id.code', '=', 'incoming')]"/>
+                <filter string="Outgoing" name="outgoing" domain="[('picking_id.picking_type_id.code', '=', 'outgoing')]"/>
+                <filter string="Internal" name="internal" domain="[('picking_id.picking_type_id.code', '=', 'internal')]"/>
+                <filter string="Manufacturing" name="manufacturing" domain="[('picking_id.picking_type_id.code', '=', 'mrp_operation')]"/>
                 <separator/>
                 <group expand="0" string="Group By">
-                    <filter string="Status" name="by_state" domain="[]"  context="{'group_by':'state'}"/>
                     <filter string="Product" name="groupby_product_id" domain="[]" context="{'group_by': 'product_id'}"/>
+                    <filter string="Status" name="by_state" domain="[]"  context="{'group_by': 'state'}"/>
+                    <filter string="Date" name="by_date" domain="[]" context="{'group_by': 'date'}"/>
                 </group>
             </search>
         </field>
diff --git a/addons/stock/views/stock_move_views.xml b/addons/stock/views/stock_move_views.xml
index fde8c1a3793..da374c015bb 100644
--- a/addons/stock/views/stock_move_views.xml
+++ b/addons/stock/views/stock_move_views.xml
@@ -364,25 +364,23 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <field name="origin" filter_domain="['|', '|', ('origin', 'ilike', self), ('name', 'ilike', self), ('picking_id', 'ilike', self)]" string="Reference"/>
-                    <field name="date" groups="base.group_no_one"/>
-
+                    <field name="product_id"/>
+                    <field name="name" string="Location" filter_domain="['|',('location_id', 'ilike', self),('location_dest_id', 'ilike', self)]"/>
+                    <field name="partner_id" string="Partner" filter_domain="[('picking_id.partner_id', 'child_of', self)]"/>
                     <filter string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/>
                     <filter string="To Do" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
                     <filter string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
                     <separator/>
-                    <filter string="Date" name="today" date="date" help="Scheduled or processing date"/>
-                    <separator/>
                     <filter string="Incoming" name="incoming" domain="[('location_id.usage', 'not in', ('internal', 'transit')), ('location_dest_id.usage', 'in', ('internal', 'transit'))]"/>
                     <filter string="Outgoing" name="outgoing" domain="[('location_id.usage', 'in', ('internal', 'transit')), ('location_dest_id.usage', 'not in', ('internal', 'transit'))]"/>
-                    <field name="product_id"/>
-                    <field name="name" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
-                    <field name="partner_id" string="Partner"  filter_domain="[('picking_id.partner_id','child_of',self)]"/>
+                    <separator/>
+                    <filter string="Date" name="today" date="date" help="Scheduled or processing date"/>
                     <group expand="0" string="Group By">
-                        <filter string="Product" name="by_product" domain="[]"  context="{'group_by':'product_id'}"/>
-                        <filter string="Picking" name="groupby_picking_id" domain="[]"  context="{'group_by':'picking_id'}"/>
+                        <filter string="Product" name="by_product" domain="[]"  context="{'group_by': 'product_id'}"/>
+                        <filter string="Picking" name="groupby_picking_id" domain="[]"  context="{'group_by': 'picking_id'}"/>
                         <filter string="Source Location" name="groupby_location_id" domain="[]" context="{'group_by': 'location_id'}" groups="stock.group_stock_multi_locations"/>
                         <filter string="Destination Location" name="groupby_dest_location_id" domain="[]" context="{'group_by': 'location_dest_id'}" groups="stock.group_stock_multi_locations"/>
-                        <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" name="status" domain="[]" context="{'group_by': 'state'}"/>
                         <filter string="Creation Date" name="groupby_create_date" domain="[]" context="{'group_by': 'create_date'}" groups="base.group_no_one"/>
                         <filter string="Scheduled Date" name="groupby_date" domain="[]" context="{'group_by': 'date_expected'}"/>
                     </group>
diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index a484d509a97..33ed8da051e 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -6,7 +6,6 @@
             <field name="arch" type="xml">
                 <search string="Operation Type">
                     <field name="name"/>
-                    <field name="sequence_id"/>
                     <field name="warehouse_id"/>
                     <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
                     <group expand="0" string="Group By">
@@ -373,19 +372,21 @@
             <field name="model">stock.picking</field>
             <field name="arch" type="xml">
                 <search string="Picking Lists">
-                    <field name="name" string="Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
-                    <filter name="my_transfers" string="My Transfers" domain="[('user_id','=',uid)]"/>
-                    <filter name="unassigned_transfers" string="Unassigned Transfers" domain="[('user_id','=',False)]"/>
+                    <field name="name" string="Transfer" filter_domain="['|', ('name', 'ilike', self), ('origin', 'ilike', self)]"/>
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
+                    <field name="origin"/>
+                    <field name="product_id"/>
+                    <filter name="my_transfers" string="My Transfers" domain="[('user_id', '=', uid)]"/>
                     <separator/>
-                    <filter name="draft" string="Draft" domain="[('state','=','draft')]" help="Draft Moves"/>
-                    <filter name="waiting" string="Waiting" domain="[('state','in', ('confirmed', 'waiting'))]" help="Waiting Moves"/>
-                    <filter name="available" string="Ready" domain="[('state','in',('assigned', 'partially_available'))]" help="Assigned Moves"/>
-                    <filter name="done" string="Done" domain="[('state','=','done')]" help="Transfers already processed"/>
-                    <filter name="cancel" string="Cancelled" domain="[('state','=', 'cancel')]" help="Cancelled Moves"/>
+                    <filter name="draft" string="Draft" domain="[('state', '=', 'draft')]" help="Draft Moves"/>
+                    <filter name="waiting" string="Waiting" domain="[('state', 'in', ('confirmed', 'waiting'))]" help="Waiting Moves"/>
+                    <filter name="available" string="Ready" domain="[('state', 'in', ('assigned', 'partially_available'))]" help="Assigned Moves"/>
+                    <filter name="done" string="Done" domain="[('state', '=', 'done')]" help="Pickings already processed"/>
+                    <filter name="cancel" string="Cancelled" domain="[('state', '=', 'cancel')]" help="Cancelled Moves"/>
                     <separator/>
                     <filter name="late" string="Late" domain="[('scheduled_date','&lt;', time.strftime('%%Y-%%m-%%d %%H:%%M:%%S')), ('state', 'in', ('assigned', 'waiting', 'confirmed'))]" help="Transfers that are late on scheduled time"/>
                     <separator/>
-                    <filter name="backorder" string="Backorders" domain="[('backorder_id','!=', False), ('state', 'in', ('assigned', 'waiting', 'confirmed'))]" help="Remaining parts of picking partially processed"/>
+                    <filter name="backorder" string="Backorders" domain="[('backorder_id', '!=', False), ('state', 'in', ('assigned', 'waiting', 'confirmed'))]" help="Remaining parts of picking partially processed"/>
                     <separator/>
                     <filter invisible="1" string="Late Activities" name="activities_overdue"
                         domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
@@ -393,20 +394,14 @@
                     <filter invisible="1" string="Today Activities" name="activities_today"
                         domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
                     <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
-                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))
-                        ]"/>
+                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
                     <filter string="Exception Activities" name="activities_exception"
                         domain="[('activity_exception_decoration', '!=', False)]"/>
-                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
-                    <field name="product_id"/>
-                    <field name="picking_type_id"/>
-                    <field name="group_id"/>
                     <group expand="0" string="Group By">
-                        <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Order Date" name="order_date" domain="[]"  context="{'group_by':'date'}"/>
+                        <filter string="Status" name="status" domain="[]" context="{'group_by': 'state'}"/>
                         <filter string="Scheduled Date" name="expected_date" domain="[]" context="{'group_by': 'scheduled_date'}"/>
-                        <filter string="Origin" name="origin" domain="[]" context="{'group_by':'origin'}"/>
-                        <filter name="picking_type" string="Operation Type" domain="[]" context="{'group_by':'picking_type_id'}"/>
+                        <filter string="Source Document" name="origin" domain="[]" context="{'group_by': 'origin'}"/>
+                        <filter string="Operation Type" name="picking_type" domain="[]" context="{'group_by': 'picking_type_id'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/stock/views/stock_production_lot_views.xml b/addons/stock/views/stock_production_lot_views.xml
index f6a095b0528..7caf76f7dde 100644
--- a/addons/stock/views/stock_production_lot_views.xml
+++ b/addons/stock/views/stock_production_lot_views.xml
@@ -64,10 +64,10 @@
         <field name="model">stock.production.lot</field>
         <field name="arch" type="xml">
             <search string="Product Lots Filter">
-                <field name="name" string="Product Lots" filter_domain="['|',('name','ilike',self),('ref','ilike',self)]"/>
+                <field name="name" string="Lot/Serial Number" filter_domain="['|', ('name', 'ilike', self),('ref', 'ilike', self)]"/>
                 <field name="product_id"/>
                 <group expand="0" string="Group By">
-                    <filter name="group_by_product" string="Product" domain="[]" context="{'group_by':'product_id'}"/>
+                    <filter name="group_by_product" string="Product" domain="[]" context="{'group_by': 'product_id'}"/>
                 </group>
             </search>
         </field>
diff --git a/addons/stock/views/stock_quant_views.xml b/addons/stock/views/stock_quant_views.xml
index 2730d0b15b9..d913bd15559 100644
--- a/addons/stock/views/stock_quant_views.xml
+++ b/addons/stock/views/stock_quant_views.xml
@@ -191,7 +191,6 @@
                 <group  expand='0' string='Group by...'>
                    <filter string='Location' name="location" domain="[]" context="{'group_by' : 'location_id'}"/>
                    <filter string='Packaging' name="packaging" domain="[]" context="{'group_by' : 'packaging_id'}"/>
-                   <filter string='Company' name="company" domain="[]" context="{'group_by' : 'company_id'}" groups="base.group_multi_company"/>
                </group>
             </search>
         </field>
diff --git a/addons/stock/views/stock_warehouse_views.xml b/addons/stock/views/stock_warehouse_views.xml
index 658f0b262f5..8eac7b41826 100644
--- a/addons/stock/views/stock_warehouse_views.xml
+++ b/addons/stock/views/stock_warehouse_views.xml
@@ -65,6 +65,7 @@
                 </form>
             </field>
         </record>
+
         <record id="stock_warehouse_view_form_editable" model="ir.ui.view">
             <field name="name">stock.warehouse.form.editable</field>
             <field name="model">stock.warehouse</field>
@@ -76,6 +77,7 @@
                 </xpath>
             </field>
         </record>
+
         <record id="view_warehouse_tree" model="ir.ui.view">
             <field name="name">stock.warehouse.tree</field>
             <field name="model">stock.warehouse</field>
@@ -90,6 +92,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="stock_warehouse_view_tree_editable" model="ir.ui.view">
             <field name="name">stock.warehouse.tree.editable</field>
             <field name="model">stock.warehouse</field>
@@ -101,6 +104,7 @@
                 </xpath>
             </field>
         </record>
+
         <record id="stock_warehouse_view_search" model="ir.ui.view">
             <field name="name">stock.warehouse.search</field>
             <field name="model">stock.warehouse</field>
@@ -111,6 +115,7 @@
                 </search>
             </field>
         </record>
+
         <record id="action_warehouse_form" model="ir.actions.act_window">
             <field name="name">Warehouses</field>
             <field name="res_model">stock.warehouse</field>
@@ -122,6 +127,7 @@
               </p>
             </field>
         </record>
+
         <menuitem action="action_warehouse_form" id="menu_action_warehouse_form"
             parent="menu_warehouse_config" sequence="1"/>
 
@@ -182,15 +188,15 @@
             <field name="model">stock.warehouse.orderpoint</field>
             <field name="arch" type="xml">
                 <search string="Reordering Rules Search">
-                    <field name="name" string="Reordering Rules"/>
+                    <field name="name" string="Reordering Rule"/>
+                    <field name="product_id"/>
                     <field name="warehouse_id" groups="stock.group_stock_multi_warehouses"/>
                     <field name="location_id" groups="stock.group_stock_multi_locations"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="product_id"/>
-                    <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                     <group expand="0" string="Group By">
-                        <filter string="Warehouse" name="warehouse" domain="[]"  context="{'group_by':'warehouse_id'}" groups="stock.group_stock_multi_warehouses"/>
-                        <filter string="Location" name="location" domain="[]" context="{'group_by':'location_id'}" groups="stock.group_stock_multi_locations"/>
+                        <filter string="Warehouse" name="warehouse" domain="[]"  context="{'group_by': 'warehouse_id'}" groups="stock.group_stock_multi_warehouses"/>
+                        <filter string="Location" name="location" domain="[]" context="{'group_by': 'location_id'}" groups="stock.group_stock_multi_locations"/>
+                        <filter string="Product" name="product" domain="[]" context="{'group_by': 'product_id'}"/>
                     </group>
                 </search>
             </field>
@@ -265,6 +271,7 @@
               </p>
             </field>
         </record>
+
         <menuitem
             id="menu_reordering_rules_config"
             action="action_orderpoint_form"
diff --git a/addons/stock_landed_costs/views/stock_landed_cost_views.xml b/addons/stock_landed_costs/views/stock_landed_cost_views.xml
index 1a90e78e969..edeaab0e7ad 100644
--- a/addons/stock_landed_costs/views/stock_landed_cost_views.xml
+++ b/addons/stock_landed_costs/views/stock_landed_cost_views.xml
@@ -178,10 +178,13 @@
             <field name="arch" type="xml">
                 <search string="Landed Costs">
                     <field name="name" string="Name"/>
-                    <field name="date"/>
+                    <field name="picking_ids" string="Picking"/>
+                    <separator/>
+                    <filter string="Draft" name="draft" domain="[('state', '=', 'draft')]"/>
+                    <filter string="Done" name="done" domain="[('state', '=', 'done')]"/>
+                    <separator/>
+                    <filter string="Date" name="date" date="date"/>
                     <separator/>
-                    <filter string="Draft" name="draft" domain="[('state','=','draft')]"/>
-                    <filter string="Done" name="done" domain="[('state','=','done')]"/>
                     <filter invisible="1" string="Late Activities" name="activities_overdue"
                         domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
                         help="Show all records which has next action date is before today"/>
@@ -192,8 +195,8 @@
                     <filter string="Exception Activities" name="activities_exception"
                         domain="[('activity_exception_decoration', '!=', False)]"/>
                     <group expand="0" string="Group By">
-                        <filter string="Date" name="group_by_month" context="{'group_by': 'date'}"/>
                         <filter string="Status" name="status" context="{'group_by': 'state'}"/>
+                        <filter string="Date" name="group_by_month" context="{'group_by': 'date'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/stock_picking_batch/models/stock_picking_batch.py b/addons/stock_picking_batch/models/stock_picking_batch.py
index fd501d67492..4e659302bf5 100644
--- a/addons/stock_picking_batch/models/stock_picking_batch.py
+++ b/addons/stock_picking_batch/models/stock_picking_batch.py
@@ -12,7 +12,7 @@ class StockPickingBatch(models.Model):
     _order = "name desc"
 
     name = fields.Char(
-        string='Batch Transfer Name', default='New',
+        string='Batch Transfer', default='New',
         copy=False, required=True,
         help='Name of the batch transfer')
     user_id = fields.Many2one(
diff --git a/addons/stock_picking_batch/views/stock_picking_batch_views.xml b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
index 1932b49a00a..df80adc0550 100644
--- a/addons/stock_picking_batch/views/stock_picking_batch_views.xml
+++ b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
@@ -91,8 +91,11 @@
         <field name="arch" type="xml">
             <search string="Search Batch Transfer">
                 <field name="name" string="Batch Transfer"/>
-                <filter name="in_progress" string="Running" domain="[('state', '=', 'in_progress')]" help="Batch Transfers not finished"/>
                 <field name="user_id"/>
+                <filter name="draft" string="Draft" domain="[('state', '=', 'draft')]"/>
+                <filter name="in_progress" string="Running" domain="[('state', '=', 'in_progress')]" help="Batch Transfers not finished"/>
+                <filter name="done" string="Done" domain="[('state', '=', 'done')]"/>
+                <separator/>
                 <filter invisible="1" string="Late Activities" name="activities_overdue"
                     domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
                     help="Show all records which has next action date is before today"/>
@@ -101,10 +104,10 @@
                 <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
                     domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
                 <filter string="Exception Activities" name="activities_exception"
-                        domain="[('activity_exception_decoration', '!=', False)]"/>
+                    domain="[('activity_exception_decoration', '!=', False)]"/>
                 <group expand="0" string="Group By">
                     <filter string="Responsible" name="user" domain="[]" context="{'group_by': 'user_id'}"/>
-                    <filter string="State" name="state" domain="[]" context="{'group_by':'state'}"/>
+                    <filter string="State" name="state" domain="[]" context="{'group_by': 'state'}"/>
                 </group>
            </search>
         </field>
@@ -144,7 +147,7 @@
         <field name="model">stock.picking</field>
         <field name="inherit_id" ref="stock.view_picking_internal_search"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='picking_type_id']" position="after">
+            <xpath expr="//field[@name='product_id']" position="after">
                 <field name="batch_id"/>
             </xpath>
         </field>
diff --git a/addons/survey/views/survey_survey_views.xml b/addons/survey/views/survey_survey_views.xml
index 83e515255ce..c41aa840223 100644
--- a/addons/survey/views/survey_survey_views.xml
+++ b/addons/survey/views/survey_survey_views.xml
@@ -206,19 +206,22 @@
         <field name="model">survey.survey</field>
         <field name="arch" type="xml">
             <search string="Survey">
-                <field string="Title" name="title"/>
-                <filter string="Is a certification?" name="certificate" domain="[('certificate','=',True)]"/>
-                <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
+                <field string="Survey" name="title"/>
+                <filter string="Certification" name="certificate" domain="[('certificate', '=', True)]"/>
+                <separator/>
+                <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+                <separator/>
+                <filter string="My Activities" name="activities_my" domain="[('activity_ids.user_id', '=', uid)]"/>
+                <separator/>
                 <filter invisible="1" string="Late Activities" name="activities_overdue"
                     domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
                     help="Show all records which has next action date is before today"/>
                 <filter invisible="1" string="Today Activities" name="activities_today"
                     domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
                 <filter invisible="1" string="Upcoming Activities" name="activities_upcoming_all"
-                    domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))
-                    ]"/>
+                    domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
                 <filter string="Exception Activities" name="activities_exception"
-                        domain="[('activity_exception_decoration', '!=', False)]"/>
+                    domain="[('activity_exception_decoration', '!=', False)]"/>
                 <group expand="0" string="Group By">
                     <filter string="Category" name="groupby_category" context="{'group_by': 'category'}"/>
                     <filter string="State" name="groupby_state" context="{'group_by': 'state'}"/>
diff --git a/addons/uom/views/uom_uom_views.xml b/addons/uom/views/uom_uom_views.xml
index 83d89eae3d3..84154a055f7 100644
--- a/addons/uom/views/uom_uom_views.xml
+++ b/addons/uom/views/uom_uom_views.xml
@@ -53,11 +53,25 @@
             </form>
         </field>
     </record>
+
+    <record id="uom_uom_view_search" model="ir.ui.view">
+        <field name="name">uom.uom.view.search</field>
+        <field name="model">uom.uom</field>
+        <field name="arch" type="xml">
+            <search string="Search UOM">
+                <field name="name"/>
+                <separator/>
+                <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+            </search>
+        </field>
+    </record>
+
     <record id="product_uom_form_action" model="ir.actions.act_window">
         <field name="name">Units of Measure</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">uom.uom</field>
         <field name="view_id" ref="product_uom_tree_view"/>
+        <field name="search_view_id" ref="uom_uom_view_search"/>
         <field name="help" type="html">
           <p class="o_view_nocontent_smiling_face">
             Add a new unit of measure
diff --git a/addons/utm/views/utm_views.xml b/addons/utm/views/utm_views.xml
index 8bf401e0de3..86901507eb6 100644
--- a/addons/utm/views/utm_views.xml
+++ b/addons/utm/views/utm_views.xml
@@ -5,6 +5,7 @@
         sequence="30"
         web_icon="utm,static/description/icon.png"
         groups="base.group_no_one"/>
+
     <menuitem id="marketing_utm"
         name="UTMs"
         parent="menu_link_tracker_root"
@@ -39,6 +40,7 @@
             </tree>
         </field>
     </record>
+
     <record id="utm_medium_view_form" model="ir.ui.view">
         <field name="name">utm.medium.view.form</field>
         <field name="model">utm.medium</field>
@@ -54,10 +56,23 @@
         </field>
     </record>
 
+    <record id="utm_medium_view_search" model="ir.ui.view">
+        <field name="name">utm.medium.view.search</field>
+        <field name="model">utm.medium</field>
+        <field name="arch" type="xml">
+            <search string="Search UTM Medium">
+                <field name="name"/>
+                <separator/>
+                <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+            </search>
+        </field>
+    </record>
+    
     <record id="utm_medium_action" model="ir.actions.act_window">
         <field name="name">Mediums</field>
         <field name="res_model">utm.medium</field>
         <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="utm_medium_view_search"/>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
                 Define a new UTM medium
@@ -81,6 +96,7 @@
             </tree>
         </field>
     </record>
+
     <record id="utm_source_view_form" model="ir.ui.view">
         <field name="name">utm.source.view.form</field>
         <field name="model">utm.source</field>
diff --git a/addons/website/views/website_views.xml b/addons/website/views/website_views.xml
index fa98035100a..ad6a19ede2e 100644
--- a/addons/website/views/website_views.xml
+++ b/addons/website/views/website_views.xml
@@ -70,7 +70,8 @@
                 <search string="Search Redirect">
                     <field name="url_from"/>
                     <field name="url_to"/>
-
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                     <group string="Group By">
                         <filter string="Redirection Type" name="group_by_type" domain="[]" context="{'group_by': 'redirect_type'}"/>
                     </group>
diff --git a/addons/website_crm_partner_assign/models/res_partner.py b/addons/website_crm_partner_assign/models/res_partner.py
index 5ce0387890d..69f8f9ccc9f 100644
--- a/addons/website_crm_partner_assign/models/res_partner.py
+++ b/addons/website_crm_partner_assign/models/res_partner.py
@@ -39,7 +39,7 @@ class ResPartner(models.Model):
 
     partner_weight = fields.Integer('Level Weight', default=0, tracking=True,
         help="This should be a numerical value greater than 0 which will decide the contention for this partner to take this lead/opportunity.")
-    grade_id = fields.Many2one('res.partner.grade', 'Level', tracking=True)
+    grade_id = fields.Many2one('res.partner.grade', 'Partner Level', tracking=True)
     grade_sequence = fields.Integer(related='grade_id.sequence', readonly=True, store=True)
     activation = fields.Many2one('res.partner.activation', 'Activation', index=True, tracking=True)
     date_partnership = fields.Date('Partnership Date')
diff --git a/addons/website_crm_partner_assign/views/crm_lead_views.xml b/addons/website_crm_partner_assign/views/crm_lead_views.xml
index 846c5a94bff..136909e0384 100644
--- a/addons/website_crm_partner_assign/views/crm_lead_views.xml
+++ b/addons/website_crm_partner_assign/views/crm_lead_views.xml
@@ -55,7 +55,7 @@
                 <filter name="unassigned" position="after">
                     <filter string="My Assigned Partners" name="my_assigned_partners" domain="[('partner_assigned_id.user_id', '=', uid)]"/>
                 </filter>
-                <field name="partner_id" position="after">
+                <field name="city" position="after">
                     <field name="partner_assigned_id"/>
                 </field>
             </field>
@@ -110,12 +110,12 @@
             <field name="inherit_id" ref="crm.view_crm_case_leads_filter"/>
             <field name="arch" type="xml">
                 <filter name="company" position="after">
-                    <filter string="Assigned Partner" name="assigned_partner" domain="[]" context="{'group_by':'partner_assigned_id'}"/>
+                    <filter string="Assigned Partner" name="assigned_partner" domain="[]" context="{'group_by': 'partner_assigned_id'}"/>
                 </filter>
-                <filter name="assigned_to_me" position="after">
+                <filter name="unassigned_leads" position="after">
                     <filter string="My Assigned Partners" name="my_assigned_partners" domain="[('partner_assigned_id.user_id', '=', uid)]"/>
                 </filter>
-                <field name="country_id" position="after">
+                <field name="campaign_id" position="after">
                     <field name="partner_assigned_id"/>
                 </field>
             </field>
diff --git a/addons/website_crm_partner_assign/views/res_partner_views.xml b/addons/website_crm_partner_assign/views/res_partner_views.xml
index 51bdb6cbbc0..1b88f777f02 100644
--- a/addons/website_crm_partner_assign/views/res_partner_views.xml
+++ b/addons/website_crm_partner_assign/views/res_partner_views.xml
@@ -51,6 +51,7 @@
             </tree>
         </field>
     </record>
+
     <record id="view_partner_grade_form" model="ir.ui.view">
         <field name="name">res.partner.grade.form</field>
         <field name="model">res.partner.grade</field>
@@ -75,10 +76,25 @@
             </form>
         </field>
     </record>
+
+    <record id="res_partner_grade_view_search" model="ir.ui.view">
+        <field name="name">res.partner.grade.view.search</field>
+        <field name="model">res.partner.grade</field>
+        <field name="arch" type="xml">
+            <search string="Search Partner Grade">
+                <field name="name"/>
+                <separator/>
+                <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+            </search>
+        </field>
+    </record>
+
     <record id="res_partner_grade_action" model="ir.actions.act_window">
         <field name="name">Partner Level</field>
         <field name="res_model">res.partner.grade</field>
+        <field name="search_view_id" ref="res_partner_grade_view_search"/>
     </record>
+
     <menuitem action="res_partner_grade_action" id="menu_res_partner_grade_action"
         parent="crm_menu_resellers"
         sequence="5" />
@@ -102,10 +118,7 @@
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="base.view_res_partner_filter"/>
         <field name="arch" type="xml">
-            <filter name="salesperson" position="after">
-                <filter string="Activation" name="activation" context="{'group_by' : 'activation'}" domain="[]"/>
-            </filter>
-            <field name="category_id" position="after">
+            <field name="user_id" position="after">
                 <field name="grade_id"/>
             </field>
         </field>
diff --git a/addons/website_customer/views/res_partner_views.xml b/addons/website_customer/views/res_partner_views.xml
index e763f00ef8c..92090e4e472 100644
--- a/addons/website_customer/views/res_partner_views.xml
+++ b/addons/website_customer/views/res_partner_views.xml
@@ -29,6 +29,7 @@
                 </form>
             </field>
         </record>
+
         <record id="view_partner_tag_list" model="ir.ui.view">
             <field name="name">Website Tags</field>
             <field name="model">res.partner.tag</field>
@@ -43,10 +44,23 @@
             </field>
         </record>
 
+        <record id="res_partner_tag_view_search" model="ir.ui.view">
+            <field name="name">res.partner.tag.view.search</field>
+            <field name="model">res.partner.tag</field>
+            <field name="arch" type="xml">
+                <search string="Search Partner Tag">
+                    <field name="name"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+                </search>
+            </field>
+        </record>
+
         <record id="action_partner_tag_form" model="ir.actions.act_window">
             <field name="name">Website Tags</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner.tag</field>
+            <field name="search_view_id" ref="res_partner_tag_view_search"/>
             <field name="help" type="html">
               <p class="o_view_nocontent_smiling_face">
                 Create a new contact tag
diff --git a/addons/website_event_track/views/event_track_views.xml b/addons/website_event_track/views/event_track_views.xml
index e74e4fd446e..a6a92e637e9 100644
--- a/addons/website_event_track/views/event_track_views.xml
+++ b/addons/website_event_track/views/event_track_views.xml
@@ -81,24 +81,28 @@
                     <field name="location_id"/>
                     <field name="stage_id"/>
                     <field name="partner_id"/>
-                    <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction','=',True)]"/>
+                    <filter string="My Tracks" name="my_tracks" domain="[('user_id', '=', uid)]"/>
+                    <separator/>    
+                    <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction', '=', True)]"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+                    <separator/>
+                    <filter string="My Activities" name="activities_my" domain="[('activity_ids.user_id', '=', uid)]"/>
                     <separator/>
-                    <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
                     <filter invisible="1" string="Late Activities" name="activities_overdue"
                         domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
                         help="Show all records which has next action date is before today"/>
                     <filter invisible="1" string="Today Activities" name="activities_today"
                         domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
                     <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
-                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))
-                        ]"/>
+                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
                     <filter string="Exception Activities" name="activities_exception"
                         domain="[('activity_exception_decoration', '!=', False)]"/>
                     <group expand="0" string="Group By">
                         <filter string="Responsible" name="responsible" context="{'group_by': 'user_id'}"/>
-                        <filter string="Stage" name="stage" context="{'group_by':'stage_id'}"/>
-                        <filter string="Date" name="date" context="{'group_by':'date'}"/>
-                        <filter string="Event" name="event" context="{'group_by':'event_id'}"/>
+                        <filter string="Stage" name="stage" context="{'group_by': 'stage_id'}"/>
+                        <filter string="Date" name="date" context="{'group_by': 'date'}"/>
+                        <filter string="Event" name="event" context="{'group_by': 'event_id'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/website_sale/views/sale_order_views.xml b/addons/website_sale/views/sale_order_views.xml
index f26ba06f2b4..5bd11dc61df 100644
--- a/addons/website_sale/views/sale_order_views.xml
+++ b/addons/website_sale/views/sale_order_views.xml
@@ -6,10 +6,10 @@
         <field name="inherit_id" ref="sale.view_sales_order_filter"/>
         <field name="mode">primary</field> 
         <field name="arch" type="xml">
-            <xpath expr="//filter[@name='my_sale_orders_filter']" position="replace">
-                <filter string="Confirmed Orders" name="order_confirmed" domain="[('state', 'in', ('sale', 'done'))]"/>
-                <filter string="Unpaid Orders" name="order_unpaid" domain="[('state', '=', 'sent'), ('website_id', '!=', False)]"/>
-                <filter string="Abandoned Carts" name="order_abandoned" domain="[('is_abandoned_cart', '=', True)]"/>
+            <xpath expr="//filter[@name='my_sale_orders_filter']" position="before">
+                <filter string="Confirmed" name="order_confirmed" domain="[('state', 'in', ('sale', 'done'))]"/>
+                <filter string="Unpaid" name="order_unpaid" domain="[('state', '=', 'sent'), ('website_id', '!=', False)]"/>
+                <filter string="Abandoned" name="order_abandoned" domain="[('is_abandoned_cart', '=', True)]"/>
                 <separator/>
                 <filter string="Order Date" name="order_date" date="date_order"/>
                 <separator/>
@@ -29,6 +29,10 @@
             <xpath expr="//filter[@name='my_sale_orders_filter']" position="attributes">
                 <attribute name="invisible">1</attribute>
             </xpath>
+            <xpath expr="//filter[@name='my_sale_orders_filter']" position="before">
+                <filter string="Order Date" name="order_date" date="date_order"/>
+                <separator/>
+            </xpath>
         </field>
     </record>
 
@@ -91,8 +95,13 @@
         <field name="priority">32</field>
         <field name="arch" type="xml">
             <search string="Search Abandoned Sales Orders">
+                <filter string="Creation Date" name="creation_date" date="create_date"/>
+                <separator/>
                 <filter string="Recovery Email to Send" name="recovery_email" domain="[('cart_recovery_email_sent', '=', False)]" />
                 <filter string="Recovery Email Sent" name="recovery_email_set" domain="[('cart_recovery_email_sent', '=', True)]" />
+                <group expand="0" string="Group By">
+                    <filter string="Order Date" name="order_date" domain="[]" context="{'group_by':'date_order'}"/>
+                </group>
             </search>
         </field>
     </record>
diff --git a/odoo/addons/base/views/ir_cron_views.xml b/odoo/addons/base/views/ir_cron_views.xml
index 97e801e2fd8..d6d7ae1ca67 100644
--- a/odoo/addons/base/views/ir_cron_views.xml
+++ b/odoo/addons/base/views/ir_cron_views.xml
@@ -27,6 +27,7 @@
                 </xpath>
             </field>
         </record>
+
         <record id="ir_cron_view_tree" model="ir.ui.view">
             <field name="model">ir.cron</field>
             <field name="arch" type="xml">
@@ -42,6 +43,7 @@
                 </tree>
             </field>
         </record>
+
         <record model="ir.ui.view" id="ir_cron_view_calendar">
             <field name="model">ir.cron</field>
             <field name="priority" eval="2"/>
@@ -51,6 +53,7 @@
                 </calendar>
             </field>
         </record>
+
         <record id="ir_cron_view_search" model="ir.ui.view">
             <field name="model">ir.cron</field>
             <field name="arch" type="xml">
@@ -61,13 +64,16 @@
                     <field name="active"/>
                     <separator/>
                     <filter string="All" name="all" domain="['|', ('active', '=', False), ('active', '=', True)]" />
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                     <group expand="0" string="Group By">
-                        <filter string="User" name="user" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Execution" name="execution" domain="[]" context="{'group_by':'nextcall'}" />
+                        <filter string="User" name="user" domain="[]" context="{'group_by': 'user_id'}"/>
+                        <filter string="Execution" name="execution" domain="[]" context="{'group_by': 'nextcall'}" />
                     </group>
                 </search>
             </field>
         </record>
+
         <record id="ir_cron_act" model="ir.actions.act_window">
             <field name="name">Scheduled Actions</field>
             <field name="res_model">ir.cron</field>
@@ -75,6 +81,7 @@
             <field name="context">{'search_default_all': 1}</field>
             <field name="view_id" ref="ir_cron_view_tree"/>
         </record>
+
         <menuitem id="menu_ir_cron_act" action="ir_cron_act" parent="base.menu_automation"/>
 
 </odoo>
diff --git a/odoo/addons/base/views/ir_filters_views.xml b/odoo/addons/base/views/ir_filters_views.xml
index cc084386cde..5550ab223fc 100644
--- a/odoo/addons/base/views/ir_filters_views.xml
+++ b/odoo/addons/base/views/ir_filters_views.xml
@@ -47,6 +47,7 @@
                     <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 string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                     <group expand="0" string="Group By">
                         <filter string="User" name="user" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Model" name="model" domain="[]" context="{'group_by':'model_id'}"/>
diff --git a/odoo/addons/base/views/ir_mail_server_views.xml b/odoo/addons/base/views/ir_mail_server_views.xml
index 9055231c9f9..f8772a9a5b8 100644
--- a/odoo/addons/base/views/ir_mail_server_views.xml
+++ b/odoo/addons/base/views/ir_mail_server_views.xml
@@ -25,6 +25,7 @@
                 </form>
             </field>
         </record>
+
         <record model="ir.ui.view" id="ir_mail_server_list">
             <field name="model">ir.mail_server</field>
             <field name="arch" type="xml">
@@ -37,6 +38,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="view_ir_mail_server_search" model="ir.ui.view">
             <field name="model">ir.mail_server</field>
             <field name="arch" type="xml">
@@ -45,9 +47,12 @@
                         filter_domain="['|', '|', ('name','ilike',self), ('smtp_host','ilike',self), ('smtp_user','ilike',self)]"
                         string="Outgoing Mail Server"/>
                     <field name="smtp_encryption"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                 </search>
             </field>
         </record>
+
         <record model="ir.actions.act_window" id="action_ir_mail_server_list">
             <field name="name">Outgoing Mail Servers</field>
             <field name="res_model">ir.mail_server</field>
@@ -55,5 +60,6 @@
             <field name="view_id" ref="ir_mail_server_list" />
             <field name="search_view_id" ref="view_ir_mail_server_search"/>
         </record>
+
         <menuitem id="menu_mail_servers" parent="menu_email" action="action_ir_mail_server_list" sequence="15" groups="base.group_no_one"/>
 </odoo>
diff --git a/odoo/addons/base/views/ir_model_views.xml b/odoo/addons/base/views/ir_model_views.xml
index 404fe5fd99f..4cf0c6ae3e7 100644
--- a/odoo/addons/base/views/ir_model_views.xml
+++ b/odoo/addons/base/views/ir_model_views.xml
@@ -590,16 +590,18 @@
             <field name="arch" type="xml">
                 <search string="Access Rights">
                     <field name="name" string="Access Rights"/>
-                    <filter string="Global" name="global" domain="[('group_id','=',False)]"/>
+                    <filter string="Global" name="global" domain="[('group_id', '=', False)]"/>
                     <separator/>
-                    <filter string="Full Access" name="full_access" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
-                    <filter string="Read Access" name="read_access" domain="[('perm_read','=',True)]"/>
-                    <filter string="Write Access" name="write_access" domain="[('perm_write','=',True)]"/>
+                    <filter string="Full Access" name="full_access" domain="[('perm_read', '=', True), ('perm_write', '=', True), ('perm_create', '=', True), ('perm_unlink', '=', True)]"/>
+                    <filter string="Read Access" name="read_access" domain="[('perm_read', '=', True)]"/>
+                    <filter string="Write Access" name="write_access" domain="[('perm_write', '=', True)]"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                     <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" name="group" domain="[]" context="{'group_by':'group_id'}"/>
-                        <filter string="Object" name="group_by_object" domain="[]" context="{'group_by':'model_id'}"/>
+                        <filter string="Group" name="group" domain="[]" context="{'group_by': 'group_id'}"/>
+                        <filter string="Object" name="group_by_object" domain="[]" context="{'group_by': 'model_id'}"/>
                     </group>
                 </search>
             </field>
diff --git a/odoo/addons/base/views/ir_rule_views.xml b/odoo/addons/base/views/ir_rule_views.xml
index 057ec26e5aa..c920c253643 100644
--- a/odoo/addons/base/views/ir_rule_views.xml
+++ b/odoo/addons/base/views/ir_rule_views.xml
@@ -47,6 +47,7 @@
                 </form>
             </field>
         </record>
+
         <record id="view_rule_tree" model="ir.ui.view">
             <field name="model">ir.rule</field>
             <field name="arch" type="xml">
@@ -62,22 +63,23 @@
                 </tree>
             </field>
         </record>
+
         <record id="view_rule_search" model="ir.ui.view">
             <field name="model">ir.rule</field>
             <field name="arch" type="xml">
                 <search string="Record Rules">
                     <field name="name" string="Record Rule"/>
-                    <filter string="Global" name="global" domain="[('global','=',True)]"/>
-                    <separator/>
-                    <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
-                    <separator/>
-                    <filter string="Full Access Right" name="full_access_right" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
-                    <filter string="Read Access Right" name="read_access_right" domain="[('perm_read','=',True)]"/>
-                    <filter string="Write Access Right" name="write_access_right" domain="[('perm_write','=',True)]"/>
-                    <filter string="Create Access Right" name="create_access_right" domain="[('perm_create','=',True)]"/>
-                    <filter string="Delete Access Right" name="delete_access_right" domain="[('perm_unlink','=',True)]"/>
                     <field name="model_id"/>
                     <field name="groups"/>
+                    <filter string="Global" name="global" domain="[('global', '=', True)]"/>
+                    <separator/>
+                    <filter string="Full Access Right" name="full_access_right" domain="[('perm_read', '=', True), ('perm_write', '=', True), ('perm_create', '=', True), ('perm_unlink', '=', True)]"/>
+                    <filter string="Read Access Right" name="read_access_right" domain="[('perm_read', '=', True)]"/>
+                    <filter string="Write Access Right" name="write_access_right" domain="[('perm_write', '=', True)]"/>
+                    <filter string="Create Access Right" name="create_access_right" domain="[('perm_create', '=' ,True)]"/>
+                    <filter string="Delete Access Right" name="delete_access_right" domain="[('perm_unlink', '=', True)]"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                 </search>
             </field>
         </record>
@@ -88,6 +90,7 @@
             <field name="view_id" ref="view_rule_tree"/>
             <field name="search_view_id" ref="view_rule_search"/>
         </record>
+
         <menuitem action="action_rule" id="menu_action_rule" parent="base.menu_security" sequence="3"/>
 
 
diff --git a/odoo/addons/base/views/ir_sequence_views.xml b/odoo/addons/base/views/ir_sequence_views.xml
index 1440f1ee275..813f3cccf6e 100644
--- a/odoo/addons/base/views/ir_sequence_views.xml
+++ b/odoo/addons/base/views/ir_sequence_views.xml
@@ -69,6 +69,7 @@
                 </form>
             </field>
         </record>
+
         <record id="sequence_view_tree" model="ir.ui.view">
             <field name="model">ir.sequence</field>
             <field name="arch" type="xml">
@@ -84,6 +85,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="view_sequence_search" model="ir.ui.view">
             <field name="model">ir.sequence</field>
             <field name="arch" type="xml">
@@ -91,9 +93,12 @@
                     <field name="name" string="Sequence"/>
                     <field name="code"/>
                     <field name="company_id" groups="base.group_multi_company"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                 </search>
             </field>
         </record>
+
         <record id="ir_sequence_form" model="ir.actions.act_window">
             <field name="name">Sequences</field>
             <field name="type">ir.actions.act_window</field>
@@ -101,6 +106,7 @@
             <field name="view_id" ref="sequence_view_tree"/>
             <field name="context">{'active_test': False}</field>
         </record>
+
         <menuitem action="ir_sequence_form" id="menu_ir_sequence_form" parent="next_id_5"/>
 
 </odoo>
diff --git a/odoo/addons/base/views/ir_ui_menu_views.xml b/odoo/addons/base/views/ir_ui_menu_views.xml
index d5df0330be8..f64642a96ab 100644
--- a/odoo/addons/base/views/ir_ui_menu_views.xml
+++ b/odoo/addons/base/views/ir_ui_menu_views.xml
@@ -49,6 +49,7 @@
                 </form>
             </field>
         </record>
+
         <record id="edit_menu" model="ir.ui.view">
             <field name="model">ir.ui.menu</field>
             <field eval="8" name="priority"/>
@@ -59,6 +60,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="edit_menu_access_search" model="ir.ui.view">
             <field name="name">ir.ui.menu.search</field>
             <field name="model">ir.ui.menu</field>
@@ -66,9 +68,12 @@
                 <search string="Menu">
                     <field name="name" string="Menu"/>
                     <field name="parent_id"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
                 </search>
             </field>
         </record>
+
         <record id="grant_menu_access" model="ir.actions.act_window">
             <field name="name">Menu Items</field>
             <field name="res_model">ir.ui.menu</field>
@@ -77,6 +82,7 @@
             <field name="search_view_id" ref="edit_menu_access_search"/>
             <field name="help">Manage and customize the items available and displayed in your Odoo system menu. You can delete an item by clicking on the box at the beginning of each line and then delete it through the button that appeared. Items can be assigned to specific groups in order to make them accessible to some users within the system.</field>
         </record>
+
         <menuitem action="grant_menu_access" id="menu_grant_menu_access" parent="base.next_id_2" sequence="1"/>
 
 </odoo>
diff --git a/odoo/addons/base/views/ir_ui_view_views.xml b/odoo/addons/base/views/ir_ui_view_views.xml
index 8d85f4c91a6..a4aad51b900 100644
--- a/odoo/addons/base/views/ir_ui_view_views.xml
+++ b/odoo/addons/base/views/ir_ui_view_views.xml
@@ -46,6 +46,7 @@
                 </form>
             </field>
         </record>
+
         <record id="view_view_tree" model="ir.ui.view">
             <field name="model">ir.ui.view</field>
             <field name="arch" type="xml">
@@ -59,24 +60,25 @@
                 </tree>
             </field>
         </record>
+
         <record id="view_view_search" model="ir.ui.view">
             <field name="model">ir.ui.view</field>
             <field name="arch" type="xml">
                 <search string="Views">
                     <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('model_data_id','ilike',self)]" string="View"/>
                     <field name="key"/>
-                    <filter string="Active" name="active" domain="[('active', '=',True)]"/>
-                    <filter string="Inactive" name="inactive" domain="[('active', '=',False)]"/>
-                    <separator/>
+                    <field name="model"/>
+                    <field name="inherit_id"/>
+                    <field name="type"/>
+                    <field name="arch_db" string="View Architecture"/>
                     <filter string="Form" name="form" domain="[('type', '=','form')]"/>
                     <filter string="Tree" name="tree" domain="[('type', '=', 'tree')]"/>
                     <filter string="Kanban" name="kanban" domain="[('type', '=', 'kanban')]"/>
                     <filter string="Search" name="search" domain="[('type', '=', 'search')]"/>
                     <filter string="QWeb" name="qweb" domain="[('type', '=', 'qweb')]"/>
-                    <field name="model"/>
-                    <field name="inherit_id"/>
-                    <field name="type"/>
-                    <field name="arch_db" string="View Architecture"/>
+                    <separator/>
+                    <filter string="Active" name="active" domain="[('active', '=',True)]"/>
+                    <filter string="Inactive" name="inactive" domain="[('active', '=',False)]"/>
                     <group expand="0" string="Group By">
                         <filter string="Object" name="object" domain="[]" context="{'group_by':'model'}"/>
                         <filter string="Type" name="type" domain="[]" context="{'group_by':'type'}"/>
@@ -85,6 +87,7 @@
                 </search>
             </field>
         </record>
+
         <record id="action_ui_view" model="ir.actions.act_window">
             <field name="name">Views</field>
             <field name="type">ir.actions.act_window</field>
@@ -93,6 +96,7 @@
             <field name="context">{'search_default_active': 1}</field>
             <field name="help">Views allows you to personalize each view of Odoo. You can add new fields, move fields, rename them or delete the ones that you do not need.</field>
         </record>
+
         <menuitem action="action_ui_view" id="menu_action_ui_view" parent="base.next_id_2" sequence="2"/>
 
         <!-- Reset view wizard -->
@@ -119,6 +123,7 @@
                 </form>
             </field>
         </record>
+
         <act_window id="reset_view_arch_wizard_action"
             name="Reset View Architecture"
             binding_model="ir.ui.view" binding_views="form"
@@ -143,6 +148,7 @@
                 </form>
             </field>
         </record>
+
         <record id="view_view_custom_tree" model="ir.ui.view">
             <field name="model">ir.ui.view.custom</field>
             <field name="arch" type="xml">
@@ -152,6 +158,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="view_view_custom_search" model="ir.ui.view">
             <field name="model">ir.ui.view.custom</field>
             <field name="arch" type="xml">
@@ -161,12 +168,14 @@
                 </search>
             </field>
         </record>
+
         <record id="action_ui_view_custom" model="ir.actions.act_window">
             <field name="name">Customized Views</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">ir.ui.view.custom</field>
             <field name="help" type="html"><p class="o_view_nocontent_smiling_face">Create a customized view</p><p>Customized views are used when users reorganize the content of their dashboard views (via web client)</p></field>
         </record>
+
         <menuitem id="menu_action_ui_view_custom" action="action_ui_view_custom" parent="base.next_id_2" sequence="3"/>
 
 </odoo>
diff --git a/odoo/addons/base/views/res_bank_views.xml b/odoo/addons/base/views/res_bank_views.xml
index 343b814d150..f07b1f68a1d 100644
--- a/odoo/addons/base/views/res_bank_views.xml
+++ b/odoo/addons/base/views/res_bank_views.xml
@@ -48,10 +48,23 @@
             </field>
         </record>
 
+        <record id="res_bank_view_search" model="ir.ui.view">
+            <field name="name">res.bank.view.search</field>
+            <field name="model">res.bank</field>
+            <field name="arch" type="xml">
+                <search string="Search Bank">
+                    <field name="name"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+                </search>
+            </field>
+        </record>
+
         <record id="action_res_bank_form" model="ir.actions.act_window">
             <field name="name">Banks</field>
             <field name="res_model">res.bank</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="res_bank_view_search"/>
             <field name="help" type="html">
               <p class="o_view_nocontent_smiling_face">
                 Create a new bank
diff --git a/odoo/addons/base/views/res_lang_views.xml b/odoo/addons/base/views/res_lang_views.xml
index 163014ea629..2f7b4990e90 100644
--- a/odoo/addons/base/views/res_lang_views.xml
+++ b/odoo/addons/base/views/res_lang_views.xml
@@ -18,6 +18,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="res_lang_form" model="ir.ui.view">
             <field name="name">res.lang.form</field>
             <field name="model">res.lang</field>
@@ -83,16 +84,18 @@
                 </form>
             </field>
         </record>
+
         <record id="res_lang_search" model="ir.ui.view">
             <field name="name">res.lang.search</field>
             <field name="model">res.lang</field>
             <field name="arch" type="xml">
                 <search string="Languages">
                     <field name="name"
-                        filter_domain="['|', '|', ('name','ilike',self), ('code','ilike',self), ('iso_code','ilike',self)]"
+                        filter_domain="['|', '|', ('name', 'ilike', self), ('code', 'ilike', self), ('iso_code', 'ilike', self)]"
                         string="Language"/>
-                    <filter string="Active" name="active" domain="[('active','=',True)]"/>
                     <field name="direction"/>
+                    <separator/>
+                    <filter string="Active" name="active" domain="[('active', '=', True)]"/>
                 </search>
             </field>
         </record>
@@ -103,6 +106,7 @@
             <field name="context">{'active_test': False}</field>
             <field name="search_view_id" ref="res_lang_search"/>
         </record>
+
         <menuitem action="res_lang_act_window" id="menu_res_lang_act_window" parent="menu_translation" sequence="1"/>
     </data>
 </odoo>
diff --git a/odoo/addons/base/views/res_partner_views.xml b/odoo/addons/base/views/res_partner_views.xml
index 916df494c4c..c6bf048279b 100644
--- a/odoo/addons/base/views/res_partner_views.xml
+++ b/odoo/addons/base/views/res_partner_views.xml
@@ -463,26 +463,25 @@
             <field name="model">res.partner</field>
             <field name="arch" type="xml">
                 <search string="Search Partner">
-                   <field name="name"
-                       filter_domain="['|','|',('display_name','ilike',self),('ref','=',self),('email','ilike',self)]"/>
-                   <field name="parent_id" domain="[('is_company','=',True)]" operator="child_of"/>
-                   <filter name="filter_my_partners" help="My Contacts"
-                           domain="[('user_id','=',uid)]"/>
-                   <separator/>
-                   <filter string="Individuals" name="type_person" domain="[('is_company','=',False)]"/>
-                   <filter string="Companies" name="type_company" domain="[('is_company','=',True)]"/>
-                   <separator/>
-                   <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
-                   <separator/>
-                   <field name="category_id" string="Tag" filter_domain="[('category_id','child_of', self)]"/>
-                   <field name="user_id"/>
-                   <field name="phone" filter_domain="['|',('phone','ilike',self),('mobile','=',self)]"/>
-                   <group expand="0" name="group_by" string="Group By">
-                       <filter name="salesperson" string="Salesperson" domain="[]" context="{'group_by' : 'user_id'}" />
-                       <filter name="group_company" string="Company" context="{'group_by': 'parent_id'}"/>
-                       <filter name="group_country" string="Country" context="{'group_by': 'country_id'}"/>
-                   </group>
-               </search>
+                    <field name="name"
+                        filter_domain="['|', '|', ('display_name', 'ilike', self), ('ref', '=', self), ('email', 'ilike', self)]"/>
+                    <field name="parent_id" domain="[('is_company', '=', True)]" operator="child_of"/>
+                    <field name="email" filter_domain="[('email', 'ilike', self)]"/>
+                    <field name="phone" filter_domain="['|', ('phone', 'ilike', self), ('mobile', '=', self)]"/>
+                    <field name="category_id" string="Tag" filter_domain="[('category_id', 'child_of', self)]"/>
+                    <field name="user_id"/>
+                    <separator/>
+                    <filter string="Individuals" name="type_person" domain="[('is_company', '=', False)]"/>
+                    <filter string="Companies" name="type_company" domain="[('is_company', '=', True)]"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+                    <separator/>
+                    <group expand="0" name="group_by" string="Group By">
+                        <filter name="salesperson" string="Salesperson" domain="[]" context="{'group_by' : 'user_id'}" />
+                        <filter name="group_company" string="Company" context="{'group_by': 'parent_id'}"/>
+                        <filter name="group_country" string="Country" context="{'group_by': 'country_id'}"/>
+                    </group>
+                </search>
             </field>
         </record>
 
@@ -688,6 +687,7 @@
                 </form>
             </field>
         </record>
+
         <record id="view_partner_category_list" model="ir.ui.view">
             <field name="name">Contact Tags</field>
             <field name="model">res.partner.category</field>
@@ -698,10 +698,25 @@
                 </tree>
             </field>
         </record>
+
+        <record id="res_partner_category_view_search" model="ir.ui.view">
+            <field name="name">res.partner.category.view.search</field>
+            <field name="model">res.partner.category</field>
+            <field name="arch" type="xml">
+                <search string="Search Partner Category">
+                    <field name="name"/>
+                    <field name="display_name"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+                </search>
+            </field>
+        </record>
+        
         <record id="action_partner_category_form" model="ir.actions.act_window">
             <field name="name">Contact Tags</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner.category</field>
+            <field name="search_view_id" ref="res_partner_category_view_search"/>
             <field name="help" type="html">
               <p class="o_view_nocontent_smiling_face">
                 Create a new contact tag
@@ -727,6 +742,7 @@
                 </form>
             </field>
         </record>
+
         <record id="res_partner_industry_view_tree" model="ir.ui.view">
             <field name="name">Industry</field>
             <field name="model">res.partner.industry</field>
@@ -739,11 +755,26 @@
                 </tree>
             </field>
         </record>
+
+        <record id="res_partner_industry_view_search" model="ir.ui.view">
+            <field name="name">res.partner.industry.view.search</field>
+            <field name="model">res.partner.industry</field>
+            <field name="arch" type="xml">
+                <search string="Search Partner Industry">
+                    <field name="name"/>
+                    <field name="full_name"/>
+                    <separator/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+                </search>
+            </field>
+        </record>
+
         <record id="res_partner_industry_action" model="ir.actions.act_window">
             <field name="name">Industry</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner.industry</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="res_partner_industry_view_search"/>
             <field name="help" type="html">
               <p class="o_view_nocontent_smiling_face">
                 Create a new industry
diff --git a/odoo/addons/base/views/res_users_views.xml b/odoo/addons/base/views/res_users_views.xml
index 355f96e28d2..71069f06ff7 100644
--- a/odoo/addons/base/views/res_users_views.xml
+++ b/odoo/addons/base/views/res_users_views.xml
@@ -297,6 +297,7 @@
                     <field name="company_ids" string="Company" groups="base.group_multi_company"/>
                     <field name="share"/>
                     <filter name="no_share" string="Internal Users" domain="[('share','=',False)]"/>
+                    <separator/>
                     <filter name="Inactive" string="Inactive Users" domain="[('active','=',False)]"/>
                 </search>
             </field>