diff --git a/src/mappings/erc20Templates.ts b/src/mappings/erc20Templates.ts
index 2fb601b..2c334b4 100644
--- a/src/mappings/erc20Templates.ts
+++ b/src/mappings/erc20Templates.ts
@@ -296,7 +296,7 @@ export function handleProviderFee(event: ProviderFee): void {
     log.info('create a new order reuse: {}', [orderReuse.id])
     orderReuse.providerFee = providerFee
     orderReuse.providerFeeValidUntil = event.params.validUntil
-    orderReuse.order = orderId!
+    orderReuse.order = orderId
     orderReuse.createdTimestamp = event.block.timestamp.toI32()
     orderReuse.tx = event.transaction.hash.toHex()
     orderReuse.block = event.block.number.toI32()
diff --git a/src/mappings/utils/orderUtils.ts b/src/mappings/utils/orderUtils.ts
index 020526b..8417ef2 100644
--- a/src/mappings/utils/orderUtils.ts
+++ b/src/mappings/utils/orderUtils.ts
@@ -41,6 +41,7 @@ export function searchOrderForEvent(
   eventIndex: number
 ): Order {
   for (let i = eventIndex - 1; i >= 0; i--) {
+    log.info('i for order started: {}', [i.toString()])
     const orderId = getOrderId(transactionHash, address, transactionFrom, i)
     log.info('trying with this orderId: {}', [orderId])
     const order = Order.load(orderId)
@@ -49,7 +50,10 @@ export function searchOrderForEvent(
         order.datatoken,
         address
       ])
+      log.info('found order, exit searching: {}', [order.id])
       return order
+    } else {
+      continue
     }
   }
   // return an Order just for compilation schema
@@ -62,6 +66,7 @@ export function searchOrderReusedForEvent(
   eventIndex: number
 ): OrderReuse {
   for (let i = eventIndex - 1; i >= 0; i--) {
+    log.info('i in order reused: {}', [i.toString()])
     const orderReused = OrderReuse.load(`${transactionHash}-${i}`)
     if (!orderReused) {
       continue
@@ -75,6 +80,8 @@ export function searchOrderReusedForEvent(
         eventAddress
       ])
       return orderReused
+    } else {
+      continue
     }
   }
   // return an OrderReuse just for compilation schema