diff --git a/lerna.json b/lerna.json
index 6bbb011e..90c61fd2 100644
--- a/lerna.json
+++ b/lerna.json
@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.2.80",
+  "version": "0.2.81",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "command": {
diff --git a/packages/cache/package.json b/packages/cache/package.json
index f28c74f0..bb2ad053 100644
--- a/packages/cache/package.json
+++ b/packages/cache/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/cache",
-  "version": "0.2.80",
+  "version": "0.2.81",
   "description": "Generic object cache",
   "main": "dist/index.js",
   "scripts": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 049f3197..ee29c1e3 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/cli",
-  "version": "0.2.80",
+  "version": "0.2.81",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "scripts": {
@@ -15,13 +15,13 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@cerc-io/cache": "^0.2.80",
-    "@cerc-io/ipld-eth-client": "^0.2.80",
+    "@cerc-io/cache": "^0.2.81",
+    "@cerc-io/ipld-eth-client": "^0.2.81",
     "@cerc-io/libp2p": "^0.42.2-laconic-0.1.4",
     "@cerc-io/nitro-node": "^0.1.15",
-    "@cerc-io/peer": "^0.2.80",
-    "@cerc-io/rpc-eth-client": "^0.2.80",
-    "@cerc-io/util": "^0.2.80",
+    "@cerc-io/peer": "^0.2.81",
+    "@cerc-io/rpc-eth-client": "^0.2.81",
+    "@cerc-io/util": "^0.2.81",
     "@ethersproject/providers": "^5.4.4",
     "@graphql-tools/utils": "^9.1.1",
     "@ipld/dag-cbor": "^8.0.0",
diff --git a/packages/codegen/package.json b/packages/codegen/package.json
index be335820..0df932f5 100644
--- a/packages/codegen/package.json
+++ b/packages/codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/codegen",
-  "version": "0.2.80",
+  "version": "0.2.81",
   "description": "Code generator",
   "private": true,
   "main": "index.js",
@@ -20,7 +20,7 @@
   },
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
-    "@cerc-io/util": "^0.2.80",
+    "@cerc-io/util": "^0.2.81",
     "@graphql-tools/load-files": "^6.5.2",
     "@npmcli/package-json": "^5.0.0",
     "@poanet/solidity-flattener": "https://github.com/vulcanize/solidity-flattener.git",
diff --git a/packages/codegen/src/templates/package-template.handlebars b/packages/codegen/src/templates/package-template.handlebars
index 9e71c193..8cdd9c4a 100644
--- a/packages/codegen/src/templates/package-template.handlebars
+++ b/packages/codegen/src/templates/package-template.handlebars
@@ -41,12 +41,12 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.80",
-    "@cerc-io/ipld-eth-client": "^0.2.80",
-    "@cerc-io/solidity-mapper": "^0.2.80",
-    "@cerc-io/util": "^0.2.80",
+    "@cerc-io/cli": "^0.2.81",
+    "@cerc-io/ipld-eth-client": "^0.2.81",
+    "@cerc-io/solidity-mapper": "^0.2.81",
+    "@cerc-io/util": "^0.2.81",
     {{#if (subgraphPath)}}
-    "@cerc-io/graph-node": "^0.2.80",
+    "@cerc-io/graph-node": "^0.2.81",
     {{/if}}
     "@ethersproject/providers": "^5.4.4",
     "debug": "^4.3.1",
diff --git a/packages/graph-node/package.json b/packages/graph-node/package.json
index 16828783..0a25cd08 100644
--- a/packages/graph-node/package.json
+++ b/packages/graph-node/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@cerc-io/graph-node",
-  "version": "0.2.80",
+  "version": "0.2.81",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
-    "@cerc-io/solidity-mapper": "^0.2.80",
+    "@cerc-io/solidity-mapper": "^0.2.81",
     "@ethersproject/providers": "^5.4.4",
     "@graphprotocol/graph-ts": "^0.22.0",
     "@nomiclabs/hardhat-ethers": "^2.0.2",
@@ -51,9 +51,9 @@
   "dependencies": {
     "@apollo/client": "^3.3.19",
     "@cerc-io/assemblyscript": "0.19.10-watcher-ts-0.1.2",
-    "@cerc-io/cache": "^0.2.80",
-    "@cerc-io/ipld-eth-client": "^0.2.80",
-    "@cerc-io/util": "^0.2.80",
+    "@cerc-io/cache": "^0.2.81",
+    "@cerc-io/ipld-eth-client": "^0.2.81",
+    "@cerc-io/util": "^0.2.81",
     "@types/json-diff": "^0.5.2",
     "@types/yargs": "^17.0.0",
     "bn.js": "^4.11.9",
diff --git a/packages/ipld-eth-client/package.json b/packages/ipld-eth-client/package.json
index a2e48917..86791335 100644
--- a/packages/ipld-eth-client/package.json
+++ b/packages/ipld-eth-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/ipld-eth-client",
-  "version": "0.2.80",
+  "version": "0.2.81",
   "description": "IPLD ETH Client",
   "main": "dist/index.js",
   "scripts": {
@@ -20,8 +20,8 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@cerc-io/cache": "^0.2.80",
-    "@cerc-io/util": "^0.2.80",
+    "@cerc-io/cache": "^0.2.81",
+    "@cerc-io/util": "^0.2.81",
     "cross-fetch": "^3.1.4",
     "debug": "^4.3.1",
     "ethers": "^5.4.4",
diff --git a/packages/peer/package.json b/packages/peer/package.json
index b5546533..98787061 100644
--- a/packages/peer/package.json
+++ b/packages/peer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/peer",
-  "version": "0.2.80",
+  "version": "0.2.81",
   "description": "libp2p module",
   "main": "dist/index.js",
   "exports": "./dist/index.js",
diff --git a/packages/rpc-eth-client/package.json b/packages/rpc-eth-client/package.json
index fc7a2aec..5f1b95cb 100644
--- a/packages/rpc-eth-client/package.json
+++ b/packages/rpc-eth-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/rpc-eth-client",
-  "version": "0.2.80",
+  "version": "0.2.81",
   "description": "RPC ETH Client",
   "main": "dist/index.js",
   "scripts": {
@@ -19,9 +19,9 @@
   },
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
-    "@cerc-io/cache": "^0.2.80",
-    "@cerc-io/ipld-eth-client": "^0.2.80",
-    "@cerc-io/util": "^0.2.80",
+    "@cerc-io/cache": "^0.2.81",
+    "@cerc-io/ipld-eth-client": "^0.2.81",
+    "@cerc-io/util": "^0.2.81",
     "chai": "^4.3.4",
     "ethers": "^5.4.4",
     "left-pad": "^1.3.0",
diff --git a/packages/solidity-mapper/package.json b/packages/solidity-mapper/package.json
index 995f5ebb..511d8c0a 100644
--- a/packages/solidity-mapper/package.json
+++ b/packages/solidity-mapper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/solidity-mapper",
-  "version": "0.2.80",
+  "version": "0.2.81",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
diff --git a/packages/test/package.json b/packages/test/package.json
index 40af4e1a..4310ac60 100644
--- a/packages/test/package.json
+++ b/packages/test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/test",
-  "version": "0.2.80",
+  "version": "0.2.81",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "private": true,
diff --git a/packages/tracing-client/package.json b/packages/tracing-client/package.json
index f4851158..3dfee3a5 100644
--- a/packages/tracing-client/package.json
+++ b/packages/tracing-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/tracing-client",
-  "version": "0.2.80",
+  "version": "0.2.81",
   "description": "ETH VM tracing client",
   "main": "dist/index.js",
   "scripts": {
diff --git a/packages/util/package.json b/packages/util/package.json
index cffb0df1..5b82ee6a 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@cerc-io/util",
-  "version": "0.2.80",
+  "version": "0.2.81",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "dependencies": {
     "@apollo/utils.keyvaluecache": "^1.0.1",
     "@cerc-io/nitro-node": "^0.1.15",
-    "@cerc-io/peer": "^0.2.80",
-    "@cerc-io/solidity-mapper": "^0.2.80",
+    "@cerc-io/peer": "^0.2.81",
+    "@cerc-io/solidity-mapper": "^0.2.81",
     "@cerc-io/ts-channel": "1.0.3-ts-nitro-0.1.1",
     "@ethersproject/properties": "^5.7.0",
     "@ethersproject/providers": "^5.4.4",
@@ -52,7 +52,7 @@
     "yargs": "^17.0.1"
   },
   "devDependencies": {
-    "@cerc-io/cache": "^0.2.80",
+    "@cerc-io/cache": "^0.2.81",
     "@nomiclabs/hardhat-waffle": "^2.0.1",
     "@types/bunyan": "^1.8.8",
     "@types/express": "^4.17.14",
diff --git a/packages/util/src/graph/database.ts b/packages/util/src/graph/database.ts
index 6db225de..b7f8ede3 100644
--- a/packages/util/src/graph/database.ts
+++ b/packages/util/src/graph/database.ts
@@ -447,7 +447,8 @@ export class GraphDatabase {
         'latestEntities',
         `${tableName}.id = "latestEntities"."id" AND ${tableName}.block_number = "latestEntities"."block_number"`
       )
-      .setParameters(subQuery.getParameters());
+      .setParameters(subQuery.getParameters())
+      .where(`${tableName}.is_pruned = :isPruned`, { isPruned: false });
 
     selectQueryBuilder = this._baseDatabase.buildQuery(repo, selectQueryBuilder, where, relationsMap.get(entityType), block);
 
diff --git a/packages/util/src/indexer.ts b/packages/util/src/indexer.ts
index 55473436..49c72abc 100644
--- a/packages/util/src/indexer.ts
+++ b/packages/util/src/indexer.ts
@@ -547,13 +547,26 @@ export class Indexer {
 
   // Create events to be saved to db for a block given blockHash, logs, transactions and a parser function
   createDbEventsFromLogsAndTxs (blockHash: string, logs: any, transactions: any, parseEventNameAndArgs: (kind: string, logObj: any) => any): DeepPartial<EventInterface>[] {
-    const transactionMap = transactions.reduce((acc: {[key: string]: any}, transaction: {[key: string]: any}) => {
+    const transactionMap: {[key: string]: any} = transactions.reduce((acc: {[key: string]: any}, transaction: {[key: string]: any}) => {
       acc[transaction.txHash] = transaction;
       return acc;
     }, {});
 
     const dbEvents: Array<DeepPartial<EventInterface>> = [];
 
+    // Check if upstream is FEVM and sort logs by tx and log index
+    if (this._upstreamConfig.ethServer.isFEVM) {
+      // Sort the logs array first by tx index
+      // If two objects have the same tx index, it will then sort them by log index
+      logs = logs.sort((a: any, b: any) => {
+        if (a.transaction.hash !== b.transaction.hash) {
+          return transactionMap[a.transaction.hash].index - transactionMap[b.transaction.hash].index;
+        } else {
+          return a.index - b.index;
+        }
+      });
+    }
+
     for (let li = 0; li < logs.length; li++) {
       const logObj = logs[li];
       const {