1 files changed, 7 insertions, 5 deletions
diff --git a/src/static/js/search-worker.js b/src/static/js/search-worker.js
index c3002b18..92ba1f0d 100644
--- a/src/static/js/search-worker.js
+++ b/src/static/js/search-worker.js
@@ -1,8 +1,7 @@
-/* eslint-env worker */
-
 import FlexSearch from '../lib/flexsearch/flexsearch.bundle.module.min.js';
 
-import {makeSearchIndex, searchSpec} from '../shared-util/search-spec.js';
+import {default as searchSpec, makeSearchIndex}
+  from '../shared-util/search-shape.js';
 
 import {
   empty,
@@ -130,7 +129,7 @@ async function loadDatabase() {
 
   try {
     idb = await promisifyIDBRequest(request);
-  } catch (error) {
+  } catch {
     console.warn(`Couldn't load search IndexedDB - won't use an internal cache.`);
     console.warn(request.error);
     idb = null;
@@ -391,11 +390,15 @@ function performSearchAction({query, options}) {
 }
 
 const interestingFieldCombinations = [
+  ['primaryName'],
+  ['additionalNames'],
+
   ['primaryName', 'parentName', 'groups'],
   ['primaryName', 'parentName'],
   ['primaryName', 'groups', 'contributors'],
   ['primaryName', 'groups', 'artTags'],
   ['primaryName', 'groups'],
+  ['additionalNames', 'groups'],
   ['primaryName', 'contributors'],
   ['primaryName', 'artTags'],
   ['parentName', 'groups', 'artTags'],
@@ -412,7 +415,6 @@ const interestingFieldCombinations = [
   ['contributors', 'parentName'],
   ['contributors', 'groups'],
   ['primaryName', 'contributors'],
-  ['primaryName'],
 ];
 
 function queryGenericIndex(query, options) {