diff --git a/resources/js/api/beam.ts b/resources/js/api/beam.ts
index f44f6db..c948bb5 100644
--- a/resources/js/api/beam.ts
+++ b/resources/js/api/beam.ts
@@ -9,11 +9,10 @@ export class BeamApi {
 
     static async getBeam(getBeamData: Record<string, unknown>) {
         const data = {
-            query: queries.GetBeam,
+            query: getBeamData.internal ? queries.GetBeamInternal : queries.GetBeam,
             variables: {
                 code: getBeamData.code,
                 account: getBeamData.account,
-                internal: getBeamData.internal,
             },
         };
 
@@ -22,12 +21,11 @@ export class BeamApi {
 
     static async getBeams(getBeamsData: Record<string, unknown>) {
         const data = {
-            query: queries.GetBeams,
+            query: getBeamsData.internal ? queries.GetBeamsInternal : queries.GetBeams,
             variables: {
                 codes: getBeamsData.codes,
                 names: getBeamsData.names,
                 after: getBeamsData.after,
-                internal: getBeamsData.internal,
             },
         };
 
@@ -52,7 +50,7 @@ export class BeamApi {
 
     static async getSingleUseCodes(getSingleUseCodesData: Record<string, unknown>) {
         const data = {
-            query: queries.GetSingleUseCodes,
+            query: getSingleUseCodesData.internal ? queries.GetSingleUseCodesInternal : queries.GetSingleUseCodes,
             variables: {
                 code: getSingleUseCodesData.code,
                 first: 20,
diff --git a/resources/js/api/queries.ts b/resources/js/api/queries.ts
index 7f186f3..bb590d4 100644
--- a/resources/js/api/queries.ts
+++ b/resources/js/api/queries.ts
@@ -8,9 +8,12 @@ import GetWallet from '~/graphql/query/GetWallet';
 import GetWallets from '~/graphql/query/GetWallets';
 
 import GetBeam from '~/graphql/query/beam/GetBeam';
+import GetBeamInternal from '~/graphql/query/beam/GetBeamInternal';
 import GetBeams from '~/graphql/query/beam/GetBeams';
+import GetBeamsInternal from '~/graphql/query/beam/GetBeamsInternal';
 import GetClaims from '~/graphql/query/beam/GetClaims';
 import GetSingleUseCodes from '~/graphql/query/beam/GetSingleUseCodes';
+import GetSingleUseCodesInternal from '~/graphql/query/beam/GetSingleUseCodesInternal';
 
 import Login from '~/graphql/query/auth/Login';
 import LoginRecaptcha from '~/graphql/query/auth/LoginRecaptcha';
@@ -37,9 +40,12 @@ export default {
     GetWallets,
 
     GetBeam,
+    GetBeamInternal,
     GetBeams,
+    GetBeamsInternal,
     GetClaims,
     GetSingleUseCodes,
+    GetSingleUseCodesInternal,
 
     Login,
     LoginRecaptcha,
diff --git a/resources/js/components/beam/BeamsList.vue b/resources/js/components/beam/BeamsList.vue
index 83e6964..5c5f193 100644
--- a/resources/js/components/beam/BeamsList.vue
+++ b/resources/js/components/beam/BeamsList.vue
@@ -58,10 +58,18 @@
                             v-if="selectedBeams.length > 0"
                             class="absolute left-14 top-0 flex h-12 items-center space-x-3 bg-light-surface-primary dark:bg-dark-surface-primary sm:left-12"
                         >
-                            <Btn dusk="expireAllBtn" class="!px-2 !py-1 text-sm animate-fade-in" @click="expireSelectedBeams"
+                            <Btn
+                                dusk="expireAllBtn"
+                                class="!px-2 !py-1 text-sm animate-fade-in"
+                                @click="expireSelectedBeams"
                                 >{{ `Expire ${selectedBeams.length > 1 ? 'All' : ''} ` }}
                             </Btn>
-                            <Btn dusk="exportBtn" class="!px-2 !py-1 text-sm animate-fade-in" @click="exportSelectedBeams">Export</Btn>
+                            <Btn
+                                dusk="exportBtn"
+                                class="!px-2 !py-1 text-sm animate-fade-in"
+                                @click="exportSelectedBeams"
+                                >Export</Btn
+                            >
                         </div>
                         <table
                             id="beamsTable"
diff --git a/resources/js/graphql/query/beam/GetBeam.ts b/resources/js/graphql/query/beam/GetBeam.ts
index dde1b1d..ace8c1a 100644
--- a/resources/js/graphql/query/beam/GetBeam.ts
+++ b/resources/js/graphql/query/beam/GetBeam.ts
@@ -1,4 +1,4 @@
-export default `query GetBeam($code: String!, $account: String, $internal: Boolean = false) {
+export default `query GetBeam($code: String!, $account: String) {
     GetBeam(code: $code, account: $account) {
       id
       code
@@ -16,9 +16,5 @@ export default `query GetBeam($code: String!, $account: String, $internal: Boole
         url
         payload
       }
-      claimConditions @include(if: $internal) {
-        type
-        value
-      }
     }
 }`;
diff --git a/resources/js/graphql/query/beam/GetBeamInternal.ts b/resources/js/graphql/query/beam/GetBeamInternal.ts
new file mode 100644
index 0000000..2260672
--- /dev/null
+++ b/resources/js/graphql/query/beam/GetBeamInternal.ts
@@ -0,0 +1,24 @@
+export default `query GetBeam($code: String!, $account: String) {
+    GetBeam(code: $code, account: $account) {
+      id
+      code
+      name
+      description
+      image
+      start
+      end
+      collection {
+        collectionId
+      }
+      isClaimable
+      flags
+      qr {
+        url
+        payload
+      }
+      claimConditions {
+        type
+        value
+      }
+    }
+}`;
diff --git a/resources/js/graphql/query/beam/GetBeams.ts b/resources/js/graphql/query/beam/GetBeams.ts
index e5f5719..0a72f4e 100644
--- a/resources/js/graphql/query/beam/GetBeams.ts
+++ b/resources/js/graphql/query/beam/GetBeams.ts
@@ -1,4 +1,4 @@
-export default `query GetBeams($codes: [String!], $names: [String!], $after: String = null, $first: Int = 15, $internal: Boolean = false) {
+export default `query GetBeams($codes: [String!], $names: [String!], $after: String = null, $first: Int = 15) {
     GetBeams(codes: $codes, names: $names, after: $after, first: $first) {
       edges {
         node {
@@ -18,10 +18,6 @@ export default `query GetBeams($codes: [String!], $names: [String!], $after: Str
             url
             payload
           }
-          claimConditions @include(if: $internal) {
-            type
-            value
-          }
         }
       }
       pageInfo {
diff --git a/resources/js/graphql/query/beam/GetBeamsInternal.ts b/resources/js/graphql/query/beam/GetBeamsInternal.ts
new file mode 100644
index 0000000..014c13b
--- /dev/null
+++ b/resources/js/graphql/query/beam/GetBeamsInternal.ts
@@ -0,0 +1,33 @@
+export default `query GetBeams($codes: [String!], $names: [String!], $after: String = null, $first: Int = 15) {
+    GetBeams(codes: $codes, names: $names, after: $after, first: $first) {
+      edges {
+        node {
+          id
+          code
+          name
+          description
+          image
+          start
+          end
+          collection {
+            collectionId
+          }
+          isClaimable
+          flags
+          qr {
+            url
+            payload
+          }
+          claimConditions {
+            type
+            value
+          }
+        }
+      }
+      pageInfo {
+        endCursor
+        hasNextPage
+      }
+      totalCount
+    }
+  }`;
diff --git a/resources/js/graphql/query/beam/GetSingleUseCodes.ts b/resources/js/graphql/query/beam/GetSingleUseCodes.ts
index ce60f4b..cae209b 100644
--- a/resources/js/graphql/query/beam/GetSingleUseCodes.ts
+++ b/resources/js/graphql/query/beam/GetSingleUseCodes.ts
@@ -1,4 +1,4 @@
-export default `query GetSingleUseCodes($code: String!, $after: String = null, $first: Int = 15, $internal: Boolean = false) {
+export default `query GetSingleUseCodes($code: String!, $after: String = null, $first: Int = 15) {
     GetSingleUseCodes(
       code: $code
       after: $after
@@ -31,10 +31,6 @@ export default `query GetSingleUseCodes($code: String!, $after: String = null, $
             }
             image
             flags
-            claimConditions @include(if: $internal) {
-              type
-              value
-            }
           }
         }
       }
diff --git a/resources/js/graphql/query/beam/GetSingleUseCodesInternal.ts b/resources/js/graphql/query/beam/GetSingleUseCodesInternal.ts
new file mode 100644
index 0000000..c465024
--- /dev/null
+++ b/resources/js/graphql/query/beam/GetSingleUseCodesInternal.ts
@@ -0,0 +1,47 @@
+export default `query GetSingleUseCodes($code: String!, $after: String = null, $first: Int = 15) {
+    GetSingleUseCodes(
+      code: $code
+      after: $after
+      first: $first
+    ) {
+      edges {
+        node {
+          id
+          collection {
+            collectionId
+          }
+          tokenId
+          quantity
+          claimedAt
+          claimStatus
+          type
+          code
+          qr {
+            url
+            payload
+          }
+          beam {
+            name
+            description
+            start
+            end
+            isClaimable
+            collection {
+              collectionId
+            }
+            image
+            flags
+            claimConditions {
+              type
+              value
+            }
+          }
+        }
+      }
+      pageInfo {
+        endCursor
+        hasNextPage
+      }
+      totalCount
+    }
+  }`;