diff --git a/attendance/templates/attendance/work_record/work_record_list.html b/attendance/templates/attendance/work_record/work_record_list.html
index f4b509429..006c13725 100644
--- a/attendance/templates/attendance/work_record/work_record_list.html
+++ b/attendance/templates/attendance/work_record/work_record_list.html
@@ -1,8 +1,41 @@
-{% load i18n %} {% load attendancefilters %}
+{% load i18n %} {% load attendancefilters %} {% include "filter_tags.html" %}
 <div class="d-flex justify-content-between m-2 ms-0">
-    <button class="oh-btn oh-btn--secondary" data-toggle="oh-modal-toggle" data-target="#exportRecords" onclick="window.location.href = `{% url 'work-record-export' %}?month={{leave_dates.0.month}}&year={{leave_dates.0.year}}`">
-        <ion-icon name="download-outline" class="mr-1 md hydrated" role="img" aria-label="download"></ion-icon>{% trans "Export" %}
-    </button>
+    <div class="d-flex justify-content-between">
+        <button class="oh-btn oh-btn--secondary" data-toggle="oh-modal-toggle" data-target="#exportRecords" onclick="window.location.href = `{% url 'work-record-export' %}?month={{leave_dates.0.month}}&year={{leave_dates.0.year}}`">
+            <ion-icon name="download-outline" class="mr-1 md hydrated" role="img" aria-label="download"></ion-icon>{% trans "Export" %}
+        </button>
+        <div class="oh-dropdown" x-data="{open: false}">
+            <button
+                class="oh-btn ml-2"
+                @click="open = !open"
+                onclick="event.preventDefault()"
+            >
+                <ion-icon name="filter" class="mr-1"></ion-icon>{% trans "Filter" %}
+                <div id="filterCount"></div>
+            </button>
+            <div
+                class="oh-dropdown__menu oh-dropdown__filter p-4"
+                x-show="open"
+                @click.outside="open = false"
+                style="display: none"
+            >
+                <form
+                    hx-post="{% url 'work-records-change-month' %}"
+                    hx-target="#workRecordTable"
+                >
+                    {% include 'employee_filters.html' %}
+                    <div class="oh-dropdown__filter-footer">
+                        <button
+                            class="oh-btn oh-btn--secondary oh-btn--small w-100 filterButton"
+                            id="#employeeFilter"
+                        >
+                            {% trans "Filter" %}
+                        </button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
     <div class="d-flex flex-row-reverse m-2">
         <span class="" style="margin-left: 10px;">
             <span class="oh-dot oh-dot--small me-1" style="background-color:#ed4c4c"></span>
@@ -38,7 +71,7 @@
         </thead>
         {% for employee_data in data %}
         <tr>
-            <td style="width:12%">{{ employee_data.employee }}</td>
+            <td style="width:12%"><a style="text-decoration:none;" href ="{% url 'employee-view-individual' employee_data.employee.id %}">{{ employee_data.employee }}</a></td>
 
             {% for date in current_month_dates_list %}
                 {% with work_record=employee_data.work_record|get_item:forloop.counter0 %}
diff --git a/attendance/views/clock_in_out.py b/attendance/views/clock_in_out.py
index c5d708c78..b3c1bc4bb 100644
--- a/attendance/views/clock_in_out.py
+++ b/attendance/views/clock_in_out.py
@@ -295,7 +295,7 @@ def clock_out_attendance_and_activity(employee, date_today, now, out_datetime=No
     """
 
     attendance_activities = AttendanceActivity.objects.filter(
-        employee_id=employee
+        employee_id=employee, clock_out__isnull=True
     ).order_by("attendance_date", "id")
     if attendance_activities.exists():
         attendance_activity = attendance_activities.last()
diff --git a/attendance/views/views.py b/attendance/views/views.py
index c048005c7..66045fdd1 100644
--- a/attendance/views/views.py
+++ b/attendance/views/views.py
@@ -73,6 +73,7 @@ from base.methods import (
     get_pagination,
 )
 from base.models import EmployeeShiftSchedule
+from employee.filters import EmployeeFilter
 from employee.models import Employee, EmployeeWorkInformation
 from horilla.decorators import (
     hx_request_required,
@@ -2030,6 +2031,7 @@ def work_records(request):
 @hx_request_required
 def work_records_change_month(request):
     previous_data = request.GET.urlencode()
+    employee_filter_form = EmployeeFilter()
     if request.GET.get("month"):
         date_obj = request.GET.get("month")
         month = int(date_obj.split("-")[1])
@@ -2040,6 +2042,9 @@ def work_records_change_month(request):
 
     schedules = list(EmployeeShiftSchedule.objects.all())
     employees = list(Employee.objects.filter(is_active=True))
+    if request.method == "POST":
+        employee_filter_form = EmployeeFilter(request.POST)
+        employees = list(employee_filter_form.qs)
     data = []
     month_matrix = calendar.monthcalendar(year, month)
 
@@ -2093,6 +2098,7 @@ def work_records_change_month(request):
         "data": data,
         "pd": previous_data,
         "current_date": date.today(),
+        "f": employee_filter_form,
     }
     return render(
         request, "attendance/work_record/work_record_list.html", context=context