diff --git a/subgraph/schema.graphql b/subgraph/schema.graphql
index 690effea56..aeec1e0d43 100644
--- a/subgraph/schema.graphql
+++ b/subgraph/schema.graphql
@@ -44,7 +44,6 @@ type Poll @entity {
   maxVoteOption: BigInt
   messageProcessor: Bytes # address
   tally: Bytes # address
-  subsidy: Bytes # address
   "merge state after ended"
   stateRoot: BigInt # uint256
   numSignups: BigInt! # uint256
diff --git a/subgraph/src/maci.ts b/subgraph/src/maci.ts
index 98a4fe7407..9fffa3d166 100644
--- a/subgraph/src/maci.ts
+++ b/subgraph/src/maci.ts
@@ -25,7 +25,6 @@ export function handleDeployPoll(event: DeployPollEvent): void {
   entity.pollId = event.params._pollId;
   entity.messageProcessor = event.params.pollAddr.messageProcessor;
   entity.tally = event.params.pollAddr.tally;
-  entity.subsidy = event.params.pollAddr.subsidy;
   entity.maxMessages = maxValues.value0;
   entity.maxVoteOption = maxValues.value1;
   entity.treeDepth = GraphBN.fromI32(treeDepths.value0);
diff --git a/subgraph/subgraph.yaml b/subgraph/subgraph.yaml
index 2ea6a2b069..c9386f02bb 100644
--- a/subgraph/subgraph.yaml
+++ b/subgraph/subgraph.yaml
@@ -30,7 +30,7 @@ dataSources:
           file: ./node_modules/maci-contracts/build/artifacts/contracts/Poll.sol/Poll.json
       eventHandlers:
         - event: DeployPoll(uint256,indexed uint256,indexed
-            uint256,(address,address,address,address))
+            uint256,(address,address,address))
           handler: handleDeployPoll
         - event: OwnershipTransferred(indexed address,indexed address)
           handler: handleOwnershipTransferred
@@ -57,13 +57,13 @@ templates:
         - name: Poll
           file: ./node_modules/maci-contracts/build/artifacts/contracts/Poll.sol/Poll.json
       eventHandlers:
-        - event: MergeMaciStateAq(uint256,uint256)
+        - event: MergeMaciStateAq(indexed uint256,indexed uint256)
           handler: handleMergeMaciStateAq
-        - event: MergeMaciStateAqSubRoots(uint256)
+        - event: MergeMaciStateAqSubRoots(indexed uint256)
           handler: handleMergeMaciStateAqSubRoots
-        - event: MergeMessageAq(uint256)
+        - event: MergeMessageAq(indexed uint256)
           handler: handleMergeMessageAq
-        - event: MergeMessageAqSubRoots(uint256)
+        - event: MergeMessageAqSubRoots(indexed uint256)
           handler: handleMergeMessageAqSubRoots
         - event: OwnershipTransferred(indexed address,indexed address)
           handler: handleOwnershipTransferred