diff --git a/docker-compose.yml b/docker-compose.yml
index 4f60f852..db16eddc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,8 +34,7 @@ services:
     command:
       - -f=/app/${PROJECT_PATH}
       - --disable-historical=true
-      # - --local #remove
-      # - --batch-size=50
+      - --batch-size=1
 
   graphql-engine:
     container_name: "query-${PROJECT_PATH}"
diff --git a/kusama.yaml b/kusama.yaml
index 56293e8e..44dca87a 100644
--- a/kusama.yaml
+++ b/kusama.yaml
@@ -25,10 +25,10 @@ dataSources:
     mapping:
       file: ./dist/index.js
       handlers:
-        # - handler: handleHistoryElement
-        #   kind: substrate/CallHandler
-        #   filter:
-        #     isSigned: true
+        - handler: handleHistoryElement
+          kind: substrate/CallHandler
+          filter:
+            isSigned: true
         - handler: handleReward
           kind: substrate/EventHandler
           filter:
diff --git a/polkadot.yaml b/polkadot.yaml
index 3a07dbbb..46d5c52e 100644
--- a/polkadot.yaml
+++ b/polkadot.yaml
@@ -26,10 +26,10 @@ dataSources:
     mapping:
       file: ./dist/index.js
       handlers:
-        # - handler: handleHistoryElement
-        #   kind: substrate/CallHandler
-        #   filter:
-        #     isSigned: true
+        - handler: handleHistoryElement
+          kind: substrate/CallHandler
+          filter:
+            isSigned: true
         - handler: handleReward
           kind: substrate/EventHandler
           filter:
diff --git a/src/mappings/PoolRewards.ts b/src/mappings/PoolRewards.ts
index a8facef1..320ebafb 100644
--- a/src/mappings/PoolRewards.ts
+++ b/src/mappings/PoolRewards.ts
@@ -141,12 +141,12 @@ export async function handlePoolBondedSlash(
 
 export async function handlePoolUnbondingSlash(
   unbondingSlashEvent: SubstrateEvent<
-    [era: INumber, poolId: INumber, slash: INumber]
+    [poolId: INumber, era: INumber, slash: INumber]
   >,
 ): Promise<void> {
   const {
     event: {
-      data: [era, poolId, slash],
+      data: [poolId, era, slash],
     },
   } = unbondingSlashEvent;
   const poolIdNumber = poolId.toNumber();