diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 8cb2845f81b..38f58df78d0 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -160,15 +160,13 @@ class hr_holidays(osv.osv):
         return obj_res_leave.unlink(cr, uid, leave_ids)
 
     def onchange_type(self, cr, uid, ids, holiday_type):
-        result = {}
+        result = {'value': {'employee_id': False}}
         if holiday_type == 'employee':
             ids_employee = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
             if ids_employee:
                 result['value'] = {
                     'employee_id': ids_employee[0]
                 }
-        else:
-            result['value'] = {'employee_id': False}
         return result
 
     # TODO: can be improved using resource calendar method
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index b9b4989f73e..6b1fdfebbef 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -36,8 +36,8 @@
                     </group>
                     <newline />
                     <group expand="0" string="Group By...">
-                    	<filter name="group_category" string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/>
                         <filter name="group_employee" string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
+                        <filter name="group_category" string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'category_id'}"/>
                         <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/>
                         <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id','set_visible':True}"/>
                         <separator orientation="vertical"/>
@@ -234,6 +234,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="red:state in ('refuse');blue:state in (' draft');black:state in ('confirm','validate','validate1')">
+                    <field name="holiday_type"/>
                     <field name="employee_id"/>
                     <field name="category_id"/>
                     <field name="department_id" invisible="not context.get('set_visible',False)"/>