diff --git a/BTCPayServer/Services/Invoices/InvoiceRepository.cs b/BTCPayServer/Services/Invoices/InvoiceRepository.cs
index 90e925ad2..aea310b7e 100644
--- a/BTCPayServer/Services/Invoices/InvoiceRepository.cs
+++ b/BTCPayServer/Services/Invoices/InvoiceRepository.cs
@@ -651,7 +651,25 @@ namespace BTCPayServer.Services.Invoices
 
             if (queryObject.Status != null && queryObject.Status.Length > 0)
             {
-                var statusSet = queryObject.Status.ToHashSet().ToArray();
+                HashSet<string> statusSet = new HashSet<string>();
+                // We make sure here that the old filters still work
+                foreach (var status in queryObject.Status.Select(s => s.ToLowerInvariant()))
+                {
+                    if (status == "paid")
+                        statusSet.Add("processing");
+                    if (status == "processing")
+                        statusSet.Add("paid");
+                    if (status == "confirmed")
+                    {
+                        statusSet.Add("complete");
+                        statusSet.Add("settled");
+                    }
+                    if (status == "settled")
+                    {
+                        statusSet.Add("complete");
+                        statusSet.Add("confirmed");
+                    }
+                }
                 query = query.Where(i => statusSet.Contains(i.Status));
             }
 
diff --git a/BTCPayServer/Views/UIInvoice/ListInvoices.cshtml b/BTCPayServer/Views/UIInvoice/ListInvoices.cshtml
index 3642a5b3c..42098e6d7 100644
--- a/BTCPayServer/Views/UIInvoice/ListInvoices.cshtml
+++ b/BTCPayServer/Views/UIInvoice/ListInvoices.cshtml
@@ -327,10 +327,9 @@
             </div>
         </span>
     </div>
-
+    <div style="clear:both"></div>
     @if (Model.Total > 0)
     {
-        <div style="clear:both"></div>
         <div class="table-responsive">
             <table id="invoices" class="table table-hover">
                 <thead>
@@ -403,11 +402,10 @@
                                 else
                                 {
                                     <span class="badge badge-@invoice.Status.Status.ToModernStatus().ToString().ToLower()">
-                                        @invoice.Status.Status.ToModernStatus().ToString() @*  @invoice.Status.ToString().ToLower()  *@
+                                        @invoice.Status.Status.ToModernStatus().ToString()
                                         @if (invoice.Status.ExceptionStatus != InvoiceExceptionStatus.None)
                                         {
-                                            @String.Format("({0})", @invoice.Status.ExceptionStatus.ToString())
-                                            ;
+                                            @($"({invoice.Status.ExceptionStatus.ToString()})")
                                         }
                                     </span>
                                 }