diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index b837186f23c..1df0cf011fd 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -54,6 +54,17 @@
                     </field>
                 </group>
                 <newline/>
+                <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <field name="currency_id" widget="selection"/>
+                    <field name="general_account_id" widget="selection"/>
+                    <field name="product_uom_id" widget="selection"/>
+                    <field name="journal_id" widget="selection"/>
+                    <separator orientation="vertical"/>
+                    <field name="name"/>
+                    <field name="account_id"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                </group>
+                <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <filter string="Currency" icon="terp-dolar" context="{'group_by':'currency_id'}"/>
@@ -70,17 +81,6 @@
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
-                <newline/>
-                <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="currency_id" widget="selection"/>
-                    <field name="general_account_id" widget="selection"/>
-                    <field name="product_uom_id" widget="selection"/>
-                    <field name="journal_id" widget="selection"/>
-                    <separator orientation="vertical"/>
-                    <field name="name"/>
-                    <field name="account_id"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                </group>
             </search>
         </field>
     </record>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index f6282046e00..f7dd6da49e3 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -56,7 +56,7 @@
                 <group colspan="10" col="12">
                     <filter icon="terp-go-year" string="This F.Year"
                             name="thisyear"
-                            domain="[('period_id','in','current_year')]"                        
+                            domain="[('period_id','in','current_year')]"
                             help="Journal Entries with period in current year"/>
                     <filter icon="terp-go-month" string="This Period"
                             name="period"
@@ -73,6 +73,19 @@
                     <field name="journal_id" widget="selection"/>
                     <field name="period_id"/>
                 </group>
+                <newline/>
+                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <field name="fiscalyear_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="product_id"/>
+                    <field name="partner_id"/>
+                    <separator orientation="vertical" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <newline/>
+                    <field name="date_created"/>
+                    <field name="date"/>
+                    <field name="date_maturity"/>
+                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
@@ -92,19 +105,6 @@
                     <filter string="Period" icon="terp-go-month" name="group_period" context="{'group_by':'period_id'}"/>
                     <filter string="Fiscal Year" icon="terp-go-year" context="{'group_by':'fiscalyear_id'}"/>
                  </group>
-                 <newline/>
-                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="fiscalyear_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="product_id"/>
-                    <field name="partner_id"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="date_created"/>
-                    <field name="date"/>
-                    <field name="date_maturity"/>
-                 </group>
             </search>
         </field>
     </record>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 98dd3f64fb7..80985fb3d6a 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -97,6 +97,17 @@
                    <field name="categ_id" />
                 </group>
                 <newline/>
+                <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <field name="product_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="journal_id" widget="selection"/>
+                    <field name="account_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="date_due"/>
+                    <separator orientation="vertical" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                </group>
+                <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/>
                     <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
@@ -118,17 +129,6 @@
                     <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/>
                     <filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/>
                 </group>
-                <newline/>
-                <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="product_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="journal_id" widget="selection"/>
-                    <field name="account_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="date_due"/>
-                    <separator orientation="vertical" groups="base.group_multi_company"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                </group>
             </search>
         </field>
     </record>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f9a3a1fb629..41d41ef0502 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -31,7 +31,7 @@
         <menuitem action="crm_lead_categ_action"
             id="menu_crm_lead_categ" name="Categories"
             parent="base.menu_crm_config_lead" sequence="1"/>
-        
+
         <!--  Resource Type Form View -->
         <record id="crm_lead_resource_act" model="ir.actions.act_window">
             <field name="name">Lead Sources</field>
@@ -337,6 +337,20 @@
                         help="Show Sales Team"/>
                 </field>
                 <newline/>
+                <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                      <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                      <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                      <separator orientation="vertical"/>
+                      <field name="country_id" context="{'invisible_country': False}">
+                          <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
+                      </field>
+                      <separator orientation="vertical"/>
+                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                      <newline/>
+                      <field name="create_date" string="Creation Date"/>
+                      <field name="date_closed"/>
+                </group>
+                <newline/>
                 <group expand="0" string="Group By...">
                     <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@@ -354,20 +368,6 @@
                     <filter string="Creation" icon="terp-go-month"
                         domain="[]" context="{'group_by':'create_date'}" />
                 </group>
-                <newline/>
-                <group  expand="0" string="Extended Filters..." groups="base.group_extended">
-                      <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                      <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                      <separator orientation="vertical"/>
-                      <field name="country_id" context="{'invisible_country': False}">
-                          <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
-                      </field>
-                      <separator orientation="vertical"/>
-                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                      <newline/>
-                      <field name="create_date" string="Creation Date"/>
-                      <field name="date_closed"/>
-                </group>
            </search>
         </field>
     </record>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index e816e3f0b1d..8101a0bcfb2 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -311,6 +311,20 @@
                                 help="Show Sales Team"/>
                         </field>
                         <newline/>
