diff --git a/src/gmp/models/__tests__/filter.test.ts b/src/gmp/models/__tests__/filter.test.ts
index 4ab007eb9a..779775a74e 100644
--- a/src/gmp/models/__tests__/filter.test.ts
+++ b/src/gmp/models/__tests__/filter.test.ts
@@ -1184,35 +1184,6 @@ describe('Filter tests', () => {
     });
   });
 
-  describe('Filter fromTerm', () => {
-    test('should add FilterTerm to the Filter.fromElement', () => {
-      const term = new FilterTerm({
-        keyword: 'abc',
-        relation: '=',
-        value: '1',
-      });
-      const filter = Filter.fromTerm(term);
-
-      expect(filter.toFilterString()).toEqual('abc=1');
-    });
-
-    test('should add several FilterTerms to the Filter.fromElement', () => {
-      const term1 = new FilterTerm({
-        keyword: 'abc',
-        relation: '=',
-        value: '1',
-      });
-      const term2 = new FilterTerm({
-        keyword: 'def',
-        relation: '>',
-        value: '666',
-      });
-      const filter = Filter.fromTerm(term1, term2);
-
-      expect(filter.toFilterString()).toEqual('abc=1 def>666');
-    });
-  });
-
   describe('Filter toFilterCriteriaString', () => {
     test('should return string representation', () => {
       const filter1 = createFilterWithTerms('foo=bar and lorem=ipsum');
diff --git a/src/gmp/models/filter.ts b/src/gmp/models/filter.ts
index a301404b4a..019795d19b 100644
--- a/src/gmp/models/filter.ts
+++ b/src/gmp/models/filter.ts
@@ -183,19 +183,6 @@ class Filter extends EntityModel implements FilterType {
     return BaseFilter.fromString(filterString, filter);
   }
 
-  /**
-   * Creates a new Filter from FilterTerms
-   *
-   * @deprecated Use `BaseFilter.fromTerm` instead.
-   *
-   * @param term FilterTerms to set for the new Filter
-   *
-   * @returns The new Filter
-   */
-  static fromTerm(...term: FilterTerm[]) {
-    return BaseFilter.fromTerm(...term);
-  }
-
   toFilterString(): string {
     return this.filterTerms.toFilterString();
   }
diff --git a/src/web/components/dashboard/display/created/CreatedDisplay.jsx b/src/web/components/dashboard/display/created/CreatedDisplay.jsx
index 0bc94e11d5..157b1244cb 100644
--- a/src/web/components/dashboard/display/created/CreatedDisplay.jsx
+++ b/src/web/components/dashboard/display/created/CreatedDisplay.jsx
@@ -4,7 +4,7 @@
  */
 
 import React from 'react';
-import Filter from 'gmp/models/filter';
+import BaseFilter from 'gmp/models/filter/base-filter';
 import FilterTerm from 'gmp/models/filter/filter-term';
 import {isDefined} from 'gmp/utils/identity';
 import LineChart, {lineDataPropType} from 'web/components/chart/base/Line';
@@ -30,7 +30,7 @@ class CreatedDisplay extends React.Component {
     let {x: endDate} = end;
     const dateFormat = 'YYYY-MM-DDTHH:mm';
 
-    let newFilter = isDefined(filter) ? filter.copy() : new Filter();
+    let newFilter = isDefined(filter) ? filter.copy() : new BaseFilter();
 
     if (isDefined(startDate)) {
       if (startDate.isSame(endDate)) {
@@ -43,7 +43,7 @@ class CreatedDisplay extends React.Component {
       );
 
       if (!newFilter.hasTerm(startTerm)) {
-        newFilter = newFilter.and(Filter.fromTerm(startTerm));
+        newFilter = newFilter.and(BaseFilter.fromTerm(startTerm));
       }
     }
 
@@ -53,7 +53,7 @@ class CreatedDisplay extends React.Component {
       );
 
       if (!newFilter.hasTerm(endTerm)) {
-        newFilter = newFilter.and(Filter.fromTerm(endTerm));
+        newFilter = newFilter.and(BaseFilter.fromTerm(endTerm));
       }
     }
 
diff --git a/src/web/components/dashboard/display/cvss/CvssDisplay.jsx b/src/web/components/dashboard/display/cvss/CvssDisplay.jsx
index 24fe1c79ec..ffd5d81525 100644
--- a/src/web/components/dashboard/display/cvss/CvssDisplay.jsx
+++ b/src/web/components/dashboard/display/cvss/CvssDisplay.jsx
@@ -4,7 +4,7 @@
  */
 
 import React from 'react';
-import Filter from 'gmp/models/filter';
+import BaseFilter from 'gmp/models/filter/base-filter';
 import FilterTerm from 'gmp/models/filter/filter-term';
 import {isDefined} from 'gmp/utils/identity';
 import BarChart from 'web/components/chart/Bar';
@@ -48,7 +48,9 @@ const CvssDisplay = ({
         return;
       }
 
-      statusFilter = Filter.fromTerm(startTerm).and(Filter.fromTerm(endTerm));
+      statusFilter = BaseFilter.fromTerm(startTerm).and(
+        BaseFilter.fromTerm(endTerm),
+      );
     } else {
       let statusTerm;
 
@@ -62,7 +64,7 @@ const CvssDisplay = ({
         return;
       }
 
-      statusFilter = Filter.fromTerm(statusTerm);
+      statusFilter = BaseFilter.fromTerm(statusTerm);
     }
 
     const newFilter = isDefined(filter)
diff --git a/src/web/components/dashboard/display/severity/SeverityClassDisplay.tsx b/src/web/components/dashboard/display/severity/SeverityClassDisplay.tsx
index 19490d90a3..336aa62a2d 100644
--- a/src/web/components/dashboard/display/severity/SeverityClassDisplay.tsx
+++ b/src/web/components/dashboard/display/severity/SeverityClassDisplay.tsx
@@ -3,7 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import Filter, {type FilterType} from 'gmp/models/filter';
+import {type FilterType} from 'gmp/models/filter';
+import BaseFilter from 'gmp/models/filter/base-filter';
 import {isDefined} from 'gmp/utils/identity';
 import DonutChart from 'web/components/chart/Donut';
 import DataDisplay, {
@@ -71,13 +72,15 @@ const SeverityClassDisplay = ({
         return;
       }
 
-      severityFilter = Filter.fromTerm(startTerm).and(Filter.fromTerm(endTerm));
+      severityFilter = BaseFilter.fromTerm(startTerm).and(
+        BaseFilter.fromTerm(endTerm),
+      );
     } else {
       if (isDefined(filter) && filter.hasTerm(startTerm)) {
         return;
       }
 
-      severityFilter = Filter.fromTerm(startTerm);
+      severityFilter = BaseFilter.fromTerm(startTerm);
     }
 
     const newFilter = isDefined(filter)
diff --git a/src/web/components/dashboard/display/status/StatusDisplay.jsx b/src/web/components/dashboard/display/status/StatusDisplay.jsx
index e14d0855b0..94e7581ed1 100644
--- a/src/web/components/dashboard/display/status/StatusDisplay.jsx
+++ b/src/web/components/dashboard/display/status/StatusDisplay.jsx
@@ -4,7 +4,7 @@
  */
 
 import React from 'react';
-import Filter from 'gmp/models/filter';
+import BaseFilter from 'gmp/models/filter/base-filter';
 import FilterTerm from 'gmp/models/filter/filter-term';
 import {isDefined} from 'gmp/utils/identity';
 import DonutChart from 'web/components/chart/Donut';
@@ -32,7 +32,7 @@ class StatusDisplay extends React.Component {
         return;
       }
 
-      const statusFilter = Filter.fromTerm(statusTerm);
+      const statusFilter = BaseFilter.fromTerm(statusTerm);
       const newFilter = isDefined(filter)
         ? filter.copy().and(statusFilter)
         : statusFilter;
diff --git a/src/web/pages/hosts/dashboard/ModifiedDisplay.jsx b/src/web/pages/hosts/dashboard/ModifiedDisplay.jsx
index 945272330a..3a4a5896b4 100644
--- a/src/web/pages/hosts/dashboard/ModifiedDisplay.jsx
+++ b/src/web/pages/hosts/dashboard/ModifiedDisplay.jsx
@@ -5,7 +5,8 @@
 
 import React from 'react';
 import {_, _l} from 'gmp/locale/lang';
-import Filter, {HOSTS_FILTER_FILTER} from 'gmp/models/filter';
+import {HOSTS_FILTER_FILTER} from 'gmp/models/filter';
+import BaseFilter from 'gmp/models/filter/base-filter';
 import FilterTerm from 'gmp/models/filter/filter-term';
 import {parseInt, parseDate} from 'gmp/parser';
 import {isDefined} from 'gmp/utils/identity';
@@ -57,7 +58,7 @@ export class HostsModifiedDisplay extends React.Component {
     let {x: endDate} = end;
     const dateFormat = 'YYYY-MM-DDTHH:mm';
 
-    let newFilter = isDefined(filter) ? filter.copy() : new Filter();
+    let newFilter = isDefined(filter) ? filter.copy() : new BaseFilter();
 
     if (isDefined(startDate)) {
       if (startDate.isSame(endDate)) {
@@ -70,7 +71,7 @@ export class HostsModifiedDisplay extends React.Component {
       );
 
       if (!newFilter.hasTerm(startTerm)) {
-        newFilter = newFilter.and(Filter.fromTerm(startTerm));
+        newFilter = newFilter.and(BaseFilter.fromTerm(startTerm));
       }
     }
 
@@ -80,7 +81,7 @@ export class HostsModifiedDisplay extends React.Component {
       );
 
       if (!newFilter.hasTerm(endTerm)) {
-        newFilter = newFilter.and(Filter.fromTerm(endTerm));
+        newFilter = newFilter.and(BaseFilter.fromTerm(endTerm));
       }
     }
 
diff --git a/src/web/pages/hosts/dashboard/ModifiedHighDisplay.jsx b/src/web/pages/hosts/dashboard/ModifiedHighDisplay.jsx
index e769198245..92d7d8f117 100644
--- a/src/web/pages/hosts/dashboard/ModifiedHighDisplay.jsx
+++ b/src/web/pages/hosts/dashboard/ModifiedHighDisplay.jsx
@@ -5,7 +5,8 @@
 
 import React from 'react';
 import {_, _l} from 'gmp/locale/lang';
-import Filter, {HOSTS_FILTER_FILTER} from 'gmp/models/filter';
+import {HOSTS_FILTER_FILTER} from 'gmp/models/filter';
+import BaseFilter from 'gmp/models/filter/base-filter';
 import FilterTerm from 'gmp/models/filter/filter-term';
 import {parseInt, parseDate} from 'gmp/parser';
 import {isDefined} from 'gmp/utils/identity';
@@ -58,7 +59,7 @@ export class HostsModifiedHighDisplay extends React.Component {
     let {x: endDate} = end;
     const dateFormat = 'YYYY-MM-DDTHH:mm';
 
-    let newFilter = isDefined(filter) ? filter.copy() : new Filter();
+    let newFilter = isDefined(filter) ? filter.copy() : new BaseFilter();
 
     if (isDefined(startDate)) {
       if (startDate.isSame(endDate)) {
@@ -71,7 +72,7 @@ export class HostsModifiedHighDisplay extends React.Component {
       );
 
       if (!newFilter.hasTerm(startTerm)) {
-        newFilter = newFilter.and(Filter.fromTerm(startTerm));
+        newFilter = newFilter.and(BaseFilter.fromTerm(startTerm));
       }
     }
 
@@ -81,7 +82,7 @@ export class HostsModifiedHighDisplay extends React.Component {
       );
 
       if (!newFilter.hasTerm(endTerm)) {
-        newFilter = newFilter.and(Filter.fromTerm(endTerm));
+        newFilter = newFilter.and(BaseFilter.fromTerm(endTerm));
       }
     }
 
diff --git a/src/web/pages/notes/dashboard/ActiveDaysDisplay.jsx b/src/web/pages/notes/dashboard/ActiveDaysDisplay.jsx
index 1b4753d260..7f6a8ea91c 100644
--- a/src/web/pages/notes/dashboard/ActiveDaysDisplay.jsx
+++ b/src/web/pages/notes/dashboard/ActiveDaysDisplay.jsx
@@ -5,7 +5,8 @@
 
 import React from 'react';
 import {_, _l} from 'gmp/locale/lang';
-import Filter, {NOTES_FILTER_FILTER} from 'gmp/models/filter';
+import {NOTES_FILTER_FILTER} from 'gmp/models/filter';
+import BaseFilter from 'gmp/models/filter/base-filter';
 import FilterTerm from 'gmp/models/filter/filter-term';
 import {
   NOTE_ACTIVE_UNLIMITED_VALUE,
@@ -116,7 +117,7 @@ export class NotesActiveDaysDisplay extends React.Component {
     if (isDefined(filter) && filter.hasTerm(activeDaysTerm)) {
       return;
     }
-    const activeDaysFilter = Filter.fromTerm(activeDaysTerm);
+    const activeDaysFilter = BaseFilter.fromTerm(activeDaysTerm);
 
     const newFilter = isDefined(filter)
       ? filter.copy().and(activeDaysFilter)
diff --git a/src/web/pages/notes/dashboard/WordCloudDisplay.jsx b/src/web/pages/notes/dashboard/WordCloudDisplay.jsx
index 49e4752d03..4ddf917fd4 100644
--- a/src/web/pages/notes/dashboard/WordCloudDisplay.jsx
+++ b/src/web/pages/notes/dashboard/WordCloudDisplay.jsx
@@ -5,7 +5,8 @@
 
 import React from 'react';
 import {_, _l} from 'gmp/locale/lang';
-import Filter, {NOTES_FILTER_FILTER} from 'gmp/models/filter';
+import {NOTES_FILTER_FILTER} from 'gmp/models/filter';
+import BaseFilter from 'gmp/models/filter/base-filter';
 import FilterTerm from 'gmp/models/filter/filter-term';
 import {parseFloat} from 'gmp/parser';
 import {isDefined} from 'gmp/utils/identity';
@@ -56,7 +57,7 @@ export class NotesWordCloudDisplay extends React.Component {
       if (isDefined(filter) && filter.hasTerm(wordTerm)) {
         return;
       }
-      wordFilter = Filter.fromTerm(wordTerm);
+      wordFilter = BaseFilter.fromTerm(wordTerm);
     }
 
     const newFilter = isDefined(filter)
diff --git a/src/web/pages/nvts/dashboard/FamilyDisplay.jsx b/src/web/pages/nvts/dashboard/FamilyDisplay.jsx
index 2c1ee8f32c..3cbfd89c88 100644
--- a/src/web/pages/nvts/dashboard/FamilyDisplay.jsx
+++ b/src/web/pages/nvts/dashboard/FamilyDisplay.jsx
@@ -5,7 +5,8 @@
 
 import React from 'react';
 import {_, _l} from 'gmp/locale/lang';
-import Filter, {NVTS_FILTER_FILTER} from 'gmp/models/filter';
+import {NVTS_FILTER_FILTER} from 'gmp/models/filter';
+import BaseFilter from 'gmp/models/filter/base-filter';
 import FilterTerm from 'gmp/models/filter/filter-term';
 import {parseFloat, parseSeverity} from 'gmp/parser';
 import {isDefined} from 'gmp/utils/identity';
@@ -85,7 +86,7 @@ export class NvtsFamilyDisplay extends React.Component {
       if (isDefined(filter) && filter.hasTerm(familyTerm)) {
         return;
       }
-      familyFilter = Filter.fromTerm(familyTerm);
+      familyFilter = BaseFilter.fromTerm(familyTerm);
     }
 
     const newFilter = isDefined(filter)
diff --git a/src/web/pages/nvts/dashboard/QodDisplay.jsx b/src/web/pages/nvts/dashboard/QodDisplay.jsx
index cf2c536677..8f75cf7f6a 100644
--- a/src/web/pages/nvts/dashboard/QodDisplay.jsx
+++ b/src/web/pages/nvts/dashboard/QodDisplay.jsx
@@ -5,7 +5,8 @@
 
 import React from 'react';
 import {_, _l} from 'gmp/locale/lang';
-import Filter, {NVTS_FILTER_FILTER} from 'gmp/models/filter';
+import {NVTS_FILTER_FILTER} from 'gmp/models/filter';
+import BaseFilter from 'gmp/models/filter/base-filter';
 import FilterTerm from 'gmp/models/filter/filter-term';
 import {parseFloat} from 'gmp/parser';
 import {isDefined} from 'gmp/utils/identity';
@@ -66,7 +67,7 @@ export class NvtsQodDisplay extends React.Component {
     if (isDefined(filter) && filter.hasTerm(qodTerm)) {
       return;
     }
-    const qodFilter = Filter.fromTerm(qodTerm);
+    const qodFilter = BaseFilter.fromTerm(qodTerm);
 
     const newFilter = isDefined(filter)
       ? filter.copy().and(qodFilter)
diff --git a/src/web/pages/nvts/dashboard/QodTypeDisplay.jsx b/src/web/pages/nvts/dashboard/QodTypeDisplay.jsx
index 11b518a615..d31b234894 100644
--- a/src/web/pages/nvts/dashboard/QodTypeDisplay.jsx
+++ b/src/web/pages/nvts/dashboard/QodTypeDisplay.jsx
@@ -5,7 +5,8 @@
 
 import React from 'react';
 import {_, _l} from 'gmp/locale/lang';
-import Filter, {NVTS_FILTER_FILTER} from 'gmp/models/filter';
+import {NVTS_FILTER_FILTER} from 'gmp/models/filter';
+import BaseFilter from 'gmp/models/filter/base-filter';
 import FilterTerm from 'gmp/models/filter/filter-term';
 import {isDefined} from 'gmp/utils/identity';
 import DonutChart from 'web/components/chart/Donut';
@@ -65,7 +66,7 @@ export class NvtsQodTypeDisplay extends React.Component {
     if (isDefined(filter) && filter.hasTerm(qodTypeTerm)) {
       return;
     }
-    const qodTypeFilter = Filter.fromTerm(qodTypeTerm);
+    const qodTypeFilter = BaseFilter.fromTerm(qodTypeTerm);
 
     const newFilter = isDefined(filter)
       ? filter.copy().and(qodTypeFilter)
diff --git a/src/web/pages/overrides/dashboard/ActiveDaysDisplay.jsx b/src/web/pages/overrides/dashboard/ActiveDaysDisplay.jsx
index bfd0742998..3009d37fee 100644
--- a/src/web/pages/overrides/dashboard/ActiveDaysDisplay.jsx
+++ b/src/web/pages/overrides/dashboard/ActiveDaysDisplay.jsx
@@ -5,7 +5,8 @@
 
 import React from 'react';
 import {_, _l} from 'gmp/locale/lang';
-import Filter, {OVERRIDES_FILTER_FILTER} from 'gmp/models/filter';
+import {OVERRIDES_FILTER_FILTER} from 'gmp/models/filter';
+import BaseFilter from 'gmp/models/filter/base-filter';
 import FilterTerm from 'gmp/models/filter/filter-term';
 import {parseFloat} from 'gmp/parser';
 import {isDefined} from 'gmp/utils/identity';
@@ -115,7 +116,7 @@ export class OverridesActiveDaysDisplay extends React.Component {
     if (isDefined(filter) && filter.hasTerm(activeDaysTerm)) {
       return;
     }
-    const activeDaysFilter = Filter.fromTerm(activeDaysTerm);
+    const activeDaysFilter = BaseFilter.fromTerm(activeDaysTerm);
 
     const newFilter = isDefined(filter)
       ? filter.copy().and(activeDaysFilter)
diff --git a/src/web/pages/overrides/dashboard/WordCloudDisplay.jsx b/src/web/pages/overrides/dashboard/WordCloudDisplay.jsx
index 6491c25ae4..c4945f58b6 100644
--- a/src/web/pages/overrides/dashboard/WordCloudDisplay.jsx
+++ b/src/web/pages/overrides/dashboard/WordCloudDisplay.jsx
@@ -5,7 +5,8 @@
 
 import React from 'react';
 import {_, _l} from 'gmp/locale/lang';
-import Filter, {OVERRIDES_FILTER_FILTER} from 'gmp/models/filter';
+import {OVERRIDES_FILTER_FILTER} from 'gmp/models/filter';
+import BaseFilter from 'gmp/models/filter/base-filter';
 import FilterTerm from 'gmp/models/filter/filter-term';
 import {parseFloat} from 'gmp/parser';
 import {isDefined} from 'gmp/utils/identity';
@@ -56,7 +57,7 @@ export class OverridesWordCloudDisplay extends React.Component {
       if (isDefined(filter) && filter.hasTerm(wordTerm)) {
         return;
       }
-      wordFilter = Filter.fromTerm(wordTerm);
+      wordFilter = BaseFilter.fromTerm(wordTerm);
     }
 
     const newFilter = isDefined(filter)
diff --git a/src/web/pages/reports/dashboard/HighResultsDisplay.jsx b/src/web/pages/reports/dashboard/HighResultsDisplay.jsx
index ab9510f87d..5aba980b6c 100644
--- a/src/web/pages/reports/dashboard/HighResultsDisplay.jsx
+++ b/src/web/pages/reports/dashboard/HighResultsDisplay.jsx
@@ -5,7 +5,8 @@
 
 import React from 'react';
 import {_, _l} from 'gmp/locale/lang';
-import Filter, {REPORTS_FILTER_FILTER} from 'gmp/models/filter';
+import {REPORTS_FILTER_FILTER} from 'gmp/models/filter';
+import BaseFilter from 'gmp/models/filter/base-filter';
 import FilterTerm from 'gmp/models/filter/filter-term';
 import {parseInt, parseFloat, parseDate} from 'gmp/parser';
 import {isDefined} from 'gmp/utils/identity';
@@ -51,7 +52,7 @@ export class ReportsHighResultsDisplay extends React.Component {
     let {x: endDate} = end;
     const dateFormat = 'YYYY-MM-DDTHH:mm';
 
-    let newFilter = isDefined(filter) ? filter.copy() : new Filter();
+    let newFilter = isDefined(filter) ? filter.copy() : new BaseFilter();
 
     if (isDefined(startDate)) {
       if (startDate.isSame(endDate)) {
@@ -64,7 +65,7 @@ export class ReportsHighResultsDisplay extends React.Component {
       );
 
       if (!newFilter.hasTerm(startTerm)) {
-        newFilter = newFilter.and(Filter.fromTerm(startTerm));
+        newFilter = newFilter.and(BaseFilter.fromTerm(startTerm));
       }
     }
 
@@ -74,7 +75,7 @@ export class ReportsHighResultsDisplay extends React.Component {
       );
 
       if (!newFilter.hasTerm(endTerm)) {
-        newFilter = newFilter.and(Filter.fromTerm(endTerm));
+        newFilter = newFilter.and(BaseFilter.fromTerm(endTerm));
       }
     }
 
diff --git a/src/web/pages/results/dashboard/DescriptionWordCloudDisplay.jsx b/src/web/pages/results/dashboard/DescriptionWordCloudDisplay.jsx
index bc1d2d343b..49a76f66f7 100644
--- a/src/web/pages/results/dashboard/DescriptionWordCloudDisplay.jsx
+++ b/src/web/pages/results/dashboard/DescriptionWordCloudDisplay.jsx
@@ -5,7 +5,8 @@
 
 import React from 'react';
 import {_, _l} from 'gmp/locale/lang';
-import Filter, {RESULTS_FILTER_FILTER} from 'gmp/models/filter';
+import {RESULTS_FILTER_FILTER} from 'gmp/models/filter';
+import BaseFilter from 'gmp/models/filter/base-filter';
 import FilterTerm from 'gmp/models/filter/filter-term';
 import {parseFloat} from 'gmp/parser';
 import {isDefined} from 'gmp/utils/identity';
@@ -56,7 +57,7 @@ export class ResultsDescriptionWordCloudDisplay extends React.Component {
       if (isDefined(filter) && filter.hasTerm(wordTerm)) {
         return;
       }
-      wordFilter = Filter.fromTerm(wordTerm);
+      wordFilter = BaseFilter.fromTerm(wordTerm);
     }
 
     const newFilter = isDefined(filter)
diff --git a/src/web/pages/results/dashboard/WordCloudDisplay.jsx b/src/web/pages/results/dashboard/WordCloudDisplay.jsx
index 7e8c39f713..c3df8b8ac6 100644
--- a/src/web/pages/results/dashboard/WordCloudDisplay.jsx
+++ b/src/web/pages/results/dashboard/WordCloudDisplay.jsx
@@ -5,7 +5,8 @@
 
 import React from 'react';
 import {_, _l} from 'gmp/locale/lang';
-import Filter, {RESULTS_FILTER_FILTER} from 'gmp/models/filter';
+import {RESULTS_FILTER_FILTER} from 'gmp/models/filter';
+import BaseFilter from 'gmp/models/filter/base-filter';
 import FilterTerm from 'gmp/models/filter/filter-term';
 import {parseFloat} from 'gmp/parser';
 import {isDefined} from 'gmp/utils/identity';
@@ -56,7 +57,7 @@ export class ResultsWordCloudDisplay extends React.Component {
       if (isDefined(filter) && filter.hasTerm(wordTerm)) {
         return;
       }
-      wordFilter = Filter.fromTerm(wordTerm);
+      wordFilter = BaseFilter.fromTerm(wordTerm);
     }
 
     const newFilter = isDefined(filter)
diff --git a/src/web/pages/tlscertificates/dashboard/ModifiedDisplay.jsx b/src/web/pages/tlscertificates/dashboard/ModifiedDisplay.jsx
index ec2bccc6dc..2c45589324 100644
--- a/src/web/pages/tlscertificates/dashboard/ModifiedDisplay.jsx
+++ b/src/web/pages/tlscertificates/dashboard/ModifiedDisplay.jsx
@@ -5,7 +5,8 @@
 
 import React from 'react';
 import {_, _l} from 'gmp/locale/lang';
-import Filter, {TLS_CERTIFICATES_FILTER_FILTER} from 'gmp/models/filter';
+import {TLS_CERTIFICATES_FILTER_FILTER} from 'gmp/models/filter';
+import BaseFilter from 'gmp/models/filter/base-filter';
 import FilterTerm from 'gmp/models/filter/filter-term';
 import {parseInt, parseDate} from 'gmp/parser';
 import {isDefined} from 'gmp/utils/identity';
@@ -57,7 +58,7 @@ export class TlsCertificatesModifiedDisplay extends React.Component {
     let {x: endDate} = end;
     const dateFormat = 'YYYY-MM-DDTHH:mm';
 
-    let newFilter = isDefined(filter) ? filter.copy() : new Filter();
+    let newFilter = isDefined(filter) ? filter.copy() : new BaseFilter();
 
     if (isDefined(startDate)) {
       if (startDate.isSame(endDate)) {
@@ -70,7 +71,7 @@ export class TlsCertificatesModifiedDisplay extends React.Component {
       );
 
       if (!newFilter.hasTerm(startTerm)) {
-        newFilter = newFilter.and(Filter.fromTerm(startTerm));
+        newFilter = newFilter.and(BaseFilter.fromTerm(startTerm));
       }
     }
 
@@ -80,7 +81,7 @@ export class TlsCertificatesModifiedDisplay extends React.Component {
       );
 
       if (!newFilter.hasTerm(endTerm)) {
-        newFilter = newFilter.and(Filter.fromTerm(endTerm));
+        newFilter = newFilter.and(BaseFilter.fromTerm(endTerm));
       }
     }
 
diff --git a/src/web/pages/vulns/dashboard/HostsDisplay.jsx b/src/web/pages/vulns/dashboard/HostsDisplay.jsx
index 9afa440741..e16ffbd2ec 100644
--- a/src/web/pages/vulns/dashboard/HostsDisplay.jsx
+++ b/src/web/pages/vulns/dashboard/HostsDisplay.jsx
@@ -6,7 +6,8 @@
 import React from 'react';
 import {format as d3format} from 'd3-format';
 import {_, _l} from 'gmp/locale/lang';
-import Filter, {VULNS_FILTER_FILTER} from 'gmp/models/filter';
+import {VULNS_FILTER_FILTER} from 'gmp/models/filter';
+import BaseFilter from 'gmp/models/filter/base-filter';
 import FilterTerm from 'gmp/models/filter/filter-term';
 import {parseFloat} from 'gmp/parser';
 import {isDefined} from 'gmp/utils/identity';
@@ -132,7 +133,9 @@ export class VulnsHostsDisplay extends React.Component {
       ) {
         return;
       }
-      hostFilter = Filter.fromTerm(startTerm).and(Filter.fromTerm(endTerm));
+      hostFilter = BaseFilter.fromTerm(startTerm).and(
+        BaseFilter.fromTerm(endTerm),
+      );
     } else {
       let hostTerm;
 
@@ -148,7 +151,7 @@ export class VulnsHostsDisplay extends React.Component {
         return;
       }
 
-      hostFilter = Filter.fromTerm(hostTerm);
+      hostFilter = BaseFilter.fromTerm(hostTerm);
     }
 
     const newFilter = isDefined(filter)