diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index fa998f922ea..34f80bf9c68 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -131,13 +131,6 @@
         <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
     </record>
 
-    <record id="tax_report_comp_rule" model="ir.rule">
-        <field name="name">Tax report multi-company</field>
-        <field name="model_id" ref="model_account_tax_report_line"/>
-        <field name="global" eval="True"/>
-        <field name="domain_force">[('country_id','=',user.company_id.country_id.id)]</field>
-    </record>
-
     <record id="invoice_comp_rule" model="ir.rule">
         <field name="name">Invoice multi-company</field>
         <field name="model_id" ref="model_account_invoice"/>
diff --git a/addons/account/views/account_tax_report_views.xml b/addons/account/views/account_tax_report_views.xml
index 1860df8cc08..05e0ce00dac 100644
--- a/addons/account/views/account_tax_report_views.xml
+++ b/addons/account/views/account_tax_report_views.xml
@@ -60,6 +60,18 @@
             </field>
         </record>
 
+        <record id="account_tax_report_line_search" model="ir.ui.view">
+            <field name="name">account.tax.report.line.search</field>
+            <field name="model">account.tax.report.line</field>
+            <field name="arch" type="xml">
+                <search>
+                    <group expand="0" string="Group By">
+                        <filter string="Country" name="groupby_country" context="{'group_by': 'country_id'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
         <record id="action_configure_tax_report" model="ir.actions.act_window">
             <field name="name">Configure Tax Report</field>
             <field name="type">ir.actions.act_window</field>
@@ -67,6 +79,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="account_tax_report_line_tree"/>
+            <field name="context">{'search_default_groupby_country': True}</field>
         </record>