diff --git a/audit/src/org/labkey/audit/AuditController.java b/audit/src/org/labkey/audit/AuditController.java
index bf30fe7c7e1..9b3f53205a6 100644
--- a/audit/src/org/labkey/audit/AuditController.java
+++ b/audit/src/org/labkey/audit/AuditController.java
@@ -383,9 +383,8 @@ public Object execute(AuditTransactionForm form, BindException errors)
         {
             AuditLogImpl.TransactionRowIds results;
             User elevatedUser = ElevatedUser.ensureCanSeeAuditLogRole(getContainer(), getUser());
-            // Issue 1307: scope strictly to the current container. 26.7 removed cross-folder imports, so a
-            // transaction's rows live in the same container as the transaction
-            ContainerFilter cf = ContainerFilter.Type.Current.create(getContainer(), elevatedUser);
+            // GitHub Issue 1307: use product folder data CF
+            ContainerFilter cf = getContainer().getProductFoldersDataContainerFilter(elevatedUser);
             if (form.isSampleType())
                 results = AuditLogImpl.get().getTransactionSampleIds(form.getTransactionAuditId(), elevatedUser, getContainer(), cf);
             else
diff --git a/experiment/src/org/labkey/experiment/ExpDataIterators.java b/experiment/src/org/labkey/experiment/ExpDataIterators.java
index 8a34e631b9e..560f895d8e8 100644
--- a/experiment/src/org/labkey/experiment/ExpDataIterators.java
+++ b/experiment/src/org/labkey/experiment/ExpDataIterators.java
@@ -2355,10 +2355,7 @@ private DataIterator build(DataIterator input, DataIteratorContext context)
         {
             // useTransactionAuditCache already set for import and merge in AbstractQueryImportAction.createDataIteratorContext
             if (context.getInsertOption() == QueryUpdateService.InsertOption.INSERT)
-            {
-                if (Boolean.FALSE != context.getConfigParameter(AbstractQueryImportAction.Params.useTransactionAuditCache))
-                    context.setUseTransactionAuditCache(true);
-            }
+                context.setUseTransactionAuditCache(context.getConfigParameterBoolean(AbstractQueryImportAction.Params.useTransactionAuditCache));
 
             // add FileLink DataIterator if any input columns are of type FILE_LINK
             if (null != _fileLinkDirectory)