diff --git a/src/cli/backup/backup.go b/src/cli/backup/backup.go
index 9debea9d6..e644bdc30 100644
--- a/src/cli/backup/backup.go
+++ b/src/cli/backup/backup.go
@@ -382,8 +382,6 @@ func genericDetailsCore(
 ) (*details.Details, error) {
 	ctx = clues.Add(ctx, "backup_id", backupID)
 
-	sel.Configure(selectors.Config{OnlyMatchItemNames: true})
-
 	d, _, errs := bg.GetBackupDetails(ctx, backupID)
 	// TODO: log/track recoverable errors
 	if errs.Failure() != nil {
diff --git a/src/cli/backup/exchange.go b/src/cli/backup/exchange.go
index 72d6ab857..48fc775c0 100644
--- a/src/cli/backup/exchange.go
+++ b/src/cli/backup/exchange.go
@@ -277,7 +277,6 @@ func runDetailsExchangeCmd(cmd *cobra.Command) error {
 	opts := utils.MakeExchangeOpts(cmd)
 
 	sel := utils.IncludeExchangeRestoreDataSelectors(opts)
-	sel.Configure(selectors.Config{OnlyMatchItemNames: true})
 	utils.FilterExchangeRestoreInfoSelectors(sel, opts)
 
 	ds, err := genericDetailsCommand(cmd, flags.BackupIDFV, sel.Selector)
diff --git a/src/cli/backup/groups.go b/src/cli/backup/groups.go
index 0b81364db..4c7c72e72 100644
--- a/src/cli/backup/groups.go
+++ b/src/cli/backup/groups.go
@@ -232,7 +232,6 @@ func runDetailsGroupsCmd(cmd *cobra.Command) error {
 	opts := utils.MakeGroupsOpts(cmd)
 
 	sel := utils.IncludeGroupsRestoreDataSelectors(ctx, opts)
-	sel.Configure(selectors.Config{OnlyMatchItemNames: true})
 	utils.FilterGroupsRestoreInfoSelectors(sel, opts)
 
 	ds, err := genericDetailsCommand(cmd, flags.BackupIDFV, sel.Selector)
diff --git a/src/cli/backup/onedrive.go b/src/cli/backup/onedrive.go
index 1f14a8213..d45e313d2 100644
--- a/src/cli/backup/onedrive.go
+++ b/src/cli/backup/onedrive.go
@@ -240,7 +240,6 @@ func runDetailsOneDriveCmd(cmd *cobra.Command) error {
 	opts := utils.MakeOneDriveOpts(cmd)
 
 	sel := utils.IncludeOneDriveRestoreDataSelectors(opts)
-	sel.Configure(selectors.Config{OnlyMatchItemNames: true})
 	utils.FilterOneDriveRestoreInfoSelectors(sel, opts)
 
 	ds, err := genericDetailsCommand(cmd, flags.BackupIDFV, sel.Selector)
diff --git a/src/cli/backup/sharepoint.go b/src/cli/backup/sharepoint.go
index 0a5c06c04..cc2fc8ffc 100644
--- a/src/cli/backup/sharepoint.go
+++ b/src/cli/backup/sharepoint.go
@@ -331,7 +331,6 @@ func runDetailsSharePointCmd(cmd *cobra.Command) error {
 	opts := utils.MakeSharePointOpts(cmd)
 
 	sel := utils.IncludeSharePointRestoreDataSelectors(ctx, opts)
-	sel.Configure(selectors.Config{OnlyMatchItemNames: true})
 	utils.FilterSharePointRestoreInfoSelectors(sel, opts)
 
 	ds, err := genericDetailsCommand(cmd, flags.BackupIDFV, sel.Selector)
diff --git a/src/cli/utils/exchange.go b/src/cli/utils/exchange.go
index 5772f8958..cc1ca2aa0 100644
--- a/src/cli/utils/exchange.go
+++ b/src/cli/utils/exchange.go
@@ -170,6 +170,8 @@ func IncludeExchangeRestoreDataSelectors(opts ExchangeOpts) *selectors.ExchangeR
 	AddExchangeInclude(sel, opts.EmailFolder, opts.Email, sel.Mails)
 	AddExchangeInclude(sel, opts.EventCalendar, opts.Event, sel.Events)
 
+	sel.Configure(selectors.Config{OnlyMatchItemNames: true})
+
 	return sel
 }
 
diff --git a/src/cli/utils/groups.go b/src/cli/utils/groups.go
index c5fe65519..c18e27ff9 100644
--- a/src/cli/utils/groups.go
+++ b/src/cli/utils/groups.go
@@ -293,6 +293,8 @@ func IncludeGroupsRestoreDataSelectors(ctx context.Context, opts GroupsOpts) *se
 		}
 	}
 
+	sel.Configure(selectors.Config{OnlyMatchItemNames: true})
+
 	return sel
 }
 
diff --git a/src/cli/utils/onedrive.go b/src/cli/utils/onedrive.go
index 20bcad4b7..87899d826 100644
--- a/src/cli/utils/onedrive.go
+++ b/src/cli/utils/onedrive.go
@@ -119,6 +119,8 @@ func IncludeOneDriveRestoreDataSelectors(opts OneDriveOpts) *selectors.OneDriveR
 		sel.Include(sel.Items(prefixFolders, opts.FileName, selectors.PrefixMatch()))
 	}
 
+	sel.Configure(selectors.Config{OnlyMatchItemNames: true})
+
 	return sel
 }
 
diff --git a/src/cli/utils/sharepoint.go b/src/cli/utils/sharepoint.go
index d106187a9..6b766d27d 100644
--- a/src/cli/utils/sharepoint.go
+++ b/src/cli/utils/sharepoint.go
@@ -212,6 +212,8 @@ func IncludeSharePointRestoreDataSelectors(ctx context.Context, opts SharePointO
 		sel.Include(sel.WebURL(urls))
 	}
 
+	sel.Configure(selectors.Config{OnlyMatchItemNames: true})
+
 	return sel
 }