/Apps/Order/ReturnList.ascx is really slow because it reads all completed(and partially shipped) orders and then tries to figure one by one if they have returns.

From sql trace and reflected code:

1st - Find purchase order by status is called

sql:

declare @p11 int
set @p11=2247
exec ecf_Search_PurchaseOrder @ApplicationId='app-guid',@SQLClause=N'(Status = ''Completed'' OR Status = ''PartiallyShipped'')',@MetaSQLClause=N'',@FTSPhrase=N'',@AdvancedFTSPhrase=N'',@OrderBy=N'',@Namespace=N'Mediachase.Commerce.Orders',@Classes=N'PurchaseOrder',@StartingRec=0,@NumRecords=2147483647,@RecordCount=@p11 output
select @p11

called from code in Mediachase.Commerce.Manager.Apps.Order.ReturnList GetDataSource method:

private DataTable GetDataSource()
    {
      DataTable dataTable = new DataTable();
      dataTable.Locale = CultureInfo.InvariantCulture;
      dataTable.Columns.Add(new DataColumn("OrderGroupId", typeof (int)));
      dataTable.Columns.Add(new DataColumn("RMANumber", typeof (string)));
      dataTable.Columns.Add(new DataColumn("OrderFormId", typeof (int)));
      dataTable.Columns.Add(new DataColumn("ReturnType", typeof (string)));
      dataTable.Columns.Add(new DataColumn("CustomerName", typeof (string)));
      dataTable.Columns.Add(new DataColumn("CustomerId", typeof (string)));
      dataTable.Columns.Add(new DataColumn("Created", typeof (DateTime))
      {
        DateTimeMode = DataSetDateTime.Local
      });
      dataTable.Columns.Add(new DataColumn("TrackingNumber", typeof (string)));
      OrderContext current = OrderContext.Current;
      OrderStatus[] orderStatusArray = new OrderStatus[2]
      {
        OrderStatus.Completed,
        OrderStatus.PartiallyShipped
      };
      foreach (PurchaseOrder purchaseOrder in current.FindPurchaseOrdersByStatus(orderStatusArray))
      {
        foreach (OrderForm returnForm in (StorageCollectionBase) purchaseOrder.ReturnOrderForms)
        {
          if (ReturnFormStatusManager.IsAwaitingCompletable(returnForm))
          {
            DataRow row = dataTable.NewRow();
            row["OrderGroupId"] = (object) purchaseOrder.OrderGroupId;
            row["RMANumber"] = (object) returnForm.RMANumber;
            row["OrderFormId"] = (object) returnForm.OrderFormId;
            row["ReturnType"] = (object) returnForm.ReturnType;
            row["CustomerName"] = (object) purchaseOrder.CustomerName;
            row["CustomerId"] = (object) purchaseOrder.CustomerId.ToString();
            row["Created"] = (object) returnForm.Created;
            row["TrackingNumber"] = (object) purchaseOrder.TrackingNumber;
            dataTable.Rows.Add(row);
          }
        }
      }
      return dataTable;
    }

2nd - And then for each row in that this is called:

exec [ecf_OrderGroupNote_ListByOrderGroupId] @OrderGroupId=xx

And that takes few minutes, in the end I get list of about twenty returns in list!
Questions:
Does it have to be this slow?
Am I doing something wrong, could it be configuration or something like that, looking at reflected code looks like its set in stone - foreach loop?
Have newer version already improved this?
If not, are there plans to improve it?

version: Mediachase.ConsoleManager, Version=7.10.3.184