diff --git a/assets/layers/historic_aircraft/historic_aircraft.json b/assets/layers/historic_aircraft/historic_aircraft.json
new file mode 100644
index 0000000000..47736014d8
--- /dev/null
+++ b/assets/layers/historic_aircraft/historic_aircraft.json
@@ -0,0 +1,110 @@
+{
+  "id": "historic_aircraft",
+  "name": {
+    "en": "Historic aircraft"
+  },
+  "source": {
+    "osmTags": {
+      "or": [
+        "historic=aircraft",
+        "memorial=aircraft"
+      ]
+    }
+  },
+  "minzoom": 5,
+  "title": {
+    "render": {
+      "en": "Historic aircraft"
+    }
+  },
+  "pointRendering": [
+    {
+      "location": [
+        "point",
+        "centroid"
+      ],
+      "marker": [
+        {
+          "icon": "circle",
+          "color": "white"
+        },
+        {
+          "icon": "airport"
+        }
+      ]
+    }
+  ],
+  "lineRendering": [
+    {
+      "width": 1,
+      "color": "blue"
+    }
+  ],
+  "presets": [
+    {
+      "title": {
+        "en": "a aircraft on a permanent location"
+      },
+      "description": {
+        "en": "A (historic) aircraft permanently installed on a location, e.g. in a museum, as artwork or as memorial."
+      },
+      "tags": [
+        "historic=aircraft"
+      ]
+    }
+  ],
+  "tagRenderings": [
+    "images",
+    {
+      "question": {
+        "en": "What type of model is this aircraft?"
+      },
+      "id": "model",
+      "freeform": {
+        "key": "model:wikidata",
+        "type": "wikidata"
+      },
+      "render": {
+        "en": "{wikipedia(model:wikidata)}"
+      }
+    },
+    {
+      "id": "is_memorial",
+      "question": {
+        "en": "Does this aircraft also serve as a memorial?"
+      },
+      "mappings": [
+        {
+          "if": "memorial=aircraft",
+          "then": {
+            "en": "Serves as a memorial"
+          }
+        },
+        {
+          "if": "not:memorial=yes",
+          "alsoShowIf": "memorial=",
+          "then": {
+            "en": "Does not serve as a memorial"
+          }
+        }
+      ]
+    },
+    {
+      "builtin": "memorial.memorial-questions",
+      "override": {
+        "condition": {
+          "and+": [
+            "memorial~*"
+          ]
+        }
+      }
+    }
+  ],
+  "deletion": true,
+  "allowMove": {
+    "enableImproveAccuracy": true,
+    "enableRelocation": false
+  },
+  "credits": "Pieter Vander Vennet",
+  "credits:uid": 3818858
+}
diff --git a/assets/themes/historic_aircraft/historic_aircraft.json b/assets/themes/historic_aircraft/historic_aircraft.json
new file mode 100644
index 0000000000..8a18a82a99
--- /dev/null
+++ b/assets/themes/historic_aircraft/historic_aircraft.json
@@ -0,0 +1,13 @@
+{
+  "id": "historic_aircraft",
+  "title": {
+    "en": "Historic aircraft"
+  },
+  "description": {
+    "en": "A map showing all historic, permanently installed aircraft. The aircraft can be in a museum, an artwork or a memorial."
+  },
+  "icon": "airport",
+  "layers": [
+    "historic_aircraft"
+  ]
+}
diff --git a/assets/themes/memorials/memorials.json b/assets/themes/memorials/memorials.json
index 42510ef33f..14758fcf55 100644
--- a/assets/themes/memorials/memorials.json
+++ b/assets/themes/memorials/memorials.json
@@ -41,7 +41,8 @@
     {
       "builtin": [
         "bench",
-        "artwork"
+        "artwork",
+        "historic_aircraft"
       ],
       "override": {
         "minzoom": 18
diff --git a/src/UI/Search/ActiveFilters.svelte b/src/UI/Search/ActiveFilters.svelte
index bd6c6b4a60..68b559bed3 100644
--- a/src/UI/Search/ActiveFilters.svelte
+++ b/src/UI/Search/ActiveFilters.svelte
@@ -14,12 +14,13 @@
 
   import Locale from "../i18n/Locale"
   import DefaultIcon from "../Map/DefaultIcon.svelte"
+  import { WithSearchState } from "../../Models/ThemeViewState/WithSearchState"
 
   export let activeFilters: (FilterSearchResult & ActiveFilter)[]
   let language = Locale.language
   let mergedActiveFilters = FilterSearch.mergeSemiIdenticalLayers(activeFilters, $language)
   $: mergedActiveFilters = FilterSearch.mergeSemiIdenticalLayers(activeFilters, $language)
-  export let state: SpecialVisualizationState
+  export let state: WithSearchState
   let loading = false
   const t = Translations.t.general.search