diff --git a/jbrowse/src/client/JBrowse/VariantSearch/components/FilterForm.tsx b/jbrowse/src/client/JBrowse/VariantSearch/components/FilterForm.tsx
index 1752cabcf..f24b2e857 100644
--- a/jbrowse/src/client/JBrowse/VariantSearch/components/FilterForm.tsx
+++ b/jbrowse/src/client/JBrowse/VariantSearch/components/FilterForm.tsx
@@ -2,6 +2,7 @@ import React, { useState } from 'react';
 import TextField from '@mui/material/TextField';
 import Button from '@mui/material/Button';
 import Select from '@mui/material/Select';
+import ReactSelect from 'react-select';
 import AsyncSelect from 'react-select/async';
 import MenuItem from '@mui/material/MenuItem';
 import FormControl from '@mui/material/FormControl';
@@ -109,7 +110,7 @@ const FilterForm = (props: FilterFormProps ) => {
                         updatedFilter.value = '';
                     }
 
-                    if (value === "in set" || filter.operator === "in set") {
+                    if (value === "equals one of" || filter.operator === "equals one of") {
                         updatedFilter.value = ''; 
                     }
                 }
@@ -211,25 +212,33 @@ const FilterForm = (props: FilterFormProps ) => {
                     <FormScroll>
                         {filters.map((filter, index) => (
                             <FilterRow key={index} >
-                                <FormControlMinWidth sx={ highlightedInputs[index]?.field ? highlightedSx : null }>
-                                  <InputLabel id="field-label">Field</InputLabel>
-                                  <Select
-                                        labelId="field-label"
-                                        label = 'Field'
-                                        value={filter.field}
-                                        onChange={(event) =>
-                                            handleFilterChange(index, "field", event.target.value)
+                                <FormControlMinWidth sx={highlightedInputs[index]?.field ? highlightedSx : null}>
+                                    <ReactSelect
+                                        inputId={`field-select-${index}`}
+                                        aria-labelledby={`field-label`}
+                                        placeholder="Select field..."
+                                        menuPortalTarget={document.body}
+                                        menuPosition="fixed"
+                                        styles={{
+                                            menuPortal: (base) => ({ ...base, zIndex: 9999 }),
+                                        }}
+                                        options={fieldTypeInfo.map(field => ({
+                                            value: field.name,
+                                            label: field.label ?? field.name,
+                                        }))}
+                                        onChange={(selected) =>
+                                            handleFilterChange(index, 'field', selected?.value ?? '')
                                         }
-                                    >
-                                        <MenuItem value="" style={{ display: 'none' }}>
-                                            <em>None</em>
-                                        </MenuItem>
-                                        {fieldTypeInfo.map((field) => (
-                                            <MenuItem key={field.name} value={field.name}>
-                                                {field.label ?? field.name}
-                                            </MenuItem>
-                                        ))}
-                                    </Select>
+                                        value={
+                                            filter.field
+                                                ? {
+                                                    value: filter.field,
+                                                    label: fieldTypeInfo.find(f => f.name === filter.field)?.label ?? filter.field
+                                                }
+                                                : null
+                                        }
+                                        isClearable
+                                    />
                                 </FormControlMinWidth>
 
                                 <FormControlMinWidth sx={ highlightedInputs[index]?.operator ? highlightedSx : null } >
@@ -259,7 +268,7 @@ const FilterForm = (props: FilterFormProps ) => {
                                     </Select>
                                 </FormControlMinWidth>
 
-                                {filter.operator === "in set" ? (
+                                {filter.operator === "equals one of" ? (
                                     <FormControlMinWidth sx={ highlightedInputs[index]?.value ? highlightedSx : null } >
                                         <InputLabel id="value-select-label">Value</InputLabel>
                                         <Select
diff --git a/jbrowse/src/client/JBrowse/VariantSearch/components/ShareButton.tsx b/jbrowse/src/client/JBrowse/VariantSearch/components/ShareButton.tsx
new file mode 100644
index 000000000..2315158be
--- /dev/null
+++ b/jbrowse/src/client/JBrowse/VariantSearch/components/ShareButton.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import { Button } from '@mui/material';
+import LinkIcon from '@mui/icons-material/Link';
+
+export const ShareButton = () => {
+  return (
+      <Button
+            startIcon={<LinkIcon />}
+            size="small"
+            color="primary"
+            onClick={() => {
+                navigator.clipboard.writeText(window.location.href)
+                .then(() => {
+                    alert('URL copied to clipboard.');
+                })
+                .catch(err => {
+                    console.error('Failed to copy the URL: ', err);
+                    alert('Failed to copy the URL.');
+                });
+            }}
+        >
+        Share
+      </Button>
+  );
+};
diff --git a/jbrowse/src/client/JBrowse/VariantSearch/components/VariantTableWidget.tsx b/jbrowse/src/client/JBrowse/VariantSearch/components/VariantTableWidget.tsx
index 9a186e493..c7a5ebb14 100644
--- a/jbrowse/src/client/JBrowse/VariantSearch/components/VariantTableWidget.tsx
+++ b/jbrowse/src/client/JBrowse/VariantSearch/components/VariantTableWidget.tsx
@@ -13,7 +13,6 @@ import {
     GridToolbarExport
 } from '@mui/x-data-grid';
 import SearchIcon from '@mui/icons-material/Search';
-import LinkIcon from '@mui/icons-material/Link';
 import React, { useEffect, useState } from 'react';
 import { getConf } from '@jbrowse/core/configuration';
 import { AppBar, Box, Button, Dialog, Paper, Popover, Toolbar, Tooltip, Typography } from '@mui/material';
@@ -37,8 +36,10 @@ import '../../jbrowse.css';
 import LoadingIndicator from './LoadingIndicator';
 import { BaseFeatureDataAdapter } from '@jbrowse/core/data_adapters/BaseAdapter';
 import { lastValueFrom } from 'rxjs';
+import { ShareButton } from  './ShareButton';
 
 const VariantTableWidget = observer(props => {
+    const numberFormatter = new Intl.NumberFormat('en-US');
     const { assembly, trackId, parsedLocString, sessionId, session, pluginManager } = props;
     const { assemblyNames = [], assemblyManager } = session ?? {};
     const { view } = session ?? {};
@@ -200,25 +201,7 @@ const VariantTableWidget = observer(props => {
                     delimiter: ';',
                 }} />
 
-                <Button
-                    startIcon={<LinkIcon />}
-                    size="small"
-                    color="primary"
-                    onClick={() => {
-                        navigator.clipboard.writeText(window.location.href)
-                        .then(() => {
-                            // Popup message for successful copy
-                            alert('URL copied to clipboard.');
-                        })
-                        .catch(err => {
-                            // Error handling
-                            console.error('Failed to copy the URL: ', err);
-                            alert('Failed to copy the URL.');
-                        });
-                    }}
-                >
-                Share
-                </Button>
+                <ShareButton />
             </GridToolbarContainer>
         );
     }
@@ -469,6 +452,14 @@ const VariantTableWidget = observer(props => {
                 setSortModel(newModel)
                 handleQuery(filters, true, { page: 0, pageSize: pageSizeModel.pageSize }, newModel);
             }}
+            localeText={{
+                MuiTablePagination: {
+                    labelDisplayedRows: ({ from, to, count }) =>
+                        `${numberFormatter.format(from)}–${numberFormatter.format(to)} of ${
+                            count !== -1 ? numberFormatter.format(count) : 'more than ' + numberFormatter.format(to)
+                        }`,
+                    },
+                }}
         />
     )
 
diff --git a/jbrowse/src/client/JBrowse/VariantTable/components/ShareButton.tsx b/jbrowse/src/client/JBrowse/VariantTable/components/ShareButton.tsx
new file mode 100644
index 000000000..2315158be
--- /dev/null
+++ b/jbrowse/src/client/JBrowse/VariantTable/components/ShareButton.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import { Button } from '@mui/material';
+import LinkIcon from '@mui/icons-material/Link';
+
+export const ShareButton = () => {
+  return (
+      <Button
+            startIcon={<LinkIcon />}
+            size="small"
+            color="primary"
+            onClick={() => {
+                navigator.clipboard.writeText(window.location.href)
+                .then(() => {
+                    alert('URL copied to clipboard.');
+                })
+                .catch(err => {
+                    console.error('Failed to copy the URL: ', err);
+                    alert('Failed to copy the URL.');
+                });
+            }}
+        >
+        Share
+      </Button>
+  );
+};
diff --git a/jbrowse/src/client/JBrowse/VariantTable/components/VariantTableWidget.tsx b/jbrowse/src/client/JBrowse/VariantTable/components/VariantTableWidget.tsx
index a7b58ebc4..33f61a49d 100644
--- a/jbrowse/src/client/JBrowse/VariantTable/components/VariantTableWidget.tsx
+++ b/jbrowse/src/client/JBrowse/VariantTable/components/VariantTableWidget.tsx
@@ -3,7 +3,17 @@ import React, { useEffect, useState } from 'react';
 import { getConf } from '@jbrowse/core/configuration';
 import { ParsedLocString, parseLocString } from '@jbrowse/core/util';
 import { getAdapter } from '@jbrowse/core/data_adapters/dataAdapterCache';
-import { AppBar, Box, Button, Dialog, Grid, MenuItem, Paper, Toolbar, Typography } from '@mui/material';
+import {
+    AppBar,
+    Box,
+    Button,
+    Dialog,
+    Grid,
+    MenuItem,
+    Paper,
+    Toolbar,
+    Typography,
+} from '@mui/material';
 import ScopedCssBaseline from '@mui/material/ScopedCssBaseline';
 import {
   DataGrid,
@@ -11,7 +21,11 @@ import {
   GridColumnVisibilityModel, GridFilterPanel,
   GridPaginationModel,
   GridRenderCellParams,
-  GridToolbar
+  GridToolbar,
+  GridToolbarColumnsButton,
+  GridToolbarFilterButton,
+  GridToolbarDensitySelector,
+  GridToolbarExport
 } from '@mui/x-data-grid';
 import MenuButton from './MenuButton';
 import '../../jbrowse.css';
@@ -27,6 +41,7 @@ import {
   passesSampleFilters
 } from '../../utils';
 import LoadingIndicator from './LoadingIndicator';
+import { ShareButton } from './ShareButton';
 import { NoAssemblyRegion } from '@jbrowse/core/util/types';
 import StandaloneSearchComponent from '../../Search/components/StandaloneSearchComponent';
 import { VcfFeature } from '@jbrowse/plugin-variants';
@@ -352,12 +367,24 @@ const VariantTableWidget = observer(props => {
     }
   }
 
+  const CustomToolbar = () => (
+    <Box sx={{ display: 'flex', justifyContent: 'space-between', p: 1 }}>
+      <Box>
+        <GridToolbarColumnsButton />
+        <GridToolbarFilterButton />
+        <GridToolbarDensitySelector />
+        <GridToolbarExport />
+        <ShareButton />
+      </Box>
+    </Box>
+  );
+
   const gridElement = (
     // NOTE: the filterPanel/sx override is added to fix an issue where the grid column filter value input doesn't align with the field and operator inputs
     <DataGrid
         columns={[...gridColumns, actionsCol]}
         rows={features.map((rawFeature, id) => rawFeatureToRow(rawFeature, id, gridColumns, trackId))}
-        slots={{ toolbar: GridToolbar, filterPanel: GridFilterPanel }}
+        slots={{ toolbar: CustomToolbar, filterPanel: GridFilterPanel }}
         slotProps={{
           filterPanel: {
             filterFormProps: {
@@ -444,7 +471,7 @@ const VariantTableWidget = observer(props => {
           </Grid>
 
           {supportsLuceneIndex ? <Grid key='luceneViewButton' item xs="auto">
-            <Button hidden={!supportsLuceneIndex} style={{ marginTop:"8px"}} color="primary" variant="contained" onClick={() => handleMenu("luceneRedirect")}>Switch to Free-text Search</Button>
+            <Button hidden={!supportsLuceneIndex} style={{ marginTop:"8px"}} color="primary" variant="contained" onClick={() => handleMenu("luceneRedirect")}>Switch to Full-text Search</Button>
           </Grid> : null}
         </Grid>
       </div>
diff --git a/jbrowse/src/client/JBrowse/utils.ts b/jbrowse/src/client/JBrowse/utils.ts
index 1602ff088..0cbe2d0cd 100644
--- a/jbrowse/src/client/JBrowse/utils.ts
+++ b/jbrowse/src/client/JBrowse/utils.ts
@@ -330,7 +330,7 @@ export function serializeLocationToLuceneQuery(contig, start, end) {
 function generateLuceneString(field, operator, value) {
   let luceneQueryString = '';
 
-  if (field === 'variableSamples' && operator == "in set") {
+  if (field === 'variableSamples' && operator == "equals one of") {
     return `variableSamples:~${value}~`;
   }
   let intValue = parseInt(value);
@@ -656,7 +656,7 @@ export function searchStringToInitialFilters(knownFieldNames: string[]) : Filter
 
 export function getOperatorsForField(fieldObj: FieldModel): string[] {
     const stringOperators = ["equals", "does not equal", "contains", "does not contain", "starts with", "ends with", "is empty", "is not empty"];
-    const variableSamplesType = ["in set", "variable in", "not variable in", "variable in all of", "variable in any of", "not variable in any of", "not variable in one of", "is empty", "is not empty"];
+    const variableSamplesType = ["equals one of", "variable in", "not variable in", "variable in all of", "variable in any of", "not variable in any of", "not variable in one of", "is empty", "is not empty"];
     const numericOperators = ["=", "!=", ">", ">=", "<", "<="];
     const noneOperators = [];
 
diff --git a/jbrowse/test/src/org/labkey/test/tests/external/labModules/JBrowseTest.java b/jbrowse/test/src/org/labkey/test/tests/external/labModules/JBrowseTest.java
index 2199ccc99..b3bb3bc57 100644
--- a/jbrowse/test/src/org/labkey/test/tests/external/labModules/JBrowseTest.java
+++ b/jbrowse/test/src/org/labkey/test/tests/external/labModules/JBrowseTest.java
@@ -569,7 +569,6 @@ private void testFullTextSearch() throws Exception
         String sessionId = info.getKey();
         String trackId = info.getValue();
 
-
         // all
         // this should return 143 results. We can't make any other assumptions about the content
         String url = "/jbrowse/" + getProjectName() + "/luceneQuery.view?sessionId=" + sessionId + "&trackId=" + trackId + "&searchString=all&pageSize=143";
@@ -1613,20 +1612,20 @@ private void testLuceneSearchUI(String sessionId)
 
         // VariableSamples in set !TestGroup!
         waitAndClick(Locator.tagWithText("button", "Search"));
-        waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
-        waitForElement(Locator.tagWithText("li", "Samples With Variant")).click();
+        waitForElement(Locator.tagWithAttribute("input", "aria-labelledby", "field-label")).click();
+        waitForElement(Locator.tagWithAttribute("div", "role", "listbox").child(Locator.tagWithText("div", "Samples With Variant"))).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
-        waitForElement(Locator.tagWithText("li", "in set")).click();
+        waitForElement(Locator.tagWithText("li", "equals one of")).click();
         waitForElement(Locator.tagWithId("div", "value-select-0")).click();
         waitForElement(Locator.tagWithText("li", "!TestGroup!")).click();
         waitAndClick(Locator.tagWithClass("button", "filter-form-select-button"));
         waitForElementToDisappear(Locator.tagWithText("span", "173"));
-        clearFilterDialog("variableSamples in set !TestGroup!");
+        clearFilterDialog("variableSamples equals one of !TestGroup!");
 
         // VariableSamples variable in m000001
         waitAndClick(Locator.tagWithText("button", "Search"));
-        waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
-        waitForElement(Locator.tagWithText("li", "Samples With Variant")).click();
+        waitForElement(Locator.tagWithAttribute("input", "aria-labelledby", "field-label")).click();
+        waitForElement(Locator.tagWithAttribute("div", "role", "listbox").child(Locator.tagWithText("div", "Samples With Variant"))).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
         waitForElement(Locator.tagWithText("li", "variable in")).click();
         waitForElement(Locator.tagWithId("input", "value-select-0")).sendKeys("m00001");
@@ -1637,8 +1636,8 @@ private void testLuceneSearchUI(String sessionId)
 
         // VariableSamples not variable in m05710
         waitAndClick(Locator.tagWithText("button", "Search"));
-        waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
-        waitForElement(Locator.tagWithText("li", "Samples With Variant")).click();
+        waitForElement(Locator.tagWithAttribute("input", "aria-labelledby", "field-label")).click();
+        waitForElement(Locator.tagWithAttribute("div", "role", "listbox").child(Locator.tagWithText("div", "Samples With Variant"))).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
         waitForElement(Locator.tagWithText("li", "not variable in")).click();
         waitForElement(Locator.tagWithId("input", "value-select-0")).sendKeys("m05710");
@@ -1649,8 +1648,8 @@ private void testLuceneSearchUI(String sessionId)
 
         // VariableSamples li usage + variable in all of
         waitAndClick(Locator.tagWithText("button", "Search"));
-        waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
-        waitForElement(Locator.tagWithText("li", "Samples With Variant")).click();
+        waitForElement(Locator.tagWithAttribute("input", "aria-labelledby", "field-label")).click();
+        waitForElement(Locator.tagWithAttribute("div", "role", "listbox").child(Locator.tagWithText("div", "Samples With Variant"))).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
         waitForElement(Locator.tagWithText("li", "variable in all of")).click();
         waitForElement(Locator.tagWithId("input", "value-select-0")).sendKeys("m000");
@@ -1663,8 +1662,8 @@ private void testLuceneSearchUI(String sessionId)
 
         // VariableSamples variable in any of m00004,m00007
         waitAndClick(Locator.tagWithText("button", "Search"));
-        waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
-        waitForElement(Locator.tagWithText("li", "Samples With Variant")).click();
+        waitForElement(Locator.tagWithAttribute("input", "aria-labelledby", "field-label")).click();
+        waitForElement(Locator.tagWithAttribute("div", "role", "listbox").child(Locator.tagWithText("div", "Samples With Variant"))).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
         waitForElement(Locator.tagWithText("li", "variable in any of")).click();
         waitForElement(Locator.tagWithId("input", "value-select-0")).sendKeys("m000");
@@ -1677,8 +1676,8 @@ private void testLuceneSearchUI(String sessionId)
 
         // VariableSamples not variable in any of m00005,m00004
         waitAndClick(Locator.tagWithText("button", "Search"));
-        waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
-        waitForElement(Locator.tagWithText("li", "Samples With Variant")).click();
+        waitForElement(Locator.tagWithAttribute("input", "aria-labelledby", "field-label")).click();
+        waitForElement(Locator.tagWithAttribute("div", "role", "listbox").child(Locator.tagWithText("div", "Samples With Variant"))).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
         waitForElement(Locator.tagWithText("li", "not variable in any of")).click();
         waitForElement(Locator.tagWithId("input", "value-select-0")).sendKeys("m000");
@@ -1691,8 +1690,8 @@ private void testLuceneSearchUI(String sessionId)
 
         // VariableSamples not variable in one of m03660,m00001
         waitAndClick(Locator.tagWithText("button", "Search"));
-        waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
-        waitForElement(Locator.tagWithText("li", "Samples With Variant")).click();
+        waitForElement(Locator.tagWithAttribute("input", "aria-labelledby", "field-label")).click();
+        waitForElement(Locator.tagWithAttribute("div", "role", "listbox").child(Locator.tagWithText("div", "Samples With Variant"))).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
         waitForElement(Locator.tagWithText("li", "not variable in one of")).click();
         waitForElement(Locator.tagWithId("input", "value-select-0")).sendKeys("m036");
@@ -1705,8 +1704,8 @@ private void testLuceneSearchUI(String sessionId)
 
         // samples with variant isEmpty
         waitAndClick(Locator.tagWithText("button", "Search"));
-        waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
-        waitForElement(Locator.tagWithText("li", "Samples With Variant")).click();
+        waitForElement(Locator.tagWithAttribute("input", "aria-labelledby", "field-label")).click();
+        waitForElement(Locator.tagWithAttribute("div", "role", "listbox").child(Locator.tagWithText("div", "Samples With Variant"))).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
         waitForElement(Locator.tagWithText("li", "is empty")).click();
         waitAndClick(Locator.tagWithClass("button", "filter-form-select-button"));
@@ -1715,8 +1714,8 @@ private void testLuceneSearchUI(String sessionId)
 
         // Start = 2
         waitAndClick(Locator.tagWithText("button", "Search"));
-        waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
-        waitForElement(Locator.tagWithText("li", "Start")).click();
+        waitForElement(Locator.tagWithAttribute("input", "aria-labelledby", "field-label")).click();
+        waitForElement(Locator.tagWithAttribute("div", "role", "listbox").child(Locator.tagWithText("div", "Start"))).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
         waitForElement(Locator.tagWithText("li", "=")).click();
         waitForElement(Locator.tagWithId("input", "value-select-0")).sendKeys("2");
@@ -1726,8 +1725,8 @@ private void testLuceneSearchUI(String sessionId)
 
         // Start != 2
         waitAndClick(Locator.tagWithText("button", "Search"));
-        waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
-        waitForElement(Locator.tagWithText("li", "Start")).click();
+        waitForElement(Locator.tagWithAttribute("input", "aria-labelledby", "field-label")).click();
+        waitForElement(Locator.tagWithAttribute("div", "role", "listbox").child(Locator.tagWithText("div", "Start"))).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
         waitForElement(Locator.tagWithText("li", "!=")).click();
         waitForElement(Locator.tagWithId("input", "value-select-0")).sendKeys("2");
@@ -1737,8 +1736,8 @@ private void testLuceneSearchUI(String sessionId)
 
         // Start < 173
         waitAndClick(Locator.tagWithText("button", "Search"));
-        waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
-        waitForElement(Locator.tagWithText("li", "Start")).click();
+        waitForElement(Locator.tagWithAttribute("input", "aria-labelledby", "field-label")).click();
+        waitForElement(Locator.tagWithAttribute("div", "role", "listbox").child(Locator.tagWithText("div", "Start"))).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
         waitForElement(Locator.tagWithText("li", "<")).click();
         waitForElement(Locator.tagWithId("input", "value-select-0")).sendKeys("173");
@@ -1748,8 +1747,8 @@ private void testLuceneSearchUI(String sessionId)
 
         // Start > 502
         waitAndClick(Locator.tagWithText("button", "Search"));
-        waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
-        waitForElement(Locator.tagWithText("li", "Start")).click();
+        waitForElement(Locator.tagWithAttribute("input", "aria-labelledby", "field-label")).click();
+        waitForElement(Locator.tagWithAttribute("div", "role", "listbox").child(Locator.tagWithText("div", "Start"))).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
         waitForElement(Locator.tagWithText("li", ">")).click();
         waitForElement(Locator.tagWithId("input", "value-select-0")).sendKeys("502");
@@ -1759,8 +1758,8 @@ private void testLuceneSearchUI(String sessionId)
 
         // Start <= 440
         waitAndClick(Locator.tagWithText("button", "Search"));
-        waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
-        waitForElement(Locator.tagWithText("li", "Start")).click();
+        waitForElement(Locator.tagWithAttribute("input", "aria-labelledby", "field-label")).click();
+        waitForElement(Locator.tagWithAttribute("div", "role", "listbox").child(Locator.tagWithText("div", "Start"))).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
         waitForElement(Locator.tagWithText("li", "<=")).click();
         waitForElement(Locator.tagWithId("input", "value-select-0")).sendKeys("440");
@@ -1770,8 +1769,8 @@ private void testLuceneSearchUI(String sessionId)
 
         // Start >= 609
         waitAndClick(Locator.tagWithText("button", "Search"));
-        waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
-        waitForElement(Locator.tagWithText("li", "Start")).click();
+        waitForElement(Locator.tagWithAttribute("input", "aria-labelledby", "field-label")).click();
+        waitForElement(Locator.tagWithAttribute("div", "role", "listbox").child(Locator.tagWithText("div", "Start"))).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
         waitForElement(Locator.tagWithText("li", ">=")).click();
         waitForElement(Locator.tagWithId("input", "value-select-0")).sendKeys("609");
@@ -1782,8 +1781,8 @@ private void testLuceneSearchUI(String sessionId)
         // Ref Allele equals GAAAA
         waitForElement(Locator.tagWithText("span", "0.029"));
         waitAndClick(Locator.tagWithText("button", "Search"));
-        waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
-        waitForElement(Locator.tagWithText("li", "Ref Allele")).click();
+        waitForElement(Locator.tagWithAttribute("input", "aria-labelledby", "field-label")).click();
+        waitForElement(Locator.tagWithAttribute("div", "role", "listbox").child(Locator.tagWithText("div", "Ref Allele"))).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
         waitForElement(Locator.tagWithText("li", "equals")).click();
         waitForElement(Locator.tagWithId("input", "value-select-0")).sendKeys("GAAAA");
@@ -1794,8 +1793,8 @@ private void testLuceneSearchUI(String sessionId)
         // Impact equals HIGH
         waitForElement(Locator.tagWithText("span", "0.029"));
         waitAndClick(Locator.tagWithText("button", "Search"));
-        waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
-        waitForElement(Locator.tagWithText("li", "Impact on Protein Coding")).click();
+        waitForElement(Locator.tagWithAttribute("input", "aria-labelledby", "field-label")).click();
+        waitForElement(Locator.tagWithAttribute("div", "role", "listbox").child(Locator.tagWithText("div", "Impact on Protein Coding"))).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
         waitForElement(Locator.tagWithText("li", "equals")).click();
         waitForElement(Locator.tagWithId("input", "value-select-0")).sendKeys("HI");
@@ -1807,8 +1806,8 @@ private void testLuceneSearchUI(String sessionId)
         // Ref Allele does not equal A
         waitForElement(Locator.tagWithText("span", "0.029"));
         waitAndClick(Locator.tagWithText("button", "Search"));
-        waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
-        waitForElement(Locator.tagWithText("li", "Ref Allele")).click();
+        waitForElement(Locator.tagWithAttribute("input", "aria-labelledby", "field-label")).click();
+        waitForElement(Locator.tagWithAttribute("div", "role", "listbox").child(Locator.tagWithText("div", "Ref Allele"))).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
         waitForElement(Locator.tagWithText("li", "does not equal")).click();
         waitForElement(Locator.tagWithId("input", "value-select-0")).sendKeys("A");
@@ -1819,8 +1818,8 @@ private void testLuceneSearchUI(String sessionId)
         // Alt Allele contains TT
         waitForElement(Locator.tagWithText("span", "0.029"));
         waitAndClick(Locator.tagWithText("button", "Search"));
-        waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
-        waitForElement(Locator.tagWithText("li", "Alt Allele")).click();
+        waitForElement(Locator.tagWithAttribute("input", "aria-labelledby", "field-label")).click();
+        waitForElement(Locator.tagWithAttribute("div", "role", "listbox").child(Locator.tagWithText("div", "Alt Allele"))).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
         waitForElement(Locator.tagWithText("li", "contains")).click();
         waitForElement(Locator.tagWithId("input", "value-select-0")).sendKeys("TT");
@@ -1831,8 +1830,8 @@ private void testLuceneSearchUI(String sessionId)
         // Alt Allele does not contain T
         waitForElement(Locator.tagWithText("span", "0.029"));
         waitAndClick(Locator.tagWithText("button", "Search"));
-        waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
-        waitForElement(Locator.tagWithText("li", "Alt Allele")).click();
+        waitForElement(Locator.tagWithAttribute("input", "aria-labelledby", "field-label")).click();
+        waitForElement(Locator.tagWithAttribute("div", "role", "listbox").child(Locator.tagWithText("div", "Alt Allele"))).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
         waitForElement(Locator.tagWithText("li", "does not contain")).click();
         waitForElement(Locator.tagWithId("input", "value-select-0")).sendKeys("T");
@@ -1843,8 +1842,8 @@ private void testLuceneSearchUI(String sessionId)
         // Ref Allele starts with GA
         waitForElement(Locator.tagWithText("span", "0.029"));
         waitAndClick(Locator.tagWithText("button", "Search"));
-        waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
-        waitForElement(Locator.tagWithText("li", "Ref Allele")).click();
+        waitForElement(Locator.tagWithAttribute("input", "aria-labelledby", "field-label")).click();
+        waitForElement(Locator.tagWithAttribute("div", "role", "listbox").child(Locator.tagWithText("div", "Ref Allele"))).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
         waitForElement(Locator.tagWithText("li", "starts with")).click();
         waitForElement(Locator.tagWithId("input", "value-select-0")).sendKeys("GA");
@@ -1855,8 +1854,8 @@ private void testLuceneSearchUI(String sessionId)
         // Ref Allele ends with AAA
         waitForElement(Locator.tagWithText("span", "0.029"));
         waitAndClick(Locator.tagWithText("button", "Search"));
-        waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
-        waitForElement(Locator.tagWithText("li", "Ref Allele")).click();
+        waitForElement(Locator.tagWithAttribute("input", "aria-labelledby", "field-label")).click();
+        waitForElement(Locator.tagWithAttribute("div", "role", "listbox").child(Locator.tagWithText("div", "Ref Allele"))).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
         waitForElement(Locator.tagWithText("li", "ends with")).click();
         waitForElement(Locator.tagWithId("input", "value-select-0")).sendKeys("AAA");
@@ -1866,8 +1865,8 @@ private void testLuceneSearchUI(String sessionId)
 
         // Alt Allele is empty
         waitAndClick(Locator.tagWithText("button", "Search"));
-        waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
-        waitForElement(Locator.tagWithText("li", "Alt Allele")).click();
+        waitForElement(Locator.tagWithAttribute("input", "aria-labelledby", "field-label")).click();
+        waitForElement(Locator.tagWithAttribute("div", "role", "listbox").child(Locator.tagWithText("div", "Alt Allele"))).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
         waitForElement(Locator.tagWithText("li", "is empty")).click();
         waitAndClick(Locator.tagWithClass("button", "filter-form-select-button"));
@@ -1876,8 +1875,8 @@ private void testLuceneSearchUI(String sessionId)
 
         // IMPACT is not empty
         waitAndClick(Locator.tagWithText("button", "Search"));
-        waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
-        waitForElement(Locator.tagWithText("li", "Impact on Protein Coding")).click();
+        waitForElement(Locator.tagWithAttribute("input", "aria-labelledby", "field-label")).click();
+        waitForElement(Locator.tagWithAttribute("div", "role", "listbox").child(Locator.tagWithText("div", "Impact on Protein Coding"))).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
         waitForElement(Locator.tagWithText("li", "is not empty")).click();
         waitAndClick(Locator.tagWithClass("button", "filter-form-select-button"));
@@ -1886,8 +1885,8 @@ private void testLuceneSearchUI(String sessionId)
 
         // IMPACT HIGH+MODERATE
         waitAndClick(Locator.tagWithText("button", "Search"));
-        waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "field-label")).click();
-        waitForElement(Locator.tagWithText("li", "Impact on Protein Coding")).click();
+        waitForElement(Locator.tagWithAttribute("input", "aria-labelledby", "field-label")).click();
+        waitForElement(Locator.tagWithAttribute("div", "role", "listbox").child(Locator.tagWithText("div", "Impact on Protein Coding"))).click();
         waitForElement(Locator.tagWithAttribute("div", "aria-labelledby", "operator-label")).click();
         waitForElement(Locator.tagWithText("li", "equals")).click();
         waitForElement(Locator.tagWithId("input", "value-select-0")).sendKeys("HI");