+                        <group  expand="0" string="Extended Filters..." groups="base.group_extended">
+                              <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                              <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                              <separator orientation="vertical"/>
+                              <field name="country_id" context="{'invisible_country': False}">
+                                  <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
+                              </field>
+                              <separator orientation="vertical"/>
+                              <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                              <newline/>
+                              <field name="create_date" string="Creation Date"/>
+                              <field name="date_closed"/>
+                        </group>
+                        <newline/>
                         <group expand="0" string="Group By..." colspan="16">
                             <filter string="Stage" icon="terp-stage" domain="[]"
                                 context="{'group_by':'stage_id'}" />
@@ -335,20 +349,6 @@
                                 help="Expected Closing" domain="[]"
                                 context="{'group_by':'date_deadline'}" />
                         </group>
-                        <newline/>
-                        <group  expand="0" string="Extended Filters..." groups="base.group_extended">
-                              <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                              <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                              <separator orientation="vertical"/>
-                              <field name="country_id" context="{'invisible_country': False}">
-                                  <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
-                              </field>
-                              <separator orientation="vertical"/>
-                              <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                              <newline/>
-                              <field name="create_date" string="Creation Date"/>
-                              <field name="date_closed"/>
-                        </group>
                     </search>
                 </field>
             </record>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 42adda76dbe..1939965c0dc 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -110,7 +110,22 @@
                         </field>
                    </group>
                    <newline/>
-                   <group  expand="1" string="Group By...">
+                  <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                      <field name="partner_id"/>
+                      <separator orientation="vertical"/>
+                      <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]" />
+                      <field name="categ_id" widget="selection"/>
+                      <field name="type_id" widget="selection"/>
+                      <field name="channel_id" widget="selection"/>
+                      <separator orientation="vertical"/>
+                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                      <newline/>
+                      <field name="creation_date"/>
+                      <field name="opening_date"/>
+                      <field name="date_closed"/>
+                  </group>
+                   <newline/>
+                   <group expand="1" string="Group By...">
                         <filter string="User" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                        <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
@@ -144,21 +159,6 @@
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" />
                   </group>
-                  <newline/>
-                  <group  expand="0" string="Extended Filters..." groups="base.group_extended">
-                      <field name="partner_id"/>
-                      <separator orientation="vertical"/>
-                      <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]" />
-                      <field name="categ_id" widget="selection"/>
-                      <field name="type_id" widget="selection"/>
-                      <field name="channel_id" widget="selection"/>
-                      <separator orientation="vertical"/>
-                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                      <newline/>
-                      <field name="creation_date"/>
-                      <field name="opening_date"/>
-                      <field name="date_closed"/>
-                  </group>
                </search>
             </field>
         </record>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 69402603d17..8024ca78bd5 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -110,7 +110,20 @@
                            </field>
                    </group>
                    <newline/>
-                   <group  expand="1" string="Group By...">
+                   <group expand="0" string="Extended Filters..."  groups="base.group_extended">
+                      <field name="partner_id"/>
+                        <separator orientation="vertical"/>
+                        <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                        <separator orientation="vertical"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                           <newline/>
+                        <field name="creation_date"/>
+                        <field name="opening_date"/>
+                        <field name="date_closed"/>
+                   </group>
+                   <newline/>
+                   <group expand="1" string="Group By...">
                         <filter string="User" name="User" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                        <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
@@ -139,20 +152,6 @@
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" />
                   </group>
-
-                   <newline/>
-                   <group  expand="0" string="Extended Filters..."  groups="base.group_extended">
-                      <field name="partner_id"/>
-                        <separator orientation="vertical"/>
-                        <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                        <separator orientation="vertical"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
-                           <newline/>
-                        <field name="creation_date"/>
-                        <field name="opening_date"/>
-                        <field name="date_closed"/>
-                   </group>
                </search>
             </field>
         </record>
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 3a1e8f45f26..edb3dc2b6db 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -119,7 +119,24 @@
                			</field>
                    </group>
                    <newline/>
