diff --git a/addons/website_customer/controllers/main.py b/addons/website_customer/controllers/main.py
index 87cc5211fa5..cc29a0072a6 100644
--- a/addons/website_customer/controllers/main.py
+++ b/addons/website_customer/controllers/main.py
@@ -88,7 +88,7 @@ class WebsiteCustomer(http.Controller):
 
         tag_obj = request.registry['res.partner.tag']
         tag_ids = tag_obj.search(cr, uid, [('website_published', '=', True), ('partner_ids', 'in', partner_ids)],
-                                 order='name ASC', context=context)
+                                 order='classname, name ASC', context=context)
         tags = tag_obj.browse(cr, uid, tag_ids, context=context)
         tag = tag_id and tag_obj.browse(cr, uid, tag_id, context=context) or False
 
diff --git a/addons/website_customer/views/website_customer.xml b/addons/website_customer/views/website_customer.xml
index d7c16fd8759..26305711ee3 100644
--- a/addons/website_customer/views/website_customer.xml
+++ b/addons/website_customer/views/website_customer.xml
@@ -90,6 +90,7 @@
     </xpath>
 </template>
 
+
 <template id="opt_country_list" inherit_id="website_customer.index" customize_show="True" name="Filter on Countries">
     <xpath expr="//div[@id='ref_left_column']" position="inside">
         <h3>References by Country</h3>
@@ -109,7 +110,7 @@
     </xpath>
 </template>
 
-<template id="opt_tag_list" inherit_id="website_customer.index" customize_show="True" name="Filter on Tags">
+<template id="opt_tag_list" inherit_id="website_customer.index" customize_show="True" name="Filter on Tags" priority="5">
     <xpath expr="//div[@id='ref_left_column']" position="inside">
 
         <h3 t-if="len(tags)">References by Tag</h3>