diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 4741826bf..419171248 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -549,12 +549,12 @@ export const GET_JOB_BY_PK = gql`
       actual_delivery
       actual_in
       adjustment_bottom_line
+      alt_transport
       area_of_damage
       auto_add_ats
       available_jobs {
         id
       }
-      alt_transport
       ca_bc_pvrt
       ca_customer_gst
       ca_gst_registrant
@@ -570,10 +570,13 @@ export const GET_JOB_BY_PK = gql`
           year
         }
         id
-        scheduledreturn
         start
         status
+        scheduledreturn
       }
+      cieca_pfl
+      cieca_pfo
+      cieca_pft
       cieca_ttl
       class
       clm_no
@@ -638,8 +641,8 @@ export const GET_JOB_BY_PK = gql`
       ins_city
       ins_co_id
       ins_co_nm
-      ins_ct_ln
       ins_ct_fn
+      ins_ct_ln
       ins_ea
       ins_ph1
       intakechecklist
@@ -648,9 +651,11 @@ export const GET_JOB_BY_PK = gql`
       job_totals
       joblines(where: { removed: { _eq: false } }, order_by: { line_no: asc }) {
         act_price
+        act_price_before_ppc
         ah_detail_line
         alt_partm
         alt_partno
+        assigned_team
         billlines(limit: 1, order_by: { bill: { date: desc } }) {
           actual_cost
           actual_price
@@ -662,8 +667,8 @@ export const GET_JOB_BY_PK = gql`
               name
             }
           }
-          joblineid
           id
+          joblineid
           quantity
         }
         convertedtolbr
@@ -686,6 +691,14 @@ export const GET_JOB_BY_PK = gql`
         notes
         oem_partno
         op_code_desc
+        parts_dispatch_lines(limit: 1, order_by: { accepted_at: desc }) {
+          accepted_at
+          id
+          parts_dispatch {
+            employeeid
+            id
+          }
+        }
         part_qty
         part_type
         prt_dsmk_m
@@ -707,27 +720,27 @@ export const GET_JOB_BY_PK = gql`
       other_amount_payable
       owner {
         id
-        ownr_fn
-        ownr_ln
-        ownr_co_nm
-        ownr_ea
         ownr_addr1
         ownr_addr2
         ownr_city
-        ownr_st
-        ownr_zip
+        ownr_co_nm
         ownr_ctry
+        ownr_ea
+        ownr_fn
+        ownr_ln
         ownr_ph1
         ownr_ph2
+        ownr_st
+        ownr_zip
         tax_number
       }
-      owner_owing
       ownerid
+      owner_owing
       ownr_addr1
       ownr_addr2
-      ownr_ctry
       ownr_city
       ownr_co_nm
+      ownr_ctry
       ownr_ea
       ownr_fn
       ownr_ln
@@ -778,17 +791,17 @@ export const GET_JOB_BY_PK = gql`
       rate_mapa
       rate_mash
       rate_matd
-      regie_number
       referral_source
       referral_source_extra
+      regie_number
       remove_from_ar
       ro_number
       scheduled_completion
       scheduled_delivery
       scheduled_in
       selling_dealer
-      servicing_dealer
       selling_dealer_contact
+      servicing_dealer
       servicing_dealer_contact
       special_coverage_policy
       state_tax_rate
@@ -807,12 +820,11 @@ export const GET_JOB_BY_PK = gql`
       towing_payable
       unit_number
       updated_at
-      v_vin
+      v_color
+      v_make_desc
       v_model_yr
       v_model_desc
-      v_make_desc
-      v_color
-      vehicleid
+      v_vin
       vehicle {
         id
         jobs {
@@ -822,87 +834,16 @@ export const GET_JOB_BY_PK = gql`
           status
         }
         notes
-        location
-        tax_part
-        db_ref
-        manual_line
-        prt_dsmk_p
-        prt_dsmk_m
-        ioucreated
-        convertedtolbr
-        ah_detail_line
-        act_price_before_ppc
-        critical
-        parts_dispatch_lines(limit: 1, order_by: { accepted_at: desc }) {
-          id
-          accepted_at
-          parts_dispatch {
-            id
-            employeeid
-          }
-        }
-        assigned_team
-        billlines(limit: 1, order_by: { bill: { date: desc } }) {
-          id
-          quantity
-          actual_cost
-          actual_price
-          joblineid
-          bill {
-            id
-            invoice_number
-            vendor {
-              id
-              name
-            }
-          }
-        }
         plate_no
         plate_st
         v_color
         v_make_desc
-        v_model_desc
         v_model_yr
+        v_model_desc
         v_paint_codes
         v_vin
       }
-      payments {
-        id
-        jobid
-        amount
-        payer
-        paymentnum
-        created_at
-        transactionid
-        memo
-        date
-        type
-        exportedat
-      }
-      cccontracts {
-        id
-        status
-        start
-        scheduledreturn
-        agreementnumber
-        courtesycar {
-          id
-          make
-          model
-          year
-          plate
-          fleetnumber
-        }
-      }
-      cieca_ttl
-      cieca_pfo
-      cieca_pfl
-      cieca_pft
-      materials
-      csiinvites {
-        id
-        completedon
-      }
+      vehicleid
       voided
     }
   }