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 b1661a6a0..44262b68d 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
@@ -101,6 +101,36 @@ export function TaskUpsertModalComponent({form, bodyshop}) {
             <FormDatePicker/>
           </Form.Item>
         </Col>
+        <Col span={8}>
+          <Form.Item
+            label={t("tasks.fields.joblineid")}
+            name="joblineid"
+          >
+            <Select placeholder={t("tasks.labels.joblineidplaceholder")}>
+              {/* Add your options here */}
+            </Select>
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            label={t("tasks.fields.partsorderid")}
+            name="partsorderid"
+          >
+            <Select placeholder={t("tasks.labels.partsorderidplaceholder")}>
+              {/* Add your options here */}
+            </Select>
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            label={t("tasks.fields.billid")}
+            name="billid"
+          >
+            <Select placeholder={t("tasks.labels.billidplaceholder")}>
+              {/* Add your options here */}
+            </Select>
+          </Form.Item>
+        </Col>
       </Row>
     </>
   );
diff --git a/client/src/graphql/tasks.queries.js b/client/src/graphql/tasks.queries.js
index 9a501f432..d19b70315 100644
--- a/client/src/graphql/tasks.queries.js
+++ b/client/src/graphql/tasks.queries.js
@@ -82,10 +82,31 @@ export const QUERY_MY_TASKS_PAGINATED = gql`
       remind_at
       priority
       job {
-        ro_number
         id
+        ro_number
+        joblines {
+          id
+          line_desc
+        }
+        bills {
+          id
+          vendor {
+            name
+          }
+          invoice_number
+        }
+        parts_orders {
+          id
+          vendor {
+            name
+          }
+          order_number
+        }
       }
-      bodyshopid
+      jobid
+      joblineid
+      partsorderid
+      billid
     }
     tasks_aggregate(
       where: {