diff --git a/src/App.tsx b/src/App.tsx
index 5573c93..6a4976b 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -25,8 +25,6 @@ import {
 import useToposSubnetGetFromEndpoint from './hooks/useToposSubnetGetFromEndpoint'
 import AppInternals from './AppInternals'
 import { TourRefsContext } from './contexts/tourRefs'
-import useSubnetGetLatestBlockNumber from './hooks/useSubnetGetLatestBlockNumber'
-import { CrossSubnetMessagesGraphContext } from './contexts/crossSubnetMessagesGraph'
 
 const Errors = styled.div`
   margin: 1rem auto;
@@ -52,9 +50,6 @@ const App = () => {
   const [errors, setErrors] = useState<string[]>([])
   const { registeredSubnets } = useRegisteredSubnets(selectedToposSubnet)
   const { getToposSubnetFromEndpoint } = useToposSubnetGetFromEndpoint()
-  const [subnetsLatestBlockNumbers, setSubnetsLatestBlockNumbers] =
-    useState<Map<string, number>>()
-  const { getSubnetLatestBlockNumber } = useSubnetGetLatestBlockNumber()
 
   const tourRefs = {
     MenuRef: useRef<HTMLDivElement>(null),
@@ -127,27 +122,6 @@ const App = () => {
     [routeParamsProcessing, subnets]
   )
 
-  useEffect(() => {
-    async function getSubnetsLatestBlockNumbers() {
-      if (subnets) {
-        const newSubnetsLatestBlockNumbers = new Map<string, number>()
-        await Promise.all(
-          subnets.map(async (subnet) => {
-            const latestBlockNumber = await getSubnetLatestBlockNumber(subnet)
-
-            if (latestBlockNumber !== undefined) {
-              newSubnetsLatestBlockNumbers.set(subnet.id, latestBlockNumber)
-            }
-          })
-        )
-
-        setSubnetsLatestBlockNumbers(newSubnetsLatestBlockNumbers)
-      }
-    }
-
-    getSubnetsLatestBlockNumbers()
-  }, [subnets])
-
   return (
     <ThemeProvider theme={theme}>
       <BrowserRouter>
@@ -168,32 +142,28 @@ const App = () => {
               >
                 <SubnetsContext.Provider value={{ data: subnets }}>
                   <BlocksContext.Provider value={blocks}>
-                    <CrossSubnetMessagesGraphContext.Provider
-                      value={{ subnetsLatestBlockNumbers }}
-                    >
-                      <TourRefsContext.Provider value={tourRefs}>
-                        <AppInternals>
-                          <Layout>
-                            <Header />
-                            {Boolean(errors.length) && (
-                              <Errors>
-                                {errors.map((e) => (
-                                  <Alert
-                                    type="error"
-                                    showIcon
-                                    closable
-                                    message={e}
-                                    key={e}
-                                  />
-                                ))}
-                              </Errors>
-                            )}
-                            <Content />
-                            <Footer />
-                          </Layout>
-                        </AppInternals>
-                      </TourRefsContext.Provider>
-                    </CrossSubnetMessagesGraphContext.Provider>
+                    <TourRefsContext.Provider value={tourRefs}>
+                      <AppInternals>
+                        <Layout>
+                          <Header />
+                          {Boolean(errors.length) && (
+                            <Errors>
+                              {errors.map((e) => (
+                                <Alert
+                                  type="error"
+                                  showIcon
+                                  closable
+                                  message={e}
+                                  key={e}
+                                />
+                              ))}
+                            </Errors>
+                          )}
+                          <Content />
+                          <Footer />
+                        </Layout>
+                      </AppInternals>
+                    </TourRefsContext.Provider>
                   </BlocksContext.Provider>
                 </SubnetsContext.Provider>
               </SelectedNetworksContext.Provider>
diff --git a/src/AppInternals.tsx b/src/AppInternals.tsx
index 7a7dbaf..ee8fedf 100644
--- a/src/AppInternals.tsx
+++ b/src/AppInternals.tsx
@@ -1,6 +1,5 @@
 import { ReactNode, useContext } from 'react'
 
-import { BlocksContext } from './contexts/blocks'
 import { SelectedNetworksContext } from './contexts/selectedNetworks'
 import useSubnetSubscribeToCertificates from './hooks/useSubnetSubscribeToCertificates'
 import { CertificatesContext } from './contexts/certificates'
@@ -18,17 +17,10 @@ interface Props {
 
 const AppInternals = ({ children }: Props) => {
   const { selectedSubnet } = useContext(SelectedNetworksContext)
-  const blocks = useContext(BlocksContext)
   const { certificates } = useSubnetSubscribeToCertificates({
-    sourceSubnetIds: selectedSubnet
-      ? [
-          {
-            position: blocks[0]?.number,
-            sourceSubnetId: { value: selectedSubnet.id },
-          },
-        ]
-      : undefined,
-    limit: 1,
+    filter: {
+      source: selectedSubnet?.id,
+    },
   })
 
   return (
diff --git a/src/__generated__/gql.ts b/src/__generated__/gql.ts
index 03cb8b4..558c853 100644
--- a/src/__generated__/gql.ts
+++ b/src/__generated__/gql.ts
@@ -13,9 +13,9 @@ import { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/
  * Therefore it is highly recommended to use the babel or swc plugin for production.
  */
 const documents = {
-    "\n  query Certificate($certificateId: CertificateId!) {\n    certificate(certificateId: $certificateId) {\n      prevId\n      id\n      proof\n      signature\n      sourceSubnetId {\n        value\n      }\n      stateRoot\n      targetSubnets {\n        value\n      }\n      receiptsRootHash\n      txRootHash\n      verifier\n    }\n  }\n": types.CertificateDocument,
-    "\n  query Certificates($fromSourceCheckpoint: SourceCheckpoint!, $limit: Int!) {\n    certificates(fromSourceCheckpoint: $fromSourceCheckpoint, first: $limit) {\n      prevId\n      id\n      proof\n      signature\n      sourceSubnetId {\n        value\n      }\n      stateRoot\n      targetSubnets {\n        value\n      }\n      receiptsRootHash\n      txRootHash\n      verifier\n    }\n  }\n": types.CertificatesDocument,
-    "\n  subscription OnCertificates($filter: SubnetFilter) {\n    watchDeliveredCertificates(filter: $filter) {\n      prevId\n      id\n      proof\n      signature\n      sourceSubnetId {\n        value\n      }\n      stateRoot\n      targetSubnets {\n        value\n      }\n      receiptsRootHash\n      txRootHash\n      verifier\n    }\n  }\n": types.OnCertificatesDocument,
+    "\n  query Certificate($certificateId: String!) {\n    certificate(certificateId: $certificateId) {\n      prevId\n      id\n      positions {\n        source {\n          sourceSubnetId\n          position\n        }\n      }\n      proof\n      signature\n      sourceSubnetId\n      stateRoot\n      targetSubnets\n      receiptsRootHash\n      txRootHash\n      verifier\n    }\n  }\n": types.CertificateDocument,
+    "\n  query Certificates(\n    $fromSourceCheckpoint: SourceCheckpointInput!\n    $limit: Int!\n  ) {\n    certificates(fromSourceCheckpoint: $fromSourceCheckpoint, first: $limit) {\n      prevId\n      id\n      positions {\n        source {\n          position\n          sourceSubnetId\n        }\n      }\n      proof\n      signature\n      sourceSubnetId\n      stateRoot\n      targetSubnets\n      receiptsRootHash\n      txRootHash\n      verifier\n    }\n  }\n": types.CertificatesDocument,
+    "\n  subscription OnCertificates($filter: SubnetFilter) {\n    watchDeliveredCertificates(filter: $filter) {\n      prevId\n      id\n      positions {\n        source {\n          sourceSubnetId\n          position\n        }\n      }\n      proof\n      signature\n      sourceSubnetId\n      stateRoot\n      targetSubnets\n      receiptsRootHash\n      txRootHash\n      verifier\n    }\n  }\n": types.OnCertificatesDocument,
 };
 
 /**
@@ -35,15 +35,15 @@ export function graphql(source: string): unknown;
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query Certificate($certificateId: CertificateId!) {\n    certificate(certificateId: $certificateId) {\n      prevId\n      id\n      proof\n      signature\n      sourceSubnetId {\n        value\n      }\n      stateRoot\n      targetSubnets {\n        value\n      }\n      receiptsRootHash\n      txRootHash\n      verifier\n    }\n  }\n"): (typeof documents)["\n  query Certificate($certificateId: CertificateId!) {\n    certificate(certificateId: $certificateId) {\n      prevId\n      id\n      proof\n      signature\n      sourceSubnetId {\n        value\n      }\n      stateRoot\n      targetSubnets {\n        value\n      }\n      receiptsRootHash\n      txRootHash\n      verifier\n    }\n  }\n"];
+export function graphql(source: "\n  query Certificate($certificateId: String!) {\n    certificate(certificateId: $certificateId) {\n      prevId\n      id\n      positions {\n        source {\n          sourceSubnetId\n          position\n        }\n      }\n      proof\n      signature\n      sourceSubnetId\n      stateRoot\n      targetSubnets\n      receiptsRootHash\n      txRootHash\n      verifier\n    }\n  }\n"): (typeof documents)["\n  query Certificate($certificateId: String!) {\n    certificate(certificateId: $certificateId) {\n      prevId\n      id\n      positions {\n        source {\n          sourceSubnetId\n          position\n        }\n      }\n      proof\n      signature\n      sourceSubnetId\n      stateRoot\n      targetSubnets\n      receiptsRootHash\n      txRootHash\n      verifier\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query Certificates($fromSourceCheckpoint: SourceCheckpoint!, $limit: Int!) {\n    certificates(fromSourceCheckpoint: $fromSourceCheckpoint, first: $limit) {\n      prevId\n      id\n      proof\n      signature\n      sourceSubnetId {\n        value\n      }\n      stateRoot\n      targetSubnets {\n        value\n      }\n      receiptsRootHash\n      txRootHash\n      verifier\n    }\n  }\n"): (typeof documents)["\n  query Certificates($fromSourceCheckpoint: SourceCheckpoint!, $limit: Int!) {\n    certificates(fromSourceCheckpoint: $fromSourceCheckpoint, first: $limit) {\n      prevId\n      id\n      proof\n      signature\n      sourceSubnetId {\n        value\n      }\n      stateRoot\n      targetSubnets {\n        value\n      }\n      receiptsRootHash\n      txRootHash\n      verifier\n    }\n  }\n"];
+export function graphql(source: "\n  query Certificates(\n    $fromSourceCheckpoint: SourceCheckpointInput!\n    $limit: Int!\n  ) {\n    certificates(fromSourceCheckpoint: $fromSourceCheckpoint, first: $limit) {\n      prevId\n      id\n      positions {\n        source {\n          position\n          sourceSubnetId\n        }\n      }\n      proof\n      signature\n      sourceSubnetId\n      stateRoot\n      targetSubnets\n      receiptsRootHash\n      txRootHash\n      verifier\n    }\n  }\n"): (typeof documents)["\n  query Certificates(\n    $fromSourceCheckpoint: SourceCheckpointInput!\n    $limit: Int!\n  ) {\n    certificates(fromSourceCheckpoint: $fromSourceCheckpoint, first: $limit) {\n      prevId\n      id\n      positions {\n        source {\n          position\n          sourceSubnetId\n        }\n      }\n      proof\n      signature\n      sourceSubnetId\n      stateRoot\n      targetSubnets\n      receiptsRootHash\n      txRootHash\n      verifier\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  subscription OnCertificates($filter: SubnetFilter) {\n    watchDeliveredCertificates(filter: $filter) {\n      prevId\n      id\n      proof\n      signature\n      sourceSubnetId {\n        value\n      }\n      stateRoot\n      targetSubnets {\n        value\n      }\n      receiptsRootHash\n      txRootHash\n      verifier\n    }\n  }\n"): (typeof documents)["\n  subscription OnCertificates($filter: SubnetFilter) {\n    watchDeliveredCertificates(filter: $filter) {\n      prevId\n      id\n      proof\n      signature\n      sourceSubnetId {\n        value\n      }\n      stateRoot\n      targetSubnets {\n        value\n      }\n      receiptsRootHash\n      txRootHash\n      verifier\n    }\n  }\n"];
+export function graphql(source: "\n  subscription OnCertificates($filter: SubnetFilter) {\n    watchDeliveredCertificates(filter: $filter) {\n      prevId\n      id\n      positions {\n        source {\n          sourceSubnetId\n          position\n        }\n      }\n      proof\n      signature\n      sourceSubnetId\n      stateRoot\n      targetSubnets\n      receiptsRootHash\n      txRootHash\n      verifier\n    }\n  }\n"): (typeof documents)["\n  subscription OnCertificates($filter: SubnetFilter) {\n    watchDeliveredCertificates(filter: $filter) {\n      prevId\n      id\n      positions {\n        source {\n          sourceSubnetId\n          position\n        }\n      }\n      proof\n      signature\n      sourceSubnetId\n      stateRoot\n      targetSubnets\n      receiptsRootHash\n      txRootHash\n      verifier\n    }\n  }\n"];
 
 export function graphql(source: string) {
   return (documents as any)[source] ?? {};
diff --git a/src/__generated__/graphql.ts b/src/__generated__/graphql.ts
index 666ef4f..d75b627 100644
--- a/src/__generated__/graphql.ts
+++ b/src/__generated__/graphql.ts
@@ -19,19 +19,21 @@ export type Scalars = {
 export type Certificate = {
   __typename?: 'Certificate';
   id: Scalars['String']['output'];
+  positions: CertificatePositions;
   prevId: Scalars['String']['output'];
   proof: Scalars['String']['output'];
   receiptsRootHash: Scalars['String']['output'];
   signature: Scalars['String']['output'];
-  sourceSubnetId: SubnetId;
+  sourceSubnetId: Scalars['String']['output'];
   stateRoot: Scalars['String']['output'];
-  targetSubnets: Array<SubnetId>;
+  targetSubnets: Array<Scalars['String']['output']>;
   txRootHash: Scalars['String']['output'];
   verifier: Scalars['Int']['output'];
 };
 
-export type CertificateId = {
-  value: Scalars['String']['input'];
+export type CertificatePositions = {
+  __typename?: 'CertificatePositions';
+  source: SourceStreamPosition;
 };
 
 export type QueryRoot = {
@@ -43,38 +45,35 @@ export type QueryRoot = {
 
 
 export type QueryRootCertificateArgs = {
-  certificateId: CertificateId;
+  certificateId: Scalars['String']['input'];
 };
 
 
 export type QueryRootCertificatesArgs = {
   first: Scalars['Int']['input'];
-  fromSourceCheckpoint: SourceCheckpoint;
+  fromSourceCheckpoint: SourceCheckpointInput;
 };
 
-export type SourceCheckpoint = {
-  positions: Array<SourceStreamPosition>;
-  sourceSubnetIds: Array<SubnetIdInput>;
+export type SourceCheckpointInput = {
+  positions: Array<SourceStreamPositionInput>;
+  sourceSubnetIds: Array<Scalars['String']['input']>;
 };
 
 export type SourceStreamPosition = {
-  certificateId?: InputMaybe<CertificateId>;
-  position: Scalars['Int']['input'];
-  sourceSubnetId: SubnetIdInput;
-};
-
-export type SubnetFilter = {
-  source?: InputMaybe<SubnetIdInput>;
-  target?: InputMaybe<SubnetIdInput>;
+  __typename?: 'SourceStreamPosition';
+  position: Scalars['Int']['output'];
+  sourceSubnetId: Scalars['String']['output'];
 };
 
-export type SubnetId = {
-  __typename?: 'SubnetId';
-  value: Scalars['String']['output'];
+export type SourceStreamPositionInput = {
+  certificateId?: InputMaybe<Scalars['String']['input']>;
+  position: Scalars['Int']['input'];
+  sourceSubnetId: Scalars['String']['input'];
 };
 
-export type SubnetIdInput = {
-  value: Scalars['String']['input'];
+export type SubnetFilter = {
+  source?: InputMaybe<Scalars['String']['input']>;
+  target?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type SubscriptionRoot = {
@@ -96,28 +95,28 @@ export type SubscriptionRootWatchDeliveredCertificatesArgs = {
 };
 
 export type CertificateQueryVariables = Exact<{
-  certificateId: CertificateId;
+  certificateId: Scalars['String']['input'];
 }>;
 
 
-export type CertificateQuery = { __typename?: 'QueryRoot', certificate: { __typename?: 'Certificate', prevId: string, id: string, proof: string, signature: string, stateRoot: string, receiptsRootHash: string, txRootHash: string, verifier: number, sourceSubnetId: { __typename?: 'SubnetId', value: string }, targetSubnets: Array<{ __typename?: 'SubnetId', value: string }> } };
+export type CertificateQuery = { __typename?: 'QueryRoot', certificate: { __typename?: 'Certificate', prevId: string, id: string, proof: string, signature: string, sourceSubnetId: string, stateRoot: string, targetSubnets: Array<string>, receiptsRootHash: string, txRootHash: string, verifier: number, positions: { __typename?: 'CertificatePositions', source: { __typename?: 'SourceStreamPosition', sourceSubnetId: string, position: number } } } };
 
 export type CertificatesQueryVariables = Exact<{
-  fromSourceCheckpoint: SourceCheckpoint;
+  fromSourceCheckpoint: SourceCheckpointInput;
   limit: Scalars['Int']['input'];
 }>;
 
 
-export type CertificatesQuery = { __typename?: 'QueryRoot', certificates: Array<{ __typename?: 'Certificate', prevId: string, id: string, proof: string, signature: string, stateRoot: string, receiptsRootHash: string, txRootHash: string, verifier: number, sourceSubnetId: { __typename?: 'SubnetId', value: string }, targetSubnets: Array<{ __typename?: 'SubnetId', value: string }> }> };
+export type CertificatesQuery = { __typename?: 'QueryRoot', certificates: Array<{ __typename?: 'Certificate', prevId: string, id: string, proof: string, signature: string, sourceSubnetId: string, stateRoot: string, targetSubnets: Array<string>, receiptsRootHash: string, txRootHash: string, verifier: number, positions: { __typename?: 'CertificatePositions', source: { __typename?: 'SourceStreamPosition', position: number, sourceSubnetId: string } } }> };
 
 export type OnCertificatesSubscriptionVariables = Exact<{
   filter?: InputMaybe<SubnetFilter>;
 }>;
 
 
-export type OnCertificatesSubscription = { __typename?: 'SubscriptionRoot', watchDeliveredCertificates: { __typename?: 'Certificate', prevId: string, id: string, proof: string, signature: string, stateRoot: string, receiptsRootHash: string, txRootHash: string, verifier: number, sourceSubnetId: { __typename?: 'SubnetId', value: string }, targetSubnets: Array<{ __typename?: 'SubnetId', value: string }> } };
+export type OnCertificatesSubscription = { __typename?: 'SubscriptionRoot', watchDeliveredCertificates: { __typename?: 'Certificate', prevId: string, id: string, proof: string, signature: string, sourceSubnetId: string, stateRoot: string, targetSubnets: Array<string>, receiptsRootHash: string, txRootHash: string, verifier: number, positions: { __typename?: 'CertificatePositions', source: { __typename?: 'SourceStreamPosition', sourceSubnetId: string, position: number } } } };
 
 
-export const CertificateDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"Certificate"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"certificateId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CertificateId"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"certificate"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"certificateId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"certificateId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"prevId"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"proof"}},{"kind":"Field","name":{"kind":"Name","value":"signature"}},{"kind":"Field","name":{"kind":"Name","value":"sourceSubnetId"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"value"}}]}},{"kind":"Field","name":{"kind":"Name","value":"stateRoot"}},{"kind":"Field","name":{"kind":"Name","value":"targetSubnets"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"value"}}]}},{"kind":"Field","name":{"kind":"Name","value":"receiptsRootHash"}},{"kind":"Field","name":{"kind":"Name","value":"txRootHash"}},{"kind":"Field","name":{"kind":"Name","value":"verifier"}}]}}]}}]} as unknown as DocumentNode<CertificateQuery, CertificateQueryVariables>;
-export const CertificatesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"Certificates"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"fromSourceCheckpoint"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"SourceCheckpoint"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"limit"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"certificates"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"fromSourceCheckpoint"},"value":{"kind":"Variable","name":{"kind":"Name","value":"fromSourceCheckpoint"}}},{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"Variable","name":{"kind":"Name","value":"limit"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"prevId"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"proof"}},{"kind":"Field","name":{"kind":"Name","value":"signature"}},{"kind":"Field","name":{"kind":"Name","value":"sourceSubnetId"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"value"}}]}},{"kind":"Field","name":{"kind":"Name","value":"stateRoot"}},{"kind":"Field","name":{"kind":"Name","value":"targetSubnets"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"value"}}]}},{"kind":"Field","name":{"kind":"Name","value":"receiptsRootHash"}},{"kind":"Field","name":{"kind":"Name","value":"txRootHash"}},{"kind":"Field","name":{"kind":"Name","value":"verifier"}}]}}]}}]} as unknown as DocumentNode<CertificatesQuery, CertificatesQueryVariables>;
-export const OnCertificatesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"subscription","name":{"kind":"Name","value":"OnCertificates"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"filter"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"SubnetFilter"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"watchDeliveredCertificates"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"filter"},"value":{"kind":"Variable","name":{"kind":"Name","value":"filter"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"prevId"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"proof"}},{"kind":"Field","name":{"kind":"Name","value":"signature"}},{"kind":"Field","name":{"kind":"Name","value":"sourceSubnetId"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"value"}}]}},{"kind":"Field","name":{"kind":"Name","value":"stateRoot"}},{"kind":"Field","name":{"kind":"Name","value":"targetSubnets"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"value"}}]}},{"kind":"Field","name":{"kind":"Name","value":"receiptsRootHash"}},{"kind":"Field","name":{"kind":"Name","value":"txRootHash"}},{"kind":"Field","name":{"kind":"Name","value":"verifier"}}]}}]}}]} as unknown as DocumentNode<OnCertificatesSubscription, OnCertificatesSubscriptionVariables>;
\ No newline at end of file
+export const CertificateDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"Certificate"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"certificateId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"certificate"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"certificateId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"certificateId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"prevId"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"positions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"source"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"sourceSubnetId"}},{"kind":"Field","name":{"kind":"Name","value":"position"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"proof"}},{"kind":"Field","name":{"kind":"Name","value":"signature"}},{"kind":"Field","name":{"kind":"Name","value":"sourceSubnetId"}},{"kind":"Field","name":{"kind":"Name","value":"stateRoot"}},{"kind":"Field","name":{"kind":"Name","value":"targetSubnets"}},{"kind":"Field","name":{"kind":"Name","value":"receiptsRootHash"}},{"kind":"Field","name":{"kind":"Name","value":"txRootHash"}},{"kind":"Field","name":{"kind":"Name","value":"verifier"}}]}}]}}]} as unknown as DocumentNode<CertificateQuery, CertificateQueryVariables>;
+export const CertificatesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"Certificates"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"fromSourceCheckpoint"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"SourceCheckpointInput"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"limit"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"certificates"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"fromSourceCheckpoint"},"value":{"kind":"Variable","name":{"kind":"Name","value":"fromSourceCheckpoint"}}},{"kind":"Argument","name":{"kind":"Name","value":"first"},"value":{"kind":"Variable","name":{"kind":"Name","value":"limit"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"prevId"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"positions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"source"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"sourceSubnetId"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"proof"}},{"kind":"Field","name":{"kind":"Name","value":"signature"}},{"kind":"Field","name":{"kind":"Name","value":"sourceSubnetId"}},{"kind":"Field","name":{"kind":"Name","value":"stateRoot"}},{"kind":"Field","name":{"kind":"Name","value":"targetSubnets"}},{"kind":"Field","name":{"kind":"Name","value":"receiptsRootHash"}},{"kind":"Field","name":{"kind":"Name","value":"txRootHash"}},{"kind":"Field","name":{"kind":"Name","value":"verifier"}}]}}]}}]} as unknown as DocumentNode<CertificatesQuery, CertificatesQueryVariables>;
+export const OnCertificatesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"subscription","name":{"kind":"Name","value":"OnCertificates"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"filter"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"SubnetFilter"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"watchDeliveredCertificates"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"filter"},"value":{"kind":"Variable","name":{"kind":"Name","value":"filter"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"prevId"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"positions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"source"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"sourceSubnetId"}},{"kind":"Field","name":{"kind":"Name","value":"position"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"proof"}},{"kind":"Field","name":{"kind":"Name","value":"signature"}},{"kind":"Field","name":{"kind":"Name","value":"sourceSubnetId"}},{"kind":"Field","name":{"kind":"Name","value":"stateRoot"}},{"kind":"Field","name":{"kind":"Name","value":"targetSubnets"}},{"kind":"Field","name":{"kind":"Name","value":"receiptsRootHash"}},{"kind":"Field","name":{"kind":"Name","value":"txRootHash"}},{"kind":"Field","name":{"kind":"Name","value":"verifier"}}]}}]}}]} as unknown as DocumentNode<OnCertificatesSubscription, OnCertificatesSubscriptionVariables>;
\ No newline at end of file
diff --git a/src/components/CrossSubnetMessagesGraph.tsx b/src/components/CrossSubnetMessagesGraph.tsx
index 9639afa..8d57345 100644
--- a/src/components/CrossSubnetMessagesGraph.tsx
+++ b/src/components/CrossSubnetMessagesGraph.tsx
@@ -3,12 +3,11 @@ import styled from '@emotion/styled'
 import { Alert as AntdAlert, Space, Typography } from 'antd'
 import ForceGraph from 'force-graph'
 import { useContext, useEffect, useMemo, useRef } from 'react'
+import { useNavigate } from 'react-router-dom'
 
 import { SubnetWithId } from '../types'
 import { SubnetsContext } from '../contexts/subnets'
 import useSubnetSubscribeToCertificates from '../hooks/useSubnetSubscribeToCertificates'
-import { SourceStreamPosition } from '../__generated__/graphql'
-import { CrossSubnetMessagesGraphContext } from '../contexts/crossSubnetMessagesGraph'
 
 const { Text } = Typography
 
@@ -27,35 +26,9 @@ type Link = {
 
 const CrossSubnetMessagesGraph = function () {
   const { data: subnets } = useContext(SubnetsContext)
-  const { subnetsLatestBlockNumbers } = useContext(
-    CrossSubnetMessagesGraphContext
-  )
-  const { certificates } = useSubnetSubscribeToCertificates(
-    subnets && subnetsLatestBlockNumbers
-      ? {
-          limit: 2,
-          sourceSubnetIds: subnets?.reduce(
-            (acc: Array<SourceStreamPosition> | undefined, subnet) => {
-              const latestBlockNumber = subnetsLatestBlockNumbers.get(subnet.id)
-
-              if (latestBlockNumber !== undefined && acc === undefined) {
-                acc = []
-              }
-
-              if (latestBlockNumber !== undefined) {
-                acc!.push({
-                  position: latestBlockNumber,
-                  sourceSubnetId: { value: subnet.id },
-                })
-              }
+  const { certificates } = useSubnetSubscribeToCertificates({})
+  const navigate = useNavigate()
 
-              return acc
-            },
-            undefined
-          ),
-        }
-      : {}
-  )
   const graphElement = useRef<HTMLDivElement>(null)
 
   const certificatesWithTarget = useMemo(
@@ -76,10 +49,10 @@ const CrossSubnetMessagesGraph = function () {
             return { ...subnet, img }
           }),
           links: (certificatesWithTarget || []).reduce((acc: Link[], curr) => {
-            curr.targetSubnets.forEach((t) => {
+            curr.targetSubnets.forEach((targetSubnet) => {
               acc.push({
-                source: curr.sourceSubnetId.value,
-                target: t.value.toString(),
+                source: curr.sourceSubnetId,
+                target: targetSubnet,
                 certificateId: curr.id,
                 weight: 1,
               })
@@ -152,6 +125,9 @@ const CrossSubnetMessagesGraph = function () {
             (link) => data.nodes.find((n) => n.id === link.source)?.id || null
           )
           .linkLabel('certificateId')
+          .onLinkClick(({ certificateId, source }: any) => {
+            navigate(`/subnet/${source?.id}/certificate/${certificateId}`)
+          })
           .nodeLabel('name')
           .cooldownTicks(100)
           .height(600)
@@ -169,17 +145,8 @@ const CrossSubnetMessagesGraph = function () {
           <Space>
             <InfoCircleOutlined style={{ color: 'white' }} />
             <Text>
-              Listening for certificates with cross-subnet messages from these
-              positions: (
-              {subnets?.map((subnet, index, array) => {
-                const position = subnetsLatestBlockNumbers?.get(subnet.id)
-                return (
-                  <span key={subnet.id}>
-                    {subnet.name}: {position}
-                    {index !== array.length - 1 ? ', ' : ')'}
-                  </span>
-                )
-              })}
+              This view displays live cross-subnet messages exchanged between
+              subnets
             </Text>
           </Space>
         }
diff --git a/src/components/MainQuery.tsx b/src/components/MainQuery.tsx
index 46bdee4..277d94b 100644
--- a/src/components/MainQuery.tsx
+++ b/src/components/MainQuery.tsx
@@ -37,11 +37,10 @@ const MainQuery = () => {
     limit: 1,
     sourceStreamPosition: {
       position: isNaN(+sanitizedQuery) ? Infinity : parseInt(sanitizedQuery),
-      sourceSubnetId: { value: selectedSubnet?.id || '' },
+      sourceSubnetId: selectedSubnet?.id || '',
     },
   })
   const { balance } = useSubnetGetAccountBalance(selectedSubnet, sanitizedQuery)
-  console.log(balance)
 
   const options = useMemo(() => {
     const options = []
diff --git a/src/components/SubnetBlockInfo.tsx b/src/components/SubnetBlockInfo.tsx
index 0caaf35..8e8dea3 100644
--- a/src/components/SubnetBlockInfo.tsx
+++ b/src/components/SubnetBlockInfo.tsx
@@ -63,7 +63,7 @@ const SubnetBlockInfo = ({ blockWithTransactions }: Props) => {
         <Descriptions.Item label="Subnet">
           <SubnetNameAndLogo subnet={selectedSubnet} />
         </Descriptions.Item>
-        <Descriptions.Item label="Parent" span={2}>
+        <Descriptions.Item label="Parent hash" span={2}>
           <Link
             to={`/subnet/${selectedSubnet?.id}/block/${blockWithTransactions?.parentHash}`}
           >
diff --git a/src/components/SubnetCertificateInfo.tsx b/src/components/SubnetCertificateInfo.tsx
index c3fc84c..2db5085 100644
--- a/src/components/SubnetCertificateInfo.tsx
+++ b/src/components/SubnetCertificateInfo.tsx
@@ -11,10 +11,12 @@ import {
 } from 'antd'
 import { useContext, useMemo } from 'react'
 
+import { Certificate } from '../__generated__/graphql'
 import { SelectedNetworksContext } from '../contexts/selectedNetworks'
-import SubnetNameAndLogo from './SubnetNameAndLogo'
-import { Certificate, SubnetWithId } from '../types'
 import { SubnetsContext } from '../contexts/subnets'
+import { SubnetWithId } from '../types'
+import Link from './Link'
+import SubnetNameAndLogo from './SubnetNameAndLogo'
 
 const Item = styled(List.Item)`
   padding-left: 0.5rem !important;
@@ -45,7 +47,7 @@ const SubnetCertificateInfo = ({ certificate }: Props) => {
   const targetSubnets = useMemo(
     () =>
       certificate?.targetSubnets.reduce((acc: SubnetWithId[], targetSubnet) => {
-        const subnet = subnets?.find((s) => s.id === targetSubnet.value)
+        const subnet = subnets?.find((s) => s.id === targetSubnet)
 
         if (subnet) {
           acc.push(subnet)
@@ -62,24 +64,30 @@ const SubnetCertificateInfo = ({ certificate }: Props) => {
         Info
       </Divider>
       <Descriptions>
-        {/* <Descriptions.Item label="Position">
-          {certificate?.position !== undefined
-            ? certificate?.position
-            : 'Unknown'}
-        </Descriptions.Item> */}
-        <Descriptions.Item label="Source subnet" span={3}>
+        <Descriptions.Item label="Source subnet" span={1}>
           <SubnetNameAndLogo subnet={selectedSubnet} />
         </Descriptions.Item>
         <Descriptions.Item label="Id" span={3}>
           {certificate?.id}
         </Descriptions.Item>
-        {/* <Descriptions.Item label="Prev id" span={2}>
+        <Descriptions.Item label="Position" span={1}>
+          {certificate?.positions.source.position || 'Unknown'}
+        </Descriptions.Item>
+        <Descriptions.Item label="Prev id" span={3}>
           <Link
             to={`/subnet/${selectedSubnet?.id}/certificate/${certificate?.prevId}`}
           >
             {certificate?.prevId}
           </Link>
-        </Descriptions.Item> */}
+        </Descriptions.Item>
+        <Descriptions.Item label="Signature" span={2}>
+          0x{certificate?.signature}
+        </Descriptions.Item>
+      </Descriptions>
+      <Divider orientation="left" style={{ margin: '2rem 0' }}>
+        Data
+      </Divider>
+      <Descriptions>
         <Descriptions.Item label="State root" span={3}>
           0x{certificate?.stateRoot}
         </Descriptions.Item>
@@ -89,10 +97,10 @@ const SubnetCertificateInfo = ({ certificate }: Props) => {
         <Descriptions.Item label="Transaction trie root" span={3}>
           0x{certificate?.txRootHash}
         </Descriptions.Item>
-        <Descriptions.Item label="Signature" span={2}>
-          0x{certificate?.signature}
-        </Descriptions.Item>
       </Descriptions>
+      <Divider orientation="left" style={{ margin: '2rem 0' }}>
+        Target subnets
+      </Divider>
       <Row gutter={16}>
         <Col span={8}>
           <Card>
@@ -103,9 +111,6 @@ const SubnetCertificateInfo = ({ certificate }: Props) => {
           </Card>
         </Col>
       </Row>
-      <Divider orientation="left" style={{ margin: '2rem 0' }}>
-        Target subnets
-      </Divider>
       <List
         dataSource={targetSubnets}
         rowKey="id"
diff --git a/src/components/SubnetCertificatesList.tsx b/src/components/SubnetCertificatesList.tsx
index bae664a..81f6c61 100644
--- a/src/components/SubnetCertificatesList.tsx
+++ b/src/components/SubnetCertificatesList.tsx
@@ -1,6 +1,6 @@
 import { CaretRightOutlined } from '@ant-design/icons'
 import styled from '@emotion/styled'
-import { useCallback, useContext, useState } from 'react'
+import { useCallback, useContext, useEffect, useState } from 'react'
 
 import {
   Descriptions,
@@ -13,7 +13,7 @@ import {
 } from 'antd'
 import { Link as _Link, useNavigate } from 'react-router-dom'
 
-import { BlocksContext } from '../contexts/blocks'
+import { CertificatesContext } from '../contexts/certificates'
 import { SubnetsContext } from '../contexts/subnets'
 import { SelectedNetworksContext } from '../contexts/selectedNetworks'
 import useSubnetGetCertificates from '../hooks/useSubnetGetCertificates'
@@ -70,18 +70,35 @@ const { Text } = Typography
 const PAGE_SIZE = 8
 
 const CertificatesList = () => {
+  const [currentPage, setCurrentPage] = useState(1)
+  const [firstSubscribedCertPosition, setFirstSubscribedCertPosition] =
+    useState<number>()
   const { data: subnets } = useContext(SubnetsContext)
-  const blocks = useContext(BlocksContext)
+  const certificatesFromSubscription = useContext(CertificatesContext)
   const { selectedSubnet } = useContext(SelectedNetworksContext)
-  const [currentPage, setCurrentPage] = useState(1)
   const { certificates, loading } = useSubnetGetCertificates({
     limit: PAGE_SIZE,
     skip: PAGE_SIZE * (currentPage - 1),
     sourceStreamPosition: {
-      sourceSubnetId: { value: selectedSubnet?.id || '' },
+      sourceSubnetId: selectedSubnet?.id || '',
     },
   })
 
+  useEffect(
+    function getFirstSubscribedCertPosition() {
+      if (
+        certificatesFromSubscription &&
+        certificatesFromSubscription.length &&
+        firstSubscribedCertPosition == undefined
+      ) {
+        setFirstSubscribedCertPosition(
+          certificatesFromSubscription[0].positions.source.position
+        )
+      }
+    },
+    [certificatesFromSubscription]
+  )
+
   const navigate = useNavigate()
 
   const handleSearch = useCallback(
@@ -109,7 +126,7 @@ const CertificatesList = () => {
       />
       <List
         dataSource={certificates}
-        loading={loading}
+        loading={loading || firstSubscribedCertPosition == undefined}
         pagination={{
           position: 'bottom',
           align: 'start',
@@ -118,7 +135,7 @@ const CertificatesList = () => {
           },
           pageSize: PAGE_SIZE,
           showSizeChanger: false,
-          total: blocks[0]?.number,
+          total: firstSubscribedCertPosition,
         }}
         rowKey="id"
         renderItem={(certificate) => (
@@ -134,8 +151,8 @@ const CertificatesList = () => {
                       <CaretRightOutlined />
                       {certificate.targetSubnets.map((subnetId) => (
                         <SubnetNameAndLogo
-                          key={subnetId.value}
-                          subnet={subnets?.find((s) => s.id === subnetId.value)}
+                          key={subnetId}
+                          subnet={subnets?.find((s) => s.id === subnetId)}
                         />
                       ))}
                     </Space>
@@ -148,7 +165,7 @@ const CertificatesList = () => {
               <List.Item.Meta
                 title={
                   <Space>
-                    <Text>{certificate.position}</Text>
+                    <Text>{certificate.positions.source.position}</Text>
                   </Space>
                 }
                 description={certificate.id}
diff --git a/src/components/SubnetInfo.tsx b/src/components/SubnetInfo.tsx
index 41677fd..fc3eb30 100644
--- a/src/components/SubnetInfo.tsx
+++ b/src/components/SubnetInfo.tsx
@@ -121,7 +121,7 @@ const SubnetInfo = () => {
               loading={!Boolean(certificates && certificates.length)}
               value={
                 Boolean(certificates && certificates.length)
-                  ? certificates![0].position
+                  ? certificates![0].positions.source.position
                   : 0
               }
             />
@@ -206,6 +206,7 @@ const SubnetInfo = () => {
                   setCurrentPage(page)
                 },
                 pageSize: PAGE_SIZE,
+                showSizeChanger: false,
               }}
               rowKey="id"
               renderItem={(certificate, index) => (
@@ -220,10 +221,8 @@ const SubnetInfo = () => {
                           <Space>
                             {certificate.targetSubnets.map((subnetId) => (
                               <SubnetNameAndLogo
-                                key={subnetId.value}
-                                subnet={subnets?.find(
-                                  (s) => s.id === subnetId.value
-                                )}
+                                key={subnetId}
+                                subnet={subnets?.find((s) => s.id === subnetId)}
                               />
                             ))}
                           </Space>
@@ -236,7 +235,7 @@ const SubnetInfo = () => {
                     <List.Item.Meta
                       title={
                         <Space>
-                          <Text>{certificate.position}</Text>
+                          <Text>{certificate.positions.source.position}</Text>
                           {currentPage === 1 && index === 0 ? (
                             <Tag color="gold">Latest</Tag>
                           ) : null}
diff --git a/src/contexts/certificates.ts b/src/contexts/certificates.ts
index dd4a424..2291b5a 100644
--- a/src/contexts/certificates.ts
+++ b/src/contexts/certificates.ts
@@ -1,5 +1,5 @@
 import { createContext } from 'react'
 
-import { Certificate } from '../types'
+import { Certificate } from '../__generated__/graphql'
 
 export const CertificatesContext = createContext<Certificate[]>([])
diff --git a/src/contexts/crossSubnetMessagesGraph.ts b/src/contexts/crossSubnetMessagesGraph.ts
deleted file mode 100644
index fd3fab0..0000000
--- a/src/contexts/crossSubnetMessagesGraph.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { createContext } from 'react'
-
-export const CrossSubnetMessagesGraphContext = createContext<{
-  subnetsLatestBlockNumbers?: Map<string, number>
-}>({})
diff --git a/src/hooks/useSubnetGetCertificateById.tsx b/src/hooks/useSubnetGetCertificateById.tsx
index a66723f..ace19f1 100644
--- a/src/hooks/useSubnetGetCertificateById.tsx
+++ b/src/hooks/useSubnetGetCertificateById.tsx
@@ -8,19 +8,21 @@ import { SelectedNetworksContext } from '../contexts/selectedNetworks'
 // import { ErrorsContext } from '../contexts/errors'
 
 const GET_CERTIFICATE = graphql(`
-  query Certificate($certificateId: CertificateId!) {
+  query Certificate($certificateId: String!) {
     certificate(certificateId: $certificateId) {
       prevId
       id
+      positions {
+        source {
+          sourceSubnetId
+          position
+        }
+      }
       proof
       signature
-      sourceSubnetId {
-        value
-      }
+      sourceSubnetId
       stateRoot
-      targetSubnets {
-        value
-      }
+      targetSubnets
       receiptsRootHash
       txRootHash
       verifier
@@ -42,9 +44,7 @@ export default function useSubnetGetCertificateById({
 
   const { data, error, loading } = useQuery(GET_CERTIFICATE, {
     variables: {
-      certificateId: {
-        value: certificateId || '',
-      },
+      certificateId: certificateId || '',
     },
   })
 
@@ -53,7 +53,7 @@ export default function useSubnetGetCertificateById({
       if (data) {
         if (
           !data?.certificate ||
-          (data.certificate.sourceSubnetId.value !== selectedSubnet?.id &&
+          (data.certificate.sourceSubnetId !== selectedSubnet?.id &&
             selectedSubnet)
         ) {
           setErrors((e) => [
diff --git a/src/hooks/useSubnetGetCertificates.tsx b/src/hooks/useSubnetGetCertificates.tsx
index 19f4fe3..a1b52c2 100644
--- a/src/hooks/useSubnetGetCertificates.tsx
+++ b/src/hooks/useSubnetGetCertificates.tsx
@@ -8,19 +8,24 @@ const DEFAULT_LIMIT = 10
 const DEFAULT_SKIP = 0
 
 const GET_CERTIFICATES = graphql(`
-  query Certificates($fromSourceCheckpoint: SourceCheckpoint!, $limit: Int!) {
+  query Certificates(
+    $fromSourceCheckpoint: SourceCheckpointInput!
+    $limit: Int!
+  ) {
     certificates(fromSourceCheckpoint: $fromSourceCheckpoint, first: $limit) {
       prevId
       id
+      positions {
+        source {
+          position
+          sourceSubnetId
+        }
+      }
       proof
       signature
-      sourceSubnetId {
-        value
-      }
+      sourceSubnetId
       stateRoot
-      targetSubnets {
-        value
-      }
+      targetSubnets
       receiptsRootHash
       txRootHash
       verifier
@@ -66,17 +71,7 @@ export default function useSubnetGetCertificates({
       },
       limit: definedLimit,
     },
-    pollInterval: 2000,
   })
 
-  const certificates = useMemo(
-    () =>
-      data?.certificates.map((certificate, index) => ({
-        ...certificate,
-        position: sourceStreamPosition?.position || definedSkip + index,
-      })),
-    [data]
-  )
-
-  return { certificates, error, loading }
+  return { certificates: data?.certificates, error, loading }
 }
diff --git a/src/hooks/useSubnetGetLatestBlockNumber.ts b/src/hooks/useSubnetGetLatestBlockNumber.ts
deleted file mode 100644
index 612f245..0000000
--- a/src/hooks/useSubnetGetLatestBlockNumber.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { getDefaultProvider } from 'ethers'
-import { useCallback, useContext } from 'react'
-
-import { ErrorsContext } from '../contexts/errors'
-import { Subnet } from '../types'
-
-export default function useSubnetGetLatestBlockNumber() {
-  const { setErrors } = useContext(ErrorsContext)
-
-  const getSubnetLatestBlockNumber = useCallback((subnet?: Subnet) => {
-    if (subnet) {
-      try {
-        const provider = getDefaultProvider(
-          subnet.endpointHttp || subnet.endpointWs
-        )
-        return provider.getBlockNumber()
-      } catch (error) {
-        setErrors((e) => [
-          ...e,
-          `Error when getting ${subnet.name}'s latest block number!`,
-        ])
-      }
-    }
-  }, [])
-
-  return { getSubnetLatestBlockNumber }
-}
diff --git a/src/hooks/useSubnetSubscribeToCertificates.tsx b/src/hooks/useSubnetSubscribeToCertificates.tsx
index fd9bf4b..fbdcb9f 100644
--- a/src/hooks/useSubnetSubscribeToCertificates.tsx
+++ b/src/hooks/useSubnetSubscribeToCertificates.tsx
@@ -2,23 +2,24 @@ import { useSubscription } from '@apollo/client'
 import { useEffect, useState } from 'react'
 
 import { graphql } from '../__generated__/gql'
-import { Certificate } from '../types'
-import { SubnetFilter } from '../__generated__/graphql'
+import { Certificate, SubnetFilter } from '../__generated__/graphql'
 
 const WATCH_CERTIFICATES = graphql(`
   subscription OnCertificates($filter: SubnetFilter) {
     watchDeliveredCertificates(filter: $filter) {
       prevId
       id
+      positions {
+        source {
+          sourceSubnetId
+          position
+        }
+      }
       proof
       signature
-      sourceSubnetId {
-        value
-      }
+      sourceSubnetId
       stateRoot
-      targetSubnets {
-        value
-      }
+      targetSubnets
       receiptsRootHash
       txRootHash
       verifier
diff --git a/src/routes/SubnetCertificate.tsx b/src/routes/SubnetCertificate.tsx
index f4a6601..c8651e1 100644
--- a/src/routes/SubnetCertificate.tsx
+++ b/src/routes/SubnetCertificate.tsx
@@ -8,14 +8,13 @@ import { Space } from 'antd'
 import { useParams } from 'react-router-dom'
 import SubnetNameAndLogo from '../components/SubnetNameAndLogo'
 import { RouteParamsFirstContext } from '../contexts/routeParamsFirst'
-// Deactivating certificate page by position for now
-// import useSubnetGetCertificates from '../hooks/useSubnetGetCertificates'
+import useSubnetGetCertificates from '../hooks/useSubnetGetCertificates'
 import useSubnetGetCertificateById from '../hooks/useSubnetGetCertificateById'
 
 type CertificatePositionOrId = 'position' | 'id'
 
 const SubnetCertificate = () => {
-  const { certificatePositionOrId, subnetId } = useParams() // For now certificatePositionOrId is position only
+  const { certificatePositionOrId, subnetId } = useParams()
   const { setRouteParamsProcessing } = useContext(RouteParamsFirstContext)
   const { selectedSubnet } = useContext(SelectedNetworksContext)
 
@@ -29,22 +28,20 @@ const SubnetCertificate = () => {
     return isHexString(certificatePositionOrId) ? 'id' : 'position'
   }, [certificatePositionOrId])
 
-  // Deactivating certificate page by position for now
-  //
-  // const { certificates } = useSubnetGetCertificates({
-  //   sourceStreamPosition: {
-  //     position:
-  //       certificatePositionOrId &&
-  //       typeOfCertificatePositionOrId &&
-  //       typeOfCertificatePositionOrId === 'position'
-  //         ? parseInt(certificatePositionOrId)
-  //         : undefined,
-  //     sourceSubnetId: { value: selectedSubnet?.id || '' },
-  //   },
-  //   limit: 1,
-  // })
+  const { certificates: certificatesByPosition } = useSubnetGetCertificates({
+    sourceStreamPosition: {
+      position:
+        certificatePositionOrId &&
+        typeOfCertificatePositionOrId &&
+        typeOfCertificatePositionOrId === 'position'
+          ? parseInt(certificatePositionOrId)
+          : Infinity,
+      sourceSubnetId: selectedSubnet?.id || '',
+    },
+    limit: 1,
+  })
 
-  const { certificate } = useSubnetGetCertificateById({
+  const { certificate: certificateById } = useSubnetGetCertificateById({
     certificateId:
       certificatePositionOrId &&
       typeOfCertificatePositionOrId &&
@@ -73,8 +70,11 @@ const SubnetCertificate = () => {
       ]}
     >
       <Space direction="vertical">
-        {Boolean(certificate) && (
-          <SubnetCertificateInfo certificate={certificate} />
+        {certificatesByPosition !== undefined && (
+          <SubnetCertificateInfo certificate={certificatesByPosition[0]} />
+        )}
+        {certificateById !== undefined && (
+          <SubnetCertificateInfo certificate={certificateById} />
         )}
       </Space>
     </RouteContainer>
diff --git a/src/types.ts b/src/types.ts
index c9755db..c9f31da 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -1,5 +1,3 @@
-import { Certificate as CertificateFromQuery } from './__generated__/graphql'
-
 export interface Subnet {
   chainId: bigint
   currencySymbol: string
@@ -23,7 +21,3 @@ export interface FetchData<T> {
   error?: Error
   loading?: boolean
 }
-
-export interface Certificate extends CertificateFromQuery {
-  position?: number
-}