diff --git a/leave/filters.py b/leave/filters.py
index 84f08f6e0..6c9406ae1 100644
--- a/leave/filters.py
+++ b/leave/filters.py
@@ -174,6 +174,8 @@ class LeaveRequestFilter(HorillaFilterSet):
             "department_name",
             "overall_leave",
             "employee_id__employee_work_info__company_id",
+            "employee_id__employee_work_info__employee_type_id",
+            "employee_id__employee_work_info__job_role_id",
             "employee_id__employee_work_info__reporting_manager_id",
             "employee_id__employee_work_info__department_id",
             "employee_id__employee_work_info__job_position_id",
diff --git a/leave/templates/cbv/leave_requests/filter.html b/leave/templates/cbv/leave_requests/filter.html
index bd8e368d8..64f739741 100644
--- a/leave/templates/cbv/leave_requests/filter.html
+++ b/leave/templates/cbv/leave_requests/filter.html
@@ -45,9 +45,13 @@
                   {{form.employee_id__employee_work_info__company_id}}
                 </div>
                 <div class="oh-input-group">
-                    <label class="oh-label" for="{{form.employee_id__employee_work_info__department_id.id_for_label}}">{% trans "Department" %}</label>
-                    {{form.employee_id__employee_work_info__department_id}}
-                  </div>
+                  <label class="oh-label" for="{{form.employee_id__employee_work_info__employee_type_id.id_for_label}}">{% trans "Employee Type" %}</label>
+                  {{form.employee_id__employee_work_info__employee_type_id}}
+                </div>
+                  <div class="oh-input-group">
+                    <label class="oh-label" for="{{form.employee_id__employee_work_info__job_position_id.id_for_label}}">{% trans "Job Position" %}</label>
+                    {{form.employee_id__employee_work_info__job_position_id}}
+                </div>
                   <div class="oh-input-group">
                     <label class="oh-label" for="{{form.employee_id__employee_work_info__shift_id.id_for_label}}">{% trans "Shift" %}</label>
                     {{form.employee_id__employee_work_info__shift_id}}
@@ -59,8 +63,13 @@
                     {{form.employee_id__employee_work_info__reporting_manager_id}}
                   </div>
               <div class="oh-input-group">
-                <label class="oh-label" for="{{form.employee_id__employee_work_info__job_position_id.id_for_label}}">{% trans "Job Position" %}</label>
-                {{form.employee_id__employee_work_info__job_position_id}}
+                <label class="oh-label" for="{{form.employee_id__employee_work_info__department_id.id_for_label}}">{% trans "Department" %}</label>
+                {{form.employee_id__employee_work_info__department_id}}
+              </div>
+
+              <div class="oh-input-group">
+                <label class="oh-label" for="{{form.employee_id__employee_work_info__job_role_id.id_for_label}}">{% trans "Job Role" %}</label>
+                {{form.employee_id__employee_work_info__job_role_id}}
               </div>
               <div class="oh-input-group">
                 <label class="oh-label" for="{{form.employee_id__employee_work_info__work_type_id.id_for_label}}">{% trans "Work Type" %}</label>