Bulk export tweak #2