diff --git a/client/src/components/task-list/task-list.component.jsx b/client/src/components/task-list/task-list.component.jsx
index 13e0f44bc..a7782236b 100644
--- a/client/src/components/task-list/task-list.component.jsx
+++ b/client/src/components/task-list/task-list.component.jsx
@@ -247,11 +247,6 @@ function TaskListComponent({
     }
   );
 
-  const [state, setState] = useState({
-    sortedInfo: {},
-    filteredInfo: { text: "" }
-  });
-
   const handleCreateTask = useCallback(() => {
     setTaskUpsertContext({
       actions: {},
diff --git a/client/src/components/task-upsert-modal/task-upsert-modal.component.jsx b/client/src/components/task-upsert-modal/task-upsert-modal.component.jsx
index ab5d69d3a..691edf94c 100644
--- a/client/src/components/task-upsert-modal/task-upsert-modal.component.jsx
+++ b/client/src/components/task-upsert-modal/task-upsert-modal.component.jsx
@@ -131,13 +131,12 @@ export function TaskUpsertModalComponent({
               allowClear
               placeholder={t("tasks.placeholders.joblineid")}
               disabled={!selectedJobDetails || !selectedJobId}
-            >
-              {selectedJobDetails?.joblines?.map((jobline) => (
-                <Select.Option key={jobline.id} value={jobline.id}>
-                  {jobline.line_desc}
-                </Select.Option>
-              ))}
-            </Select>
+              options={selectedJobDetails?.joblines?.map((jobline) => ({
+                key: jobline.id,
+                value: jobline.id,
+                label: jobline.line_desc
+              }))}
+            />
           </Form.Item>
         </Col>
         <Col span={8}>
@@ -146,13 +145,12 @@ export function TaskUpsertModalComponent({
               allowClear
               placeholder={t("tasks.placeholders.partsorderid")}
               disabled={!selectedJobDetails || !selectedJobId}
-            >
-              {selectedJobDetails?.parts_orders?.map((partsOrder) => (
-                <Select.Option key={partsOrder.id} value={partsOrder.id}>
-                  {partsOrder.order_number} - {partsOrder.vendor.name}
-                </Select.Option>
-              ))}
-            </Select>
+              options={selectedJobDetails?.parts_orders?.map((partsOrder) => ({
+                key: partsOrder.id,
+                value: partsOrder.id,
+                label: `${partsOrder.order_number} - ${partsOrder.vendor.name}`
+              }))}
+            />
           </Form.Item>
         </Col>
         <Col span={8}>
@@ -161,13 +159,12 @@ export function TaskUpsertModalComponent({
               allowClear
               placeholder={t("tasks.placeholders.billid")}
               disabled={!selectedJobDetails || !selectedJobId}
-            >
-              {selectedJobDetails?.bills?.map((bill) => (
-                <Select.Option key={bill.id} value={bill.id}>
-                  {bill.invoice_number} - {bill.vendor.name}
-                </Select.Option>
-              ))}
-            </Select>
+              options={selectedJobDetails?.bills?.map((bill) => ({
+                key: bill.id,
+                value: bill.id,
+                label: `${bill.invoice_number} - ${bill.vendor.name}`
+              }))}
+            />
           </Form.Item>
         </Col>
       </Row>
@@ -183,15 +180,16 @@ export function TaskUpsertModalComponent({
               }
             ]}
           >
-            <Select placeholder={t("tasks.placeholders.assigned_to")}>
-              {bodyshop.employees
+            <Select
+              placeholder={t("tasks.placeholders.assigned_to")}
+              options={bodyshop.employees
                 .filter((x) => x.active)
-                .map((employee) => (
-                  <Select.Option key={employee.id} value={employee.user_email}>
-                    {employee.first_name} {employee.last_name}
-                  </Select.Option>
-                ))}
-            </Select>
+                .map((employee) => ({
+                  key: employee.id,
+                  value: employee.user_email,
+                  label: `${employee.first_name} ${employee.last_name}`
+                }))}
+            />
           </Form.Item>
         </Col>
         <Col span={8}>
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 00548e815..d78f7904a 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -100,11 +100,6 @@ export const QUERY_ALL_ACTIVE_JOBS = gql`
       suspended
       est_ct_fn
       est_ct_ln
-      tasks_aggregate(where: { completed: { _eq: false }, deleted: { _eq: false } }) {
-        aggregate {
-          count
-        }
-      }
     }
   }
 `;