diff --git a/client/src/components/parts-queue-list/parts-queue.list.component.jsx b/client/src/components/parts-queue-list/parts-queue.list.component.jsx
index ea8d26225..e26773598 100644
--- a/client/src/components/parts-queue-list/parts-queue.list.component.jsx
+++ b/client/src/components/parts-queue-list/parts-queue.list.component.jsx
@@ -102,7 +102,7 @@ export function PartsQueueListComponent({bodyshop}) {
     const handleOnRowClick = (record) => {
         if (record) {
             if (record.id) {
-                history.push({
+                history({
                     search: queryString.stringify({
                         ...searchParams,
                         selected: record.id,
diff --git a/client/src/graphql/csi.queries.js b/client/src/graphql/csi.queries.js
index 653b96b32..4f74e7be3 100644
--- a/client/src/graphql/csi.queries.js
+++ b/client/src/graphql/csi.queries.js
@@ -65,8 +65,8 @@ export const QUERY_CSI_RESPONSE_PAGINATED = gql`
             job {
                 ownr_fn
                 ownr_ln
-                owneridro_number
-
+                ownerid
+                ro_number
                 id
             }
         }
@@ -80,7 +80,8 @@ export const QUERY_CSI_RESPONSE_PAGINATED = gql`
 export const QUERY_CSI_RESPONSE_BY_PK = gql`
     query QUERY_CSI_RESPONSE_BY_PK($id: uuid!) {
         csi_by_pk(id: $id) {
-            completedonrelateddata
+            completedon
+            relateddata
             valid
             validuntil
             id