diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index a52a9c5d799..da05075445a 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -31,13 +31,34 @@ class WebsiteCrmPartnerAssign(http.Controller):
         # format displayed membership lines domain
         base_partner_domain = [('is_company', '=', True), ('grade_id', '!=', False), ('website_published', '=', True)]
         partner_domain = list(base_partner_domain)
+        if post_name:
+            partner_domain += ['|', ('name', 'ilike', post_name), ('website_description', 'ilike', post_name)]
         if grade_id and grade_id != "all":
             partner_domain += [('grade_id', '=', int(grade_id))]  # try/catch int
+
+        # group by country
+        countries = partner_obj.read_group(
+            request.cr, openerp.SUPERUSER_ID, partner_domain, ["id", "country_id"],
+            groupby="country_id", orderby="country_id", context=request.context)
+        countries_partners = partner_obj.search(
+            request.cr, openerp.SUPERUSER_ID, partner_domain,
+            context=request.context, count=True)
+        
         if country_id:
             country = country_obj.browse(request.cr, request.uid, country_id, request.context)
             partner_domain += [('country_id', '=', country_id)]
-        if post_name:
-            partner_domain += ['|', ('name', 'ilike', post_name), ('website_description', 'ilike', post_name)]
+            if not any(x['country_id'][0] == country_id for x in countries):
+                countries.append({
+                    'country_id_count': 0,
+                    'country_id': (country_id, country.name)
+                })
+                countries.sort(key=lambda d: d['country_id'][1])
+        
+        countries.insert(0, {
+            'country_id_count': countries_partners,
+            'country_id': (0, _("All Countries"))
+        })
+        
 
         # format pager
         partner_ids = partner_obj.search(
@@ -55,18 +76,6 @@ class WebsiteCrmPartnerAssign(http.Controller):
             context=request.context)
         google_map_partner_ids = ",".join([str(p['id']) for p in partners_data])
 
-        # group by country
-        countries = partner_obj.read_group(
-            request.cr, openerp.SUPERUSER_ID, base_partner_domain, ["id", "country_id"],
-            groupby="country_id", orderby="country_id", context=request.context)
-        countries_partners = partner_obj.search(
-            request.cr, openerp.SUPERUSER_ID, base_partner_domain,
-            context=request.context, count=True)
-        countries.insert(0, {
-            'country_id_count': countries_partners,
-            'country_id': (0, _("All Countries"))
-        })
-
         # group by grade
         grades = partner_obj.read_group(
             request.cr, openerp.SUPERUSER_ID, base_partner_domain, ["id", "grade_id"],
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index a8b1c43e765..a0082fb929c 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -41,7 +41,7 @@
                     <t t-foreach="countries" t-as="country_dict">
                         <t t-if="country_dict['country_id']">
                             <li t-att-class="country_dict['country_id'][0] == current_country_id and 'active' or ''">
-                                <a t-attf-href="#{ country_dict['country_id'][0] and '/partners/country/%s' % slug(country_dict['country_id']) or '/partners/' }">
+                                <a t-attf-href="#{ country_dict['country_id'][0] and '/partners/country/%s' % slug(country_dict['country_id']) or '/partners/' }#{ search_path }">
                                     <t t-esc="country_dict['country_id'][1]"/> <small>(<t t-esc="country_dict['country_id_count']"/>)</small>
                                 </a>
                             </li>
@@ -55,9 +55,9 @@
                         <t t-call="website.pager">
                            <t t-set="classname">pull-left</t>
                         </t>
-                        <form action="/partners/" method="get" class="navbar-search pull-right pagination form-inline">
+                        <form action="#{ country_dict['country_id'][0] and '/partners/country/%s' % slug(country_dict['country_id']) or '/partners/' }" method="get" class="navbar-search pull-right pagination form-inline">
                             <div class="form-group">
-                                <input type="text" name="search" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="name_search"/>
+                                <input type="text" name="search" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="searches.get('search', '')"/>
                             </div>
                             <div class="form-group">
                                 <select class="search-query col-md-2 mt4 form-control" name="grade" t-if="len(grades) > 1" onchange="submit()">
@@ -74,6 +74,9 @@
                     </div>
                 </div>
                 <div>
+                    <t t-if="not partners_data">
+                        <p>No result found.</p>
+                    </t>
                     <t t-foreach="partners_data" t-as="partner_data">
                         <t t-if="internal_gid != partner_data['grade_id'][1]">
                             <h3 class="text-center">