diff --git a/news/65.bugfix b/news/65.bugfix
index 6080d70..5230a5e 100644
--- a/news/65.bugfix
+++ b/news/65.bugfix
@@ -1,4 +1,4 @@
-Remove ISearchSchemas types_not_searched "Discussion Item" value from plone.app.discussion and other impossible values too.
-Default is empty now, since there will never the construction allowed of these three.
+Remove ISearchSchemas types_not_searched "Discussion Item" value to make plone.app.discussion a core addon.
+It is actually not needed anyway, also not part of the underlying vocabulary and would be lost on first save in control-panel.
 See https://github.com/zopefoundation/Products.CMFCore/blob/8d765b8ce7ec4e053e58f5c8dc45d08db01ce3e0/src/Products/CMFCore/TypesTool.py#L768
 [@jensens]
diff --git a/src/plone/base/interfaces/controlpanel.py b/src/plone/base/interfaces/controlpanel.py
index ee5e5fc..7f57588 100644
--- a/src/plone/base/interfaces/controlpanel.py
+++ b/src/plone/base/interfaces/controlpanel.py
@@ -1015,7 +1015,13 @@ class ISearchSchema(Interface):
             "off here or by the relevant installer."
         ),
         required=False,
-        default=(),
+        # XXX: Actually, the Plone Site and TempFolder are not part of the vocabulary
+        # and would be removed from the list of types not searched on first save in ControlPanel!
+        # Both are used in many tests and kept for now.
+        default=(
+            "Plone Site",
+            "TempFolder",
+        ),
         missing_value=(),
         value_type=schema.Choice(source="plone.app.vocabularies.PortalTypes"),
     )