diff --git a/app/client/models/ColumnFilterMenuModel.ts b/app/client/models/ColumnFilterMenuModel.ts
index fffdcd33..66f8148f 100644
--- a/app/client/models/ColumnFilterMenuModel.ts
+++ b/app/client/models/ColumnFilterMenuModel.ts
@@ -1,6 +1,7 @@
 import { ColumnFilter } from "app/client/models/ColumnFilter";
 import { FilterInfo } from "app/client/models/entities/ViewSectionRec";
 import { CellValue } from "app/plugin/GristData";
+import { normalizeText } from "app/client/lib/ACIndex";
 import { Computed, Disposable, Observable } from "grainjs";
 import escapeRegExp = require("lodash/escapeRegExp");
 import isNull = require("lodash/isNull");
@@ -46,11 +47,11 @@ export class ColumnFilterMenuModel extends Disposable {
 
   // computes a set of all keys that matches the search text.
   public readonly filterSet = Computed.create(this, this.searchValue, (_use, searchValue) => {
-    const searchRegex = new RegExp(escapeRegExp(searchValue), 'i');
+    const searchRegex = new RegExp(escapeRegExp(normalizeText(searchValue)), 'i');
     const showAllOptions = ['Bool', 'Choice', 'ChoiceList'].includes(this.columnFilter.columnType);
     return new Set(
       this._params.valueCount
-        .filter(([_, {label, count}]) => (showAllOptions ? true : count) && searchRegex.test(label))
+        .filter(([_, {label, count}]) => (showAllOptions ? true : count) && searchRegex.test(normalizeText(label)))
         .map(([key]) => key)
     );
   });
diff --git a/app/client/widgets/FieldBuilder.ts b/app/client/widgets/FieldBuilder.ts
index dca47244..4baf8111 100644
--- a/app/client/widgets/FieldBuilder.ts
+++ b/app/client/widgets/FieldBuilder.ts
@@ -336,9 +336,9 @@ export class FieldBuilder extends Disposable {
   // Builds the reference type table selector. Built when the column is type reference.
   public _buildRefTableSelect() {
     const allTables = Computed.create(null, (use) =>
-                                      use(this._docModel.visibleTableIds.getObservable()).map(tableId => ({
-                                        value: tableId,
-                                        label: tableId,
+                                      use(this._docModel.visibleTables.getObservable()).map(tableRec => ({
+                                        value: use(tableRec.tableId),
+                                        label: use(tableRec.tableNameDef),
                                         icon: 'FieldTable' as const
                                       }))
                                      );
diff --git a/static/locales/en.client.json b/static/locales/en.client.json
index e8d5e2ab..f3a6e5d0 100644
--- a/static/locales/en.client.json
+++ b/static/locales/en.client.json
@@ -676,7 +676,7 @@
     },
     "CodeEditorPanel": {
       "AccessDenied":"Access denied",
-      "CodeViewOnlyFullAccess.":"Code View is available only when you have full document access."
+      "CodeViewOnlyFullAccess":"Code View is available only when you have full document access."
     },
     "DataTables": {
       "RawDataTables":"Raw Data Tables",
diff --git a/static/locales/fr.client.json b/static/locales/fr.client.json
index e59e5f5c..416fa144 100644
--- a/static/locales/fr.client.json
+++ b/static/locales/fr.client.json
@@ -673,7 +673,7 @@
     },
     "CodeEditorPanel": {
       "AccessDenied": "Accès refusé",
-      "CodeViewOnlyFullAccess.": "La vue code n’est disponible que lorsque vous avez un accès complet au document."
+      "CodeViewOnlyFullAccess": "La vue code n’est disponible que lorsque vous avez un accès complet au document."
     },
     "DataTables": {
       "RawDataTables": "Données sources",