diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
index 6b4b36464..afd6e95a0 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
@@ -615,8 +615,14 @@
         <if test="trade_type=='Share Link'">
             and o.gateway=14
         </if>
+        <if test="trade_type=='Native JSAPI'">
+            and o.gateway=15
+        </if>
         <if test="trade_type=='Card Payment'">
-            and o.gateway=17
+            and o.gateway in (16,17)
+         </if>
+        <if test="trade_type=='Direct Debit'">
+            and o.gateway=18
         </if>
         <if test="org_id!=null and org_ids==null">and l.org_id=#{org_id}</if>
         <if test="org_ids!=null">and l.org_id in