-                   <group  expand="0" string="Group By...">
+                   <group  expand="0" string="Extended Filters..." groups="base.group_extended">
+                         <filter icon="terp-dialog-close"
+                            string="Done"
+                            domain="[('state','=','done')]"/>
+                        <filter icon="gtk-cancel"
+                            string="Cancel"
+                            domain="[('state','=','cancel')]"/>
+                        <group>
+                            <separator orientation="vertical"/>
+                            <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
+                            <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
+                            <separator orientation="vertical"/>
+                            <field name="priority" />
+                            <field name="type_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
+                        </group>
+                   </group>
+                   <newline/>
+                   <group  expand="1" string="Group By...">
                         <filter string="User" name="User" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
 
@@ -157,25 +174,7 @@
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" />
                   </group>
-                   <newline/>
-                   <group  expand="0" string="Extended Filters..." groups="base.group_extended">
-                         <filter icon="terp-dialog-close"
-                    		string="Done"
-                    		domain="[('state','=','done')]"/>
 
-                    	<filter icon="gtk-cancel"
-                    		string="Cancel"
-                    		domain="[('state','=','cancel')]"/>
-
-                    	<group>
-		            	    <separator orientation="vertical"/>
-		            	    <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
-			                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
-			                <separator orientation="vertical"/>
-			                <field name="priority" />
-			                <field name="type_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
-		                </group>
-                   </group>
                </search>
             </field>
         </record>
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 8e9f1611af6..989b364a488 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -118,7 +118,22 @@
                			</field>
                    </group>
                    <newline/>
-                   <group  expand="0" string="Group By...">
+                   <group  expand="0" string="Extended Filters..." groups="base.group_extended">
+                         <filter icon="terp-dialog-close"
+                            string="Done"
+                            domain="[('state','=','done')]"/>
+
+                        <filter icon="gtk-cancel"
+                            string="Cancel"
+                            domain="[('state','=','cancel')]"/>
+
+                        <group>
+                            <separator orientation="vertical"/>
+                            <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
+                         </group>
+                   </group>
+                   <newline/>
+                   <group  expand="1" string="Group By...">
                         <filter string="User" name="User" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
 
@@ -146,23 +161,7 @@
 
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" />
-
                   </group>
-                   <newline/>
-                   <group  expand="0" string="Extended Filters..." groups="base.group_extended">
-                         <filter icon="terp-dialog-close"
-                    		string="Done"
-                    		domain="[('state','=','done')]"/>
-
-                    	<filter icon="gtk-cancel"
-                    		string="Cancel"
-                    		domain="[('state','=','cancel')]"/>
-
-                    	<group>
-		            	    <separator orientation="vertical"/>
-			                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
-			             </group>
-                   </group>
                </search>
             </field>
         </record>
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 2544a506fd5..1d494103dc3 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -114,7 +114,12 @@
                          <field name="user_id" widget="selection"/>
                    </group>
                    <newline/>
-                  <group expand="0" string="Group By...">
+                   <group expand="0" string="Extended Filters..."  groups="base.group_extended">
+                        <filter string="Priority" icon="terp-rating-rated"
+                            domain="[]" context="{'group_by':'priority'}" />
+                   </group>
+                   <newline/>
+                   <group expand="1" string="Group By...">
                         <filter string="User" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}"
                             default="1" />
@@ -141,15 +146,7 @@
 
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" />
-
                   </group>
-                    <newline/>
-                   <group expand="0" string="Extended Filters..."  groups="base.group_extended">
-                        <filter string="Priority" icon="terp-rating-rated"
-                            domain="[]" context="{'group_by':'priority'}" />
-                   </group>
-
-
                </search>
             </field>
         </record>
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index 3424fc44fbe..2d38cd8862b 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -31,6 +31,19 @@
                         <field name="partner_assigned_id"/>
                    </group>
                    <newline/>
+                   <group  expand="0" string="Extended Filters..." groups="base.group_extended">
+                      <field name="partner_id"/>
+                      <separator orientation="vertical"/>
+                      <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]" />
+                      <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                      <separator orientation="vertical"/>
+                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                      <newline/>
+                      <field name="creation_date"/>
+                      <field name="opening_date"/>
+                      <field name="date_closed"/>
+                   </group>
+                   <newline/>
                    <group  expand="1" string="Group By...">
                        <filter string="User" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
@@ -69,19 +82,7 @@
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" />
                   </group>
-                  <newline/>
-                  <group  expand="0" string="Extended Filters..." groups="base.group_extended">
-                      <field name="partner_id"/>
-                      <separator orientation="vertical"/>
-                      <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]" />
-                      <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                      <separator orientation="vertical"/>
-                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                      <newline/>
-                      <field name="creation_date"/>
-                      <field name="opening_date"/>
-                      <field name="date_closed"/>
-                  </group>
+
                </search>
             </field>
         </record>