diff --git a/BTCPayServer/Controllers/UIReportsController.CheatMode.cs b/BTCPayServer/Controllers/UIReportsController.CheatMode.cs
index 8f82442b7..42abac848 100644
--- a/BTCPayServer/Controllers/UIReportsController.CheatMode.cs
+++ b/BTCPayServer/Controllers/UIReportsController.CheatMode.cs
@@ -92,8 +92,10 @@ public partial class UIReportsController
             return Encoders.Base58.EncodeData(GenerateBytes(20));
         if (f.Type == "boolean")
             return GenerateBytes(1)[0] % 2 == 0;
-        if (f.Name == "PaymentType")
+        if (f.Name == "PaymentType" || f.Name == "Category")
             return TakeOne("On-Chain", "Lightning");
+        if (f.Name == "PaymentMethodId")
+            return TakeOne("BTC-CHAIN", "BTC-LN", "BTC-LNURL");
         if (f.Name == "PaymentId")
             if (row[fi -1] is "On-Chain")
                 return Encoders.Hex.EncodeData(GenerateBytes(32)) + "-" + rand.NextInt64(0, 4);
@@ -101,9 +103,9 @@ public partial class UIReportsController
                 return Encoders.Hex.EncodeData(GenerateBytes(32));
         if (f.Name == "Address")
             return Encoders.Bech32("bc1").Encode(0, GenerateBytes(20));
-        if (f.Name == "Crypto")
+        if (f.Name == "Crypto" || f.Name == "PaymentCurrency")
             return cryptoCurrency;
-        if (f.Name == "CryptoAmount")
+        if (f.Name == "CryptoAmount" || f.Name == "PaymentAmount")
             return DisplayFormatter.ToFormattedAmount(GenerateDecimal(0.1m, 5m, 8), cryptoCurrency);
         if (f.Name == "LightningAddress")
             return TakeOne("satoshi", "satosan", "satoichi") + "@bitcoin.org";
@@ -119,9 +121,9 @@ public partial class UIReportsController
             return TakeOne("AppA", "AppB");
         if (f.Name == "Quantity")
             return TakeOne(1, 2, 3, 4, 5);
-        if (f.Name == "Currency")
+        if (f.Name.EndsWith("Currency"))
             return fiatCurrency;
-        if (f.Name == "CurrencyAmount")
+        if (f.Name.EndsWith("CurrencyAmount"))
         {
             var curr = row[fi - 1]?.ToString();
             var value = curr switch
diff --git a/BTCPayServer/Services/Reporting/LegacyInvoiceExportReportProvider.cs b/BTCPayServer/Services/Reporting/LegacyInvoiceExportReportProvider.cs
index c6b41e417..f74c9c10a 100644
--- a/BTCPayServer/Services/Reporting/LegacyInvoiceExportReportProvider.cs
+++ b/BTCPayServer/Services/Reporting/LegacyInvoiceExportReportProvider.cs
@@ -33,7 +33,7 @@ public class LegacyInvoiceExportReportProvider : ReportProvider
                 new("ReceivedDate", "datetime"),
                 new("StoreId", "text"),
                 new("OrderId", "text"),
-                new("InvoiceId", "text"),
+                new("InvoiceId", "invoice_id"),
                 new("InvoiceCreatedDate", "datetime"),
                 new("InvoiceExpirationDate", "datetime"),
                 new("InvoiceMonitoringDate", "datetime"),