diff --git a/src/pages/employee/EmployeeList.jsx b/src/pages/employee/EmployeeList.jsx
index 41caf5bb..ca830712 100644
--- a/src/pages/employee/EmployeeList.jsx
+++ b/src/pages/employee/EmployeeList.jsx
@@ -61,7 +61,16 @@ const EmployeeList = () => {
 
     const results = employeeList.filter((item) => {
       const fullName = `${item.firstName} ${item.lastName}`.toLowerCase();
-      return fullName.includes(value);
+      const email = item.email ? item.email.toLowerCase() : "";
+      const phoneNumber = item.phoneNumber ? item.phoneNumber.toLowerCase() : "";
+      const jobRole = item.jobRole ? item.jobRole.toLowerCase() : ""; // Get jobRole and convert to lowercase
+
+      return (
+        fullName.includes(value) ||
+        email.includes(value) ||
+        phoneNumber.includes(value) ||
+        jobRole.includes(value) // Include jobRole in the search
+      );
     });
 
     setFilteredData(results);
@@ -294,7 +303,8 @@ const EmployeeList = () => {
                       </label>
                     </div>
 
-                    {/* Show Inactive Employees Switch */}                    
+                    {/* Show Inactive Employees Switch */}
+                    {!showAllEmployees && (
                       <div className="form-check form-switch text-start">
                         <input
                           type="checkbox"
@@ -308,7 +318,8 @@ const EmployeeList = () => {
                           Show Inactive Employees
                         </label>
                       </div>
-                  
+                    )}
+
                   </div>
 
                   {/* Right side: Search + Export + Add Employee */}