diff --git a/client/src/handlers/select-related.js b/client/src/handlers/select-related.js
index 4ba7e427bf..5fd6aa9e0d 100644
--- a/client/src/handlers/select-related.js
+++ b/client/src/handlers/select-related.js
@@ -30,7 +30,7 @@
 
 /**
  * @typedef {Object} module:handlers/select-related~filters
- * @property {Object.<string, module:search-manager~advancedFilter>} [advanced]
+ * @property {Object.<string, import('search-manager').AdvancedFilter>} [advanced]
  *  Advanced filters map. A field name as a key.
  * @property {string[]} [bool] Bool filters.
  * @property {string} [primary] A primary filter.
diff --git a/client/src/helpers/field/cascade-links.js b/client/src/helpers/field/cascade-links.js
index 8b89864578..ea54015d29 100644
--- a/client/src/helpers/field/cascade-links.js
+++ b/client/src/helpers/field/cascade-links.js
@@ -121,12 +121,12 @@ export default class CascadeLinksHelper {
     }
 
     /**
-     * @return {Object.<string, module:search-manager~advancedFilter>}
+     * @return {Object.<string, import('search-manager').AdvancedFilter>}
      */
     prepareFilters() {
         /**
          * @param {{localField: string, foreignField: string, matchRequired: boolean}} item
-         * @return {Object.<string, module:search-manager~advancedFilter>|null}
+         * @return {Object.<string, import('search-manager').AdvancedFilter>|null}
          */
         const prepareItem = (item) => {
             const field = item.localField;
diff --git a/client/src/views/fields/link-multiple.js b/client/src/views/fields/link-multiple.js
index 143f1b1f47..babf29586e 100644
--- a/client/src/views/fields/link-multiple.js
+++ b/client/src/views/fields/link-multiple.js
@@ -308,7 +308,7 @@ class LinkMultipleFieldView extends BaseFieldView {
      * Can be extended.
      *
      * @protected
-     * @return {Object.<string, module:search-manager~advancedFilter>|null}
+     * @return {Object.<string, import('search-manager').AdvancedFilter>|null}
      */
     getSelectFilters() {
         return null;
@@ -1296,7 +1296,7 @@ class LinkMultipleFieldView extends BaseFieldView {
 
     /**
      * @private
-     * @return {Object.<string, module:search-manager~advancedFilter>}
+     * @return {Object.<string, import('search-manager').AdvancedFilter>}
      */
     _getCascadingFilters() {
         return this._createCascadeLinksHelper()?.prepareFilters() ?? {};
diff --git a/client/src/views/fields/link-parent.js b/client/src/views/fields/link-parent.js
index ff37e71af6..977cdc54eb 100644
--- a/client/src/views/fields/link-parent.js
+++ b/client/src/views/fields/link-parent.js
@@ -271,7 +271,7 @@ class LinkParentFieldView extends BaseFieldView {
      * Can be extended.
      *
      * @protected
-     * @return {Object.<string,module:search-manager~advancedFilter>|null}
+     * @return {Object.<string,import('search-manager').AdvancedFilter>|null}
      */
     getSelectFilters() {
         return null;
diff --git a/client/src/views/fields/link.js b/client/src/views/fields/link.js
index 6268b8e8d2..fbbdf5ff58 100644
--- a/client/src/views/fields/link.js
+++ b/client/src/views/fields/link.js
@@ -307,7 +307,7 @@ class LinkFieldView extends BaseFieldView {
      * Can be extended.
      *
      * @protected
-     * @return {Object.<string,module:search-manager~advancedFilter>|null}
+     * @return {Object.<string, import('search-manager').AdvancedFilter>|null}
      */
     getSelectFilters() {
         return null;
@@ -1331,7 +1331,7 @@ class LinkFieldView extends BaseFieldView {
 
     /**
      * @private
-     * @return {Object.<string, module:search-manager~advancedFilter>}
+     * @return {Object.<string, import('search-manager').AdvancedFilter>}
      */
     _getCascadingFilters() {
         return this._createCascadeLinksHelper()?.prepareFilters() ?? {};
diff --git a/client/src/views/modals/select-records.js b/client/src/views/modals/select-records.js
index 412a59763a..80b2e2da44 100644
--- a/client/src/views/modals/select-records.js
+++ b/client/src/views/modals/select-records.js
@@ -86,7 +86,7 @@ class SelectRecordsModalView extends ModalView {
     /**
      * @typedef {Object} module:views/modals/select-records~Options
      * @property {string} entityType An entity type.
-     * @property {Object.<string, module:search-manager~advancedFilter>} [filters] Filters.
+     * @property {Object.<string, import('search-manager').AdvancedFilter>} [filters] Filters.
      * @property {string[]} [boolFilterList] Bool filters.
      * @property {string} [primaryFilterName] A primary filter.
      * @property {string[]} [filterList] A filter list.
diff --git a/client/src/views/record/list.js b/client/src/views/record/list.js
index c6c2a63be0..0948404a61 100644
--- a/client/src/views/record/list.js
+++ b/client/src/views/record/list.js
@@ -38,6 +38,7 @@ import ListSettingsHelper from 'helpers/list/settings';
 import StickyBarHelper from 'helpers/list/misc/sticky-bar';
 import ListColumnResizeHelper from 'helpers/record/list/column-resize';
 import ListColumnWidthControlHelper from 'helpers/record/list/column-width-control';
+import _ from 'underscore';
 
 /**
  * A record-list view. Renders and processes list items, actions.
@@ -100,7 +101,7 @@ class ListRecordView extends View {
      *     As of v9.1.0.
      * @property {boolean} [forceSettings] Force settings. As of v9.2.0.
      * @property {boolean} [forceAllResultSelectable] Force select all result. As of v9.2.0.
-     * @property {module:search-manager~whereItem} [allResultWhereItem] Where item for select all result. As of v9.2.0.
+     * @property {import('collection').WhereItem} [allResultWhereItem] Where item for select all result. As of v9.2.0.
      * @property {boolean} [storeSettings=true] To store settings. As of v10.0.0.
      */
 
@@ -1371,7 +1372,7 @@ class ListRecordView extends View {
     /**
      * Get the where clause for all result.
      *
-     * @return {module:search-manager~whereItem[]}
+     * @return {import('collection').WhereItem[]}
      * @since 9.2.0
      */
     getWhereForAllResult() {