diff --git a/backend/dataconnect/connector/taxForm/queries.gql b/backend/dataconnect/connector/taxForm/queries.gql
index e7d65579..0581f24f 100644
--- a/backend/dataconnect/connector/taxForm/queries.gql
+++ b/backend/dataconnect/connector/taxForm/queries.gql
@@ -1,13 +1,47 @@
-query listTaxForms @auth(level: USER) {
-  taxForms {
+
+# ==========================================================
+# TAX FORM - QUERIES (USE where, NOT filter)
+# Include ALL fields from the new TaxForm type
+# ==========================================================
+
+query listTaxForms($offset: Int, $limit: Int) @auth(level: USER) {
+  taxForms(offset: $offset, limit: $limit, orderBy: { createdAt: DESC }) {
     id
     formType
-    title
-    subtitle
-    description
+    firstName
+    lastName
+    mInitial
+    oLastName
+    dob
+    socialSN
+    email
+    phone
+    address
+    city
+    apt
+    state
+    zipCode
+
+    marital
+    multipleJob
+    childrens
+    otherDeps
+    totalCredits
+    otherInconme
+    deductions
+    extraWithholding
+
+    citizen
+    uscis
+    passportNumber
+    countryIssue
+    prepartorOrTranslator
+
+    signature
+    date
+
     status
     staffId
-    formData
     createdAt
     updatedAt
     createdBy
@@ -18,38 +52,105 @@ query getTaxFormById($id: UUID!) @auth(level: USER) {
   taxForm(id: $id) {
     id
     formType
-    title
-    subtitle
-    description
+    firstName
+    lastName
+    mInitial
+    oLastName
+    dob
+    socialSN
+    email
+    phone
+    address
+    city
+    apt
+    state
+    zipCode
+
+    marital
+    multipleJob
+    childrens
+    otherDeps
+    totalCredits
+    otherInconme
+    deductions
+    extraWithholding
+
+    citizen
+    uscis
+    passportNumber
+    countryIssue
+    prepartorOrTranslator
+
+    signature
+    date
+
     status
     staffId
-    formData
     createdAt
     updatedAt
     createdBy
   }
 }
 
-query getTaxFormsBystaffId($staffId: UUID!) @auth(level: USER) {
-  taxForms(where: { staffId: { eq: $staffId } }) {
+query getTaxFormsByStaffId(
+  $staffId: UUID!
+  $offset: Int
+  $limit: Int
+) @auth(level: USER) {
+  taxForms(
+    where: { staffId: { eq: $staffId } }
+    offset: $offset
+    limit: $limit
+    orderBy: { createdAt: DESC }
+  ) {
     id
     formType
-    title
-    subtitle
-    description
+    firstName
+    lastName
+    mInitial
+    oLastName
+    dob
+    socialSN
+    email
+    phone
+    address
+    city
+    apt
+    state
+    zipCode
+
+    marital
+    multipleJob
+    childrens
+    otherDeps
+    totalCredits
+    otherInconme
+    deductions
+    extraWithholding
+
+    citizen
+    uscis
+    passportNumber
+    countryIssue
+    prepartorOrTranslator
+
+    signature
+    date
+
     status
     staffId
-    formData
     createdAt
     updatedAt
     createdBy
   }
 }
 
-query filterTaxForms(
+query listTaxFormsWhere(
   $formType: TaxFormType
   $status: TaxFormStatus
   $staffId: UUID
+  $offset: Int
+  $limit: Int
 ) @auth(level: USER) {
   taxForms(
     where: {
@@ -57,11 +158,48 @@ query filterTaxForms(
       status: { eq: $status }
       staffId: { eq: $staffId }
     }
+    offset: $offset
+    limit: $limit
+    orderBy: { createdAt: DESC }
   ) {
     id
     formType
-    title
+    firstName
+    lastName
+    mInitial
+    oLastName
+    dob
+    socialSN
+    email
+    phone
+    address
+    city
+    apt
+    state
+    zipCode
+
+    marital
+    multipleJob
+    childrens
+    otherDeps
+    totalCredits
+    otherInconme
+    deductions
+    extraWithholding
+
+    citizen
+    uscis
+    passportNumber
+    countryIssue
+    prepartorOrTranslator
+
+    signature
+    date
+
     status
     staffId
+    createdAt
+    updatedAt
+    createdBy
   }
 }