diff --git a/specifyweb/frontend/js_src/lib/components/BatchEdit/index.tsx b/specifyweb/frontend/js_src/lib/components/BatchEdit/index.tsx
index 2b14c54dd4e..9c6c958e73f 100644
--- a/specifyweb/frontend/js_src/lib/components/BatchEdit/index.tsx
+++ b/specifyweb/frontend/js_src/lib/components/BatchEdit/index.tsx
@@ -12,14 +12,14 @@ import { H2, H3 } from '../Atoms';
 import { Button } from '../Atoms/Button';
 import { dialogIcons } from '../Atoms/Icons';
 import { LoadingContext } from '../Core/Contexts';
-import type { AnyTree, SerializedResource } from '../DataModel/helperTypes';
+import type { AnyTree, FilterTablesByEndsWith, SerializedResource } from '../DataModel/helperTypes';
 import type { SpecifyResource } from '../DataModel/legacyTypes';
 import { schema } from '../DataModel/schema';
 import { serializeResource } from '../DataModel/serializers';
 import type { LiteralField, Relationship } from '../DataModel/specifyField';
 import type { SpecifyTable } from '../DataModel/specifyTable';
 import { strictGetTable } from '../DataModel/tables';
-import type { GeographyTreeDefItem, SpQuery, Tables } from '../DataModel/types';
+import type { SpQuery, Tables } from '../DataModel/types';
 import {
   isTreeTable,
   strictGetTreeDefinitionItems,
@@ -166,7 +166,7 @@ const filters = [containsFaultyNestedToMany, containsSystemTables];
 
 const getTreeDefFromName = (
   rankName: string,
-  treeDefItems: RA<SerializedResource<GeographyTreeDefItem>>
+  treeDefItems: RA<SerializedResource<FilterTablesByEndsWith<'TreeDefItem'>>>
 ) =>
   defined(
     treeDefItems.find(
diff --git a/specifyweb/frontend/js_src/lib/components/WbPlanView/State.tsx b/specifyweb/frontend/js_src/lib/components/WbPlanView/State.tsx
index 4839b212ff7..792f0759dbf 100644
--- a/specifyweb/frontend/js_src/lib/components/WbPlanView/State.tsx
+++ b/specifyweb/frontend/js_src/lib/components/WbPlanView/State.tsx
@@ -9,7 +9,7 @@ import { Button } from '../Atoms/Button';
 import { LoadingContext } from '../Core/Contexts';
 import type { Tables } from '../DataModel/types';
 import { Dialog, dialogClassNames } from '../Molecules/Dialog';
-import { DataSetsDialog } from '../Toolbar/WbsDialog';
+import { GenericDataSetsDialog } from '../Toolbar/WbsDialog';
 import { ListOfBaseTables } from './Components';
 import type { UploadPlan } from './uploadPlanParser';
 import type { Dataset } from './Wrapped';
@@ -38,8 +38,8 @@ function TemplateSelection({
           {wbPlanText.invalidTemplatePlan()}
         </Dialog>
       )}
-      <DataSetsDialog
-        showTemplates
+      <GenericDataSetsDialog
+        wbVariant="workbenchChoosePlan"
         onClose={handleClose}
         onDataSetSelect={(id: number): void =>
           loading(
diff --git a/specifyweb/frontend/js_src/lib/components/WorkBench/hotProps.tsx b/specifyweb/frontend/js_src/lib/components/WorkBench/hotProps.tsx
index ad34b26911a..d3a06cbbb2d 100644
--- a/specifyweb/frontend/js_src/lib/components/WorkBench/hotProps.tsx
+++ b/specifyweb/frontend/js_src/lib/components/WorkBench/hotProps.tsx
@@ -2,9 +2,7 @@ import React from 'react';
 import ReactDOMServer from 'react-dom/server';
 
 import { wbPlanText } from '../../localization/wbPlan';
-import { f } from '../../utils/functools';
 import { icons } from '../Atoms/Icons';
-import { getTable } from '../DataModel/tables';
 import { TableIcon } from '../Molecules/TableIcon';
 import { userPreferences } from '../Preferences/userPreferences';
 import type { Dataset } from '../WbPlanView/Wrapped';
diff --git a/specifyweb/frontend/js_src/lib/localization/workbench.ts b/specifyweb/frontend/js_src/lib/localization/workbench.ts
index 01d672921c1..43d47abc342 100644
--- a/specifyweb/frontend/js_src/lib/localization/workbench.ts
+++ b/specifyweb/frontend/js_src/lib/localization/workbench.ts
@@ -703,32 +703,7 @@ export const wbText = createDictionary({
   uploadErrorsSecondDescription: {
     'en-us': `
       Validate the Data Set and review the mouseover hints for each error cell,
-      then make the appropriate corrections. Save and retry the Upload.
-    `,
-    'ru-ru': `
-      Проверте набор данных и наведите указатель мыши на каждую ячейку с
-      ошибкой, затем сделайте соответствующие исправления, сохраните и повторите
-      попытку.
-    `,
-    'es-es': `
-      Valide el conjunto de datos y revise las sugerencias del mouseover para
-      cada celda de error, luego haga las correcciones apropiadas. Guarde y
-      vuelva a intentar la carga.
-    `,
-    'fr-fr': `
-      Validez l'ensemble de données et examinez les conseils de passage de la
-      souris pour chaque cellule d'erreur, puis apportez les corrections
-      appropriées. Enregistrez et réessayez le téléchargement.
-    `,
-    'uk-ua': `
-      Перевірте набір даних і перегляньте підказки для кожної клітинки помилки,
-      а потім внесіть відповідні виправлення. Збережіть і повторіть спробу
-      завантаження.
-    `,
-    'de-ch': `
-      Validieren Sie den Datensatz und überprüfen Sie die Mouseover-Hinweise für
-      jede Fehlerzelle. Nehmen Sie dann die entsprechenden Korrekturen vor.
-      Speichern Sie und versuchen Sie den Upload erneut.
+      then make the appropriate corrections. Save and retry the {type:string}.
     `,
   },
   dataSetRollback: {
@@ -1263,12 +1238,7 @@ export const wbText = createDictionary({
     'de-ch': 'Neuer Datensatz {date}',
   },
   dataSets: {
-    'en-us': 'WorkBench Data Sets',
-    'ru-ru': 'Наборы данных',
-    'es-es': 'Conjuntos de datos de WorkBench',
-    'fr-fr': 'Ensembles de données WorkBench',
-    'uk-ua': 'Набори даних WorkBench',
-    'de-ch': 'WorkBench-Datensätze',
+    'en-us': '{variant:string} WorkBench Data Sets',
   },
   wbsDialogEmpty: {
     'en-us': 'Currently no Data Sets exist.',