diff --git a/gui/src/components/editQuantity/QueryEditQuantity.js b/gui/src/components/editQuantity/QueryEditQuantity.js
index aa2e5ce550e2c4483bbd06e482ad9607079d3736..cdc8dc110b89c6366c2a9738527b308af54c4125 100644
--- a/gui/src/components/editQuantity/QueryEditQuantity.js
+++ b/gui/src/components/editQuantity/QueryEditQuantity.js
@@ -22,7 +22,7 @@ import {
   Chip,
   Dialog, DialogContent, IconButton, TextField, Tooltip
 } from "@material-ui/core"
-import {ManualSearchContext, useSearchContext} from "../search/SearchContext"
+import {FreeformSearchContext, useSearchContext} from "../search/SearchContext"
 import {ui} from "../../config"
 import DialogActions from "@material-ui/core/DialogActions"
 import Button from "@material-ui/core/Button"
@@ -266,7 +266,7 @@ function QueryEditQuantity({quantityDef, onChange, value, storeInArchive, index,
         />
       )}
     />
-    <ManualSearchContext
+    <FreeformSearchContext
       resource={context?.resource}
       initialPagination={context?.pagination}
       initialColumns={columns}
@@ -284,7 +284,7 @@ function QueryEditQuantity({quantityDef, onChange, value, storeInArchive, index,
         onQueryChanged={handleQueryChanged}
         pageSize={maxData || 100}
       />
-    </ManualSearchContext>
+    </FreeformSearchContext>
   </React.Fragment>
 }
 QueryEditQuantity.propTypes = {
diff --git a/gui/src/components/search/SearchContext.js b/gui/src/components/search/SearchContext.js
index f7333a8aa21a239694d50099631c15027f07ea24..a7ee7fa8762a9355f7a766a043d39bbab0b28ce4 100644
--- a/gui/src/components/search/SearchContext.js
+++ b/gui/src/components/search/SearchContext.js
@@ -170,7 +170,7 @@ export const withQueryString = (WrappedComponent) => {
     </WrappedComponent>
   }
 
-  WithQueryString.displayName = `withFilter(${WrappedComponent.displayName || WrappedComponent.name})`
+  WithQueryString.displayName = `withQueryString(${WrappedComponent.displayName || WrappedComponent.name})`
   WithQueryString.propTypes = {
     initialFilterValues: PropTypes.object, // Determines which filters are available
     children: PropTypes.node // Determines which filters are available
@@ -1797,6 +1797,7 @@ SearchContextRaw.defaultProps = {
   suggestionHistorySize: 20
 }
 
+export const FreeformSearchContext = withFilters(SearchContextRaw)
 export const SearchContext = compose(withQueryString, withFilters)(SearchContextRaw)
 
 /**
@@ -1806,15 +1807,6 @@ export function useSearchContext() {
   return useContext(searchContext)
 }
 
-export const ManualSearchContext = withFilters(SearchContextRaw)
-
-/**
- * Hook to control the current SearchContext manually.
- */
-export function useManualSearchContext() {
-  return useContext(ManualSearchContext)
-}
-
 /**
  * Parses a single filter value into a form that is supported by the GUI. This includes:
  * - Arrays are are transformed into Sets
diff --git a/gui/src/components/uploads/SectionSelectDialog.js b/gui/src/components/uploads/SectionSelectDialog.js
index e9f82baa722242df9e7e1a93d406f7de850dbe07..19bfd72f2d70f54624d0e90d132b07416bb7903c 100644
--- a/gui/src/components/uploads/SectionSelectDialog.js
+++ b/gui/src/components/uploads/SectionSelectDialog.js
@@ -23,7 +23,7 @@ import {
 import Button from '@material-ui/core/Button'
 import DialogActions from '@material-ui/core/DialogActions'
 import PropTypes from 'prop-types'
-import {SearchContext, useSearchContext} from "../search/SearchContext"
+import {FreeformSearchContext, useSearchContext} from "../search/SearchContext"
 import {ui, searchQuantities, apiBase} from "../../config"
 import SearchBar from '../search/SearchBar'
 import {useApi} from '../api'
@@ -202,6 +202,12 @@ Details.propTypes = {
   data: PropTypes.object.isRequired
 }
 
+const columns = context?.columns
+const rows = context?.rows
+columns.selected = shownColumns
+rows.details = {enabled: true, render: Details}
+rows.actions = {enabled: false}
+
 function SearchBox({open, onCancel, onSelectedChanged, selected}) {
   const classes = useStyles()
   const {user} = useApi()
@@ -401,15 +407,10 @@ SearchBox.propTypes = {
 
 function SectionSelectDialog(props) {
   const {open, onSelectedChanged, selected, onCancel, filtersLocked} = props
-  const columns = context?.columns
-  const rows = context?.rows
-  columns.selected = shownColumns
-  rows.details = {enabled: true, render: Details}
-  rows.actions = {enabled: false}
 
   if (!open) return null
 
-  return <SearchContext
+  return <FreeformSearchContext
     resource={context?.resource}
     initialPagination={context?.pagination}
     initialColumns={columns}
@@ -420,7 +421,7 @@ function SectionSelectDialog(props) {
     id='sectionselect'
   >
     <SearchBox open={open} onCancel={onCancel} onSelectedChanged={onSelectedChanged} selected={selected}/>
-  </SearchContext>
+  </FreeformSearchContext>
 }
 SectionSelectDialog.propTypes = {
   open: PropTypes.bool,