diff --git a/invenio_communities/administration/communities.py b/invenio_communities/administration/communities.py
index 80f73ac61..230db26fe 100644
--- a/invenio_communities/administration/communities.py
+++ b/invenio_communities/administration/communities.py
@@ -7,11 +7,14 @@
 # details.
 
 """Invenio administration OAI-PMH view module."""
-from flask import app, current_app, has_app_context
+from functools import partial
+
+from flask import current_app
 from invenio_administration.views.base import (
     AdminResourceDetailView,
     AdminResourceListView,
 )
+from invenio_search_ui.searchconfig import search_app_config
 
 from invenio_communities.communities.schema import CommunityFeaturedSchema
 
@@ -36,15 +39,12 @@ class CommunityListView(AdminResourceListView):
     display_edit = False
 
     item_field_list = {
-        "slug": {
-            "text": "Slug",
-            "order": 1,
-        },
-        "metadata.title": {"text": "Title", "order": 2},
+        "slug": {"text": "Slug", "order": 1, "width": 1},
+        "metadata.title": {"text": "Title", "order": 2, "width": 4},
         # This field is for display only, it won't work on forms
-        "ui.type.title_l10n": {"text": "Type", "order": 3},
-        "featured": {"text": "Featured", "order": 4},
-        "created": {"text": "Created", "order": 5},
+        "ui.type.title_l10n": {"text": "Type", "order": 3, "width": 2},
+        "featured": {"text": "Featured", "order": 4, "width": 1},
+        "created": {"text": "Created", "order": 5, "width": 2},
     }
 
     actions = {
@@ -52,12 +52,41 @@ class CommunityListView(AdminResourceListView):
             "text": "Feature",
             "payload_schema": CommunityFeaturedSchema,
             "order": 1,
-        }
+        },
+        # custom components in the UI
+        "delete": {
+            "text": "Delete",
+            "payload_schema": None,
+            "order": 2,
+        },
+        # custom components in the UI
+        "restore": {
+            "text": "Restore",
+            "payload_schema": None,
+            "order": 2,
+        },
     }
     search_config_name = "COMMUNITIES_SEARCH"
     search_facets_config_name = "COMMUNITIES_FACETS"
     search_sort_config_name = "COMMUNITIES_SORT_OPTIONS"
 
+    def init_search_config(self):
+        """Build search view config."""
+        return partial(
+            search_app_config,
+            config_name=self.get_search_app_name(),
+            available_facets=current_app.config.get(self.search_facets_config_name),
+            sort_options=current_app.config[self.search_sort_config_name],
+            endpoint=self.get_api_endpoint(),
+            headers=self.get_search_request_headers(),
+            initial_filters=[["status", "P"]],
+            hidden_params=[
+                ["include_deleted", "1"],
+            ],
+            page=1,
+            size=30,
+        )
+
     @staticmethod
     def disabled():
         """Disable the view on demand."""
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/api.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/api.js
deleted file mode 100644
index 22842a102..000000000
--- a/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/api.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { http } from "react-invenio-forms";
-
-const getFeatured = async (apiEndpoint) => {
-  return await http.get(apiEndpoint);
-};
-
-export const InvenioAdministrationCommunitiesApi = {
-  getFeatured: getFeatured,
-};
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/api/api.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/api/api.js
new file mode 100644
index 000000000..56953fd71
--- /dev/null
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/api/api.js
@@ -0,0 +1,26 @@
+import { APIRoutes } from "./routes";
+import { http } from "react-invenio-forms";
+
+const getFeatured = async (apiEndpoint) => {
+  return await http.get(apiEndpoint);
+};
+
+const deleteCommunity = async (community, payload) => {
+  const reason = payload["removal_reason"];
+  payload["removal_reason"] = { id: reason };
+  // WARNING: Axios does not accept payload without data key
+  return await http.delete(APIRoutes.delete(community), {
+    data: { ...payload },
+    headers: { ...http.headers, if_match: community.revision_id },
+  });
+};
+
+const restore = async (record) => {
+  return await http.post(APIRoutes.restore(record));
+};
+
+export const InvenioAdministrationCommunitiesApi = {
+  getFeatured: getFeatured,
+  delete: deleteCommunity,
+  restore: restore,
+};
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/api/index.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/api/index.js
new file mode 100644
index 000000000..d3dde92ae
--- /dev/null
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/api/index.js
@@ -0,0 +1 @@
+export { InvenioAdministrationCommunitiesApi } from "./api";
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/api/routes.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/api/routes.js
new file mode 100644
index 000000000..bd53019f5
--- /dev/null
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/api/routes.js
@@ -0,0 +1,14 @@
+import _get from "lodash/get";
+
+const APIRoutesGenerators = {
+  delete: (record, idKeyPath = "id") => {
+    return `/api/communities/${_get(record, idKeyPath)}`;
+  },
+  restore: (record, idKeyPath = "id") => {
+    return `/api/communities/${_get(record, idKeyPath)}/restore`;
+  },
+};
+
+export const APIRoutes = {
+  ...APIRoutesGenerators,
+};
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/components/RecordResourceActions.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/components/RecordResourceActions.js
new file mode 100644
index 000000000..685762d5c
--- /dev/null
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/components/RecordResourceActions.js
@@ -0,0 +1,165 @@
+/*
+ * // This file is part of Invenio-App-Rdm
+ * // Copyright (C) 2023 CERN.
+ * //
+ * // Invenio-App-Rdm is free software; you can redistribute it and/or modify it
+ * // under the terms of the MIT License; see LICENSE file for more details.
+ */
+
+import { RestoreConfirmation } from "./RestoreConfirmation";
+import TombstoneForm from "./TombstoneForm";
+import React, { Component } from "react";
+import PropTypes from "prop-types";
+import { Button, Modal, Icon } from "semantic-ui-react";
+import { ActionModal, ActionForm } from "@js/invenio_administration";
+import _isEmpty from "lodash/isEmpty";
+import { i18next } from "@translations/invenio_app_rdm/i18next";
+
+export class RecordResourceActions extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      modalOpen: false,
+      modalHeader: undefined,
+      modalBody: undefined,
+    };
+  }
+
+  onModalTriggerClick = (e, { payloadSchema, dataName, dataActionKey }) => {
+    const { resource } = this.props;
+
+    if (dataActionKey === "delete") {
+      this.setState({
+        modalOpen: true,
+        modalHeader: i18next.t("Delete community"),
+        modalBody: (
+          <TombstoneForm
+            actionSuccessCallback={this.handleSuccess}
+            actionCancelCallback={this.closeModal}
+            resource={resource}
+          />
+        ),
+      });
+    } else if (dataActionKey === "restore") {
+      this.setState({
+        modalOpen: true,
+        modalHeader: i18next.t("Restore community"),
+        modalBody: (
+          <RestoreConfirmation
+            actionSuccessCallback={this.handleSuccess}
+            actionCancelCallback={this.closeModal}
+            resource={resource}
+          />
+        ),
+      });
+    } else {
+      this.setState({
+        modalOpen: true,
+        modalHeader: dataName,
+        modalBody: (
+          <ActionForm
+            actionKey={dataActionKey}
+            actionSchema={payloadSchema}
+            actionSuccessCallback={this.handleSuccess}
+            actionCancelCallback={this.closeModal}
+            resource={resource}
+          />
+        ),
+      });
+    }
+  };
+
+  closeModal = () => {
+    this.setState({
+      modalOpen: false,
+      modalHeader: undefined,
+      modalBody: undefined,
+    });
+  };
+
+  handleSuccess = () => {
+    const { successCallback } = this.props;
+    this.setState({
+      modalOpen: false,
+      modalHeader: undefined,
+      modalBody: undefined,
+    });
+    successCallback();
+  };
+
+  render() {
+    const { actions, Element, resource } = this.props;
+    const { modalOpen, modalHeader, modalBody } = this.state;
+    return (
+      <>
+        {Object.entries(actions).map(([actionKey, actionConfig]) => {
+          if (actionKey === "delete" && !resource.deletion_status.is_deleted) {
+            return (
+              <Element
+                key={actionKey}
+                onClick={this.onModalTriggerClick}
+                payloadSchema={actionConfig.payload_schema}
+                dataName={actionConfig.text}
+                dataActionKey={actionKey}
+                icon
+                fluid
+                labelPosition="left"
+              >
+                <Icon name="trash alternate" />
+                {actionConfig.text}
+              </Element>
+            );
+          } else if (actionKey === "restore" && resource.deletion_status.is_deleted) {
+            return (
+              <Element
+                key={actionKey}
+                onClick={this.onModalTriggerClick}
+                payloadSchema={actionConfig.payload_schema}
+                dataName={actionConfig.text}
+                dataActionKey={actionKey}
+                icon
+                fluid
+                labelPosition="left"
+              >
+                <Icon name="undo" />
+                {actionConfig.text}
+              </Element>
+            );
+          } else if (!resource.deletion_status.is_deleted && actionKey !== "restore") {
+            return (
+              <Element
+                key={actionKey}
+                onClick={this.onModalTriggerClick}
+                payloadSchema={actionConfig.payload_schema}
+                dataName={actionConfig.text}
+                dataActionKey={actionKey}
+              >
+                {actionConfig.text}
+              </Element>
+            );
+          }
+        })}
+        <ActionModal modalOpen={modalOpen} resource={resource}>
+          {modalHeader && <Modal.Header>{modalHeader}</Modal.Header>}
+          {!_isEmpty(modalBody) && modalBody}
+        </ActionModal>
+      </>
+    );
+  }
+}
+
+RecordResourceActions.propTypes = {
+  resource: PropTypes.object.isRequired,
+  successCallback: PropTypes.func.isRequired,
+  actions: PropTypes.shape({
+    text: PropTypes.string.isRequired,
+    payload_schema: PropTypes.object.isRequired,
+    order: PropTypes.number.isRequired,
+  }),
+  Element: PropTypes.node,
+};
+
+RecordResourceActions.defaultProps = {
+  Element: Button,
+  actions: undefined,
+};
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/components/RemovalReasonsSelect.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/components/RemovalReasonsSelect.js
new file mode 100644
index 000000000..3eac9aef4
--- /dev/null
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/components/RemovalReasonsSelect.js
@@ -0,0 +1,85 @@
+/*
+ * // This file is part of Invenio-App-Rdm
+ * // Copyright (C) 2023 CERN.
+ * //
+ * // Invenio-App-Rdm is free software; you can redistribute it and/or modify it
+ * // under the terms of the MIT License; see LICENSE file for more details.
+ */
+
+import React, { Component } from "react";
+import PropTypes from "prop-types";
+import { Dropdown, http, withCancel } from "react-invenio-forms";
+import { Dropdown as SUIDropdown } from "semantic-ui-react";
+import { i18next } from "@translations/invenio_app_rdm/i18next";
+
+export default class RemovalReasonsSelect extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      options: undefined,
+      loading: false,
+      defaultOpt: undefined,
+    };
+  }
+
+  componentDidMount() {
+    this.fetchOptions();
+  }
+
+  componentWillUnmount() {
+    this.cancellableAction && this.cancellableAction.cancel();
+  }
+
+  fetchOptions = async () => {
+    const { setFieldValue } = this.props;
+    this.setState({ loading: true });
+    const url = "/api/vocabularies/removalreasons";
+    this.cancellableAction = withCancel(
+      http.get(url, {
+        headers: {
+          Accept: "application/vnd.inveniordm.v1+json",
+        },
+      })
+    );
+    try {
+      const response = await this.cancellableAction.promise;
+      const options = response.data.hits.hits;
+
+      const defaultOpt = options
+        ? { text: options[0].title_l10n, value: options[0].id, key: options[0].id }
+        : {};
+      this.setState({
+        options: options,
+        loading: false,
+        defaultOpt: defaultOpt,
+      });
+      setFieldValue("removal_reason", defaultOpt.value);
+    } catch (e) {
+      this.setState({ loading: false });
+      console.error(e);
+    }
+  };
+
+  render() {
+    const { loading, options, defaultOpt } = this.state;
+
+    if (loading) {
+      return <SUIDropdown loading={loading} />;
+    }
+
+    return (
+      <Dropdown
+        required
+        label={i18next.t("Unavailability statement")}
+        options={options}
+        fieldPath="removal_reason"
+        defaultValue={defaultOpt}
+        clearable={false}
+      />
+    );
+  }
+}
+
+RemovalReasonsSelect.propTypes = {
+  setFieldValue: PropTypes.func.isRequired,
+};
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/components/RestoreConfirmation.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/components/RestoreConfirmation.js
new file mode 100644
index 000000000..6adaaa2ab
--- /dev/null
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/components/RestoreConfirmation.js
@@ -0,0 +1,110 @@
+/*
+ * // This file is part of Invenio-Communities
+ * // Copyright (C) 2023 CERN.
+ * //
+ * // Invenio-App-Rdm is free software; you can redistribute it and/or modify it
+ * // under the terms of the MIT License; see LICENSE file for more details.
+ */
+
+import { InvenioAdministrationCommunitiesApi } from "../api";
+import React, { Component } from "react";
+import PropTypes from "prop-types";
+import { NotificationContext } from "@js/invenio_administration";
+import { withCancel, ErrorMessage } from "react-invenio-forms";
+import { Button, Modal } from "semantic-ui-react";
+import { i18next } from "@translations/invenio_app_rdm/i18next";
+
+export class RestoreConfirmation extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      loading: false,
+      error: undefined,
+    };
+  }
+
+  componentWillUnmount() {
+    this.cancellableAction && this.cancellableAction.cancel();
+  }
+
+  static contextType = NotificationContext;
+
+  handleSubmit = async (values) => {
+    const { addNotification } = this.context;
+    const { resource, actionSuccessCallback } = this.props;
+
+    this.setState({ loading: true });
+
+    this.cancellableAction = withCancel(
+      InvenioAdministrationCommunitiesApi.restore(resource)
+    );
+
+    try {
+      await this.cancellableAction.promise;
+      this.setState({ loading: false, error: undefined });
+      addNotification({
+        title: i18next.t("Success"),
+        content: i18next.t("Community {{id}} was restored.", { id: resource.slug }),
+        type: "success",
+      });
+      actionSuccessCallback();
+    } catch (error) {
+      if (error === "UNMOUNTED") return;
+
+      this.setState({
+        error: error?.response?.data?.message || error?.message,
+        loading: false,
+      });
+      console.error(error);
+    }
+  };
+  handleModalClose = () => {
+    const { actionCancelCallback } = this.props;
+    actionCancelCallback();
+  };
+
+  render() {
+    const { error, loading } = this.state;
+    const { resource } = this.props;
+    return (
+      <>
+        {error && (
+          <ErrorMessage
+            header={i18next.t("Unable to restore.")}
+            content={error}
+            icon="exclamation"
+            className="text-align-left"
+            negative
+          />
+        )}
+        <Modal.Content>
+          {i18next.t("Are you sure you want to restore community #{{id}}", {
+            id: resource.slug,
+          })}
+          <b>"{resource.metadata.title}"</b> ?
+        </Modal.Content>
+        <Modal.Actions>
+          <Button onClick={this.handleModalClose} floated="left">
+            Close
+          </Button>
+          <Button
+            size="small"
+            labelPosition="left"
+            icon="trash alternate"
+            color="red"
+            content={i18next.t("Restore community")}
+            onClick={(event) => this.handleSubmit(event)}
+            loading={loading}
+            disabled={loading}
+          />
+        </Modal.Actions>
+      </>
+    );
+  }
+}
+
+RestoreConfirmation.propTypes = {
+  resource: PropTypes.object.isRequired,
+  actionCancelCallback: PropTypes.func.isRequired,
+  actionSuccessCallback: PropTypes.func.isRequired,
+};
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/components/TombstoneForm.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/components/TombstoneForm.js
new file mode 100644
index 000000000..00689dbff
--- /dev/null
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/components/TombstoneForm.js
@@ -0,0 +1,206 @@
+/*
+ * // This file is part of Invenio-App-Rdm
+ * // Copyright (C) 2023 CERN.
+ * //
+ * // Invenio-App-Rdm is free software; you can redistribute it and/or modify it
+ * // under the terms of the MIT License; see LICENSE file for more details.
+ */
+
+import RemovalReasonsSelect from "./RemovalReasonsSelect";
+import { InvenioAdministrationCommunitiesApi } from "../api";
+import React, { Component } from "react";
+import PropTypes from "prop-types";
+import { i18next } from "@translations/invenio_app_rdm/i18next";
+import { Formik } from "formik";
+import {
+  withCancel,
+  ErrorMessage,
+  TextField,
+  TextAreaField,
+} from "react-invenio-forms";
+import { Form, Button, Modal, Divider, Message, Icon } from "semantic-ui-react";
+import { NotificationContext } from "@js/invenio_administration";
+import * as Yup from "yup";
+
+export default class TombstoneForm extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      loading: false,
+      error: undefined,
+    };
+    this.tombstoneSchema = Yup.object({
+      removal_reason: Yup.string().required(),
+      note: Yup.string(),
+      citation_text: Yup.string(),
+      is_visible: Yup.bool().required(),
+    });
+  }
+
+  componentWillUnmount() {
+    this.cancellableAction && this.cancellableAction.cancel();
+  }
+
+  static contextType = NotificationContext;
+
+  handleSubmit = async (values) => {
+    const { addNotification } = this.context;
+    const { resource, actionSuccessCallback } = this.props;
+    const payload = { ...values };
+
+    this.setState({ loading: true });
+
+    this.cancellableAction = withCancel(
+      InvenioAdministrationCommunitiesApi.delete(resource, payload)
+    );
+
+    try {
+      await this.cancellableAction.promise;
+      this.setState({ loading: false, error: undefined });
+      addNotification({
+        title: i18next.t("Success"),
+        content: i18next.t("Community {{id}} was deleted.", { id: resource.id }),
+        type: "success",
+      });
+      actionSuccessCallback();
+    } catch (error) {
+      if (error === "UNMOUNTED") return;
+
+      this.setState({
+        error: error?.response?.data?.message || error?.message,
+        loading: false,
+      });
+      console.error(error);
+    }
+  };
+
+  handleModalClose = () => {
+    const { actionCancelCallback } = this.props;
+    actionCancelCallback();
+  };
+
+  initFormValues = () => {
+    return {
+      removal_reason: undefined,
+      note: undefined,
+      citation_text: undefined,
+      is_visible: true,
+    };
+  };
+
+  handleVisibility = (setFieldValue, value) => {
+    setFieldValue("is_visible", value);
+  };
+
+  render() {
+    const { error, loading } = this.state;
+    const { resource } = this.props;
+    const isPublic = resource.access.visibility === "public";
+    return (
+      <Formik
+        onSubmit={this.handleSubmit}
+        enableReinitialize
+        initialValues={this.initFormValues()}
+        validateOnChange={false}
+        validateOnBlur={false}
+        validationSchema={this.tombstoneSchema}
+      >
+        {({ values, handleSubmit, setFieldValue }) => {
+          return (
+            <>
+              {error && (
+                <ErrorMessage
+                  header={i18next.t("Unable to delete")}
+                  content={error}
+                  icon="exclamation"
+                  className="text-align-left"
+                  negative
+                />
+              )}
+              <Modal.Content>
+                <Form className="full-width">
+                  <Button.Group widths={2} fluid>
+                    <Button
+                      color={values.is_visible ? "green" : ""}
+                      active={values.is_visible}
+                      // }
+                      value
+                      onClick={(event, elem) =>
+                        this.handleVisibility(setFieldValue, true)
+                      }
+                    >
+                      Public
+                    </Button>
+                    <Button
+                      active={!values.is_visible}
+                      color={!values.is_visible ? "red" : ""}
+                      value={false}
+                      onClick={(event, elem) =>
+                        this.handleVisibility(setFieldValue, false)
+                      }
+                    >
+                      Hidden
+                    </Button>
+                  </Button.Group>
+                  {!values.is_visible && isPublic && (
+                    <Message icon warning className="display">
+                      <Icon name="warning sign" />
+                      {i18next.t(
+                        "The tombstone is set to hidden but your record is public. Best practice is to provide a public tombstone when deactivating public records."
+                      )}
+                    </Message>
+                  )}
+                  {values.is_visible && !isPublic && (
+                    <Message icon negative className="display">
+                      <Icon name="warning sign" />
+                      {i18next.t(
+                        "RISK INFORMATION LEAKAGE: The tombstone is set to public but your record is restricted. Please make sure no restricted information is shared in the tombstone below."
+                      )}
+                    </Message>
+                  )}
+                  <Divider hidden />
+                  <Form.Field>
+                    <RemovalReasonsSelect setFieldValue={setFieldValue} />
+                  </Form.Field>
+                  <Form.Field>
+                    <TextField
+                      fieldPath="citation_text"
+                      label={i18next.t("Bibliographic citation")}
+                      placeholder={i18next.t(
+                        "Input citation text. Blank field will be filled with APA citation by default."
+                      )}
+                    />
+                  </Form.Field>
+                  <Form.Field>
+                    <TextAreaField fieldPath="note" label={i18next.t("Note")} fluid />
+                  </Form.Field>
+                </Form>
+              </Modal.Content>
+              <Modal.Actions>
+                <Button onClick={this.handleModalClose} floated="left">
+                  Close
+                </Button>
+                <Button
+                  size="small"
+                  labelPosition="left"
+                  icon="trash alternate"
+                  color="red"
+                  content={i18next.t("Delete record")}
+                  onClick={(event) => handleSubmit(event)}
+                  loading={loading}
+                  disabled={loading}
+                />
+              </Modal.Actions>
+            </>
+          );
+        }}
+      </Formik>
+    );
+  }
+}
+
+TombstoneForm.propTypes = {
+  resource: PropTypes.object.isRequired,
+  actionSuccessCallback: PropTypes.func.isRequired,
+  actionCancelCallback: PropTypes.func.isRequired,
+};
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/components/index.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/components/index.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/search.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/search.js
index e66ce9029..66d26b341 100644
--- a/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/search.js
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/search.js
@@ -6,9 +6,11 @@
 
 import { initDefaultSearchComponents } from "@js/invenio_administration";
 import { createSearchAppInit } from "@js/invenio_search_ui";
+import { RecordSearchLayout } from "./search/RecordSearchLayout";
 import { FeatureModal } from "./FeatureModal";
 import { parametrize } from "react-overridable";
 import { NotificationController, BoolFormatter } from "@js/invenio_administration";
+import { RecordResourceActions } from "./components/RecordResourceActions";
 
 const domContainer = document.getElementById("invenio-search-config");
 
@@ -21,7 +23,9 @@ const CustomBoolFormatter = parametrize(BoolFormatter, {
 const overridenComponents = {
   ...defaultComponents,
   "InvenioAdministration.BoolFormatter": CustomBoolFormatter,
-  "InvenioAdministration.ActionModal": FeatureModal,
+  "InvenioAdministration.ActionModal.feature": FeatureModal,
+  "InvenioAdministration.ResourceActions": RecordResourceActions,
+  "SearchApp.layout": RecordSearchLayout,
 };
 
 createSearchAppInit(
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/search/RecordSearchLayout.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/search/RecordSearchLayout.js
new file mode 100644
index 000000000..c021c5694
--- /dev/null
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/search/RecordSearchLayout.js
@@ -0,0 +1,82 @@
+/*
+ * // This file is part of Invenio-App-Rdm
+ * // Copyright (C) 2023 CERN.
+ * //
+ * // Invenio-App-Rdm is free software; you can redistribute it and/or modify it
+ * // under the terms of the MIT License; see LICENSE file for more details.
+ */
+
+import { SearchAppResultsPane } from "@js/invenio_search_ui/components";
+import { SearchFacets } from "@js/invenio_administration";
+import PropTypes from "prop-types";
+import React, { Component } from "react";
+import { DeletionStatusFilter } from "./filters";
+import { SearchBar, Sort } from "react-searchkit";
+import { Grid } from "semantic-ui-react";
+
+export class RecordSearchLayout extends Component {
+  render() {
+    const { config, appName } = this.props;
+    return (
+      <>
+        {/* auto column grid used instead of SUI grid for better searchbar width adjustment */}
+        <div className="auto-column-grid triple">
+          <div className="flex column-mobile">
+            <div className="mobile only rel-mb-1 flex align-items-center justify-space-between">
+              <DeletionStatusFilter keepFiltersOnUpdate />
+            </div>
+
+            <div className="tablet only computer only rel-mr-2">
+              <DeletionStatusFilter keepFiltersOnUpdate />
+            </div>
+          </div>
+          <div className="full-width">
+            <SearchBar fluid />
+          </div>
+
+          <div className="flex align-items-center column-mobile">
+            <div className="full-width flex align-items-center justify-end column-mobile">
+              {/*<SearchFilters customFilters={customFilters} />*/}
+              <Sort values={config.sortOptions} />
+            </div>
+          </div>
+        </div>
+        <div className="rel-mb-1">
+          {/*<FilterLabels ignoreFilters={["is_open"]} />*/}
+        </div>
+        <Grid>
+          <Grid.Column
+            computer={4}
+            mobile={16}
+            tablet={16}
+            largeScreen={2}
+            widescreen={2}
+          >
+            <SearchFacets aggs={config.aggs} appName={appName} />
+          </Grid.Column>
+          <Grid.Column
+            mobile={16}
+            tablet={16}
+            computer={12}
+            largeScreen={14}
+            widescreen={14}
+          >
+            <SearchAppResultsPane
+              layoutOptions={config.layoutOptions}
+              appName={appName}
+            />
+          </Grid.Column>
+        </Grid>
+      </>
+    );
+  }
+}
+
+RecordSearchLayout.propTypes = {
+  config: PropTypes.object.isRequired,
+  appName: PropTypes.string,
+};
+
+RecordSearchLayout.defaultProps = {
+  appName: "",
+};
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/search/filters/DeletionStatusFilter.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/search/filters/DeletionStatusFilter.js
new file mode 100644
index 000000000..66d3a8417
--- /dev/null
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/search/filters/DeletionStatusFilter.js
@@ -0,0 +1,115 @@
+/*
+ * // This file is part of Invenio-Communities
+ * // Copyright (C) 2023 CERN.
+ * //
+ * // Invenio-Communities is free software; you can redistribute it and/or modify it
+ * // under the terms of the MIT License; see LICENSE file for more details.
+ */
+
+import { i18next } from "@translations/invenio_requests/i18next";
+import PropTypes from "prop-types";
+import React, { Component } from "react";
+import { withState } from "react-searchkit";
+import { Button } from "semantic-ui-react";
+
+class DeletionStatusFilterComponent extends Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      selected: "P",
+    };
+  }
+
+  componentDidMount() {
+    const { currentQueryState } = this.props;
+    const userSelectionFilters = currentQueryState.filters;
+    const openFilter = userSelectionFilters.find((obj) => obj.includes("status"));
+    if (openFilter) {
+      // eslint-disable-next-line react/no-did-mount-set-state
+      this.setState({
+        selected: openFilter[1],
+      });
+    }
+  }
+
+  /**
+   * Updates queryFilters based on selection and removing previous filters
+   * @param {string} selectedFilter indicates which button was clicked
+   * @param {string} value true if open requests and false if closed requests
+   */
+  filterRecords = (value = "P") => {
+    const { currentQueryState, updateQueryState, keepFiltersOnUpdate } = this.props;
+    const { selected } = this.state;
+
+    if (selected === value) {
+      return;
+    } else {
+      // remove other filters on change
+      currentQueryState.filters = [];
+    }
+    this.setState({
+      selected: value,
+    });
+
+    currentQueryState.filters = keepFiltersOnUpdate
+      ? currentQueryState.filters.filter((element) => element[0] !== "status")
+      : [];
+
+    currentQueryState.filters.push(["status", value]);
+    updateQueryState(currentQueryState);
+  };
+
+  retrievePublished = () => {
+    this.filterRecords("P");
+  };
+
+  retrieveDeleted = () => {
+    this.filterRecords("D");
+  };
+
+  retrieveMarked = () => {
+    this.filterRecords("X");
+  };
+
+  render() {
+    const { selected } = this.state;
+    return (
+      <Button.Group basic>
+        <Button
+          className="record-search-filter"
+          onClick={this.retrievePublished}
+          active={selected === "P"}
+        >
+          {i18next.t("Published")}
+        </Button>
+        <Button
+          className="record-search-filter"
+          onClick={this.retrieveDeleted}
+          active={selected === "D"}
+        >
+          {i18next.t("Deleted")}
+        </Button>
+        <Button
+          className="record-search-filter"
+          onClick={this.retrieveMarked}
+          active={selected === "X"}
+        >
+          {i18next.t("Scheduled for purge")}
+        </Button>
+      </Button.Group>
+    );
+  }
+}
+
+DeletionStatusFilterComponent.propTypes = {
+  updateQueryState: PropTypes.func.isRequired,
+  currentQueryState: PropTypes.object.isRequired,
+  keepFiltersOnUpdate: PropTypes.bool,
+};
+
+DeletionStatusFilterComponent.defaultProps = {
+  keepFiltersOnUpdate: false,
+};
+
+export const DeletionStatusFilter = withState(DeletionStatusFilterComponent);
diff --git a/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/search/filters/index.js b/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/search/filters/index.js
new file mode 100644
index 000000000..c9eaf304b
--- /dev/null
+++ b/invenio_communities/assets/semantic-ui/js/invenio_communities/administration/search/filters/index.js
@@ -0,0 +1,9 @@
+/*
+ * // This file is part of Invenio-App-Rdm
+ * // Copyright (C) 2023 CERN.
+ * //
+ * // Invenio-App-Rdm is free software; you can redistribute it and/or modify it
+ * // under the terms of the MIT License; see LICENSE file for more details.
+ */
+
+export { DeletionStatusFilter } from "./DeletionStatusFilter";
diff --git a/invenio_communities/communities/records/systemfields/deletion_status.py b/invenio_communities/communities/records/systemfields/deletion_status.py
index 0165b0eda..4fce924ae 100644
--- a/invenio_communities/communities/records/systemfields/deletion_status.py
+++ b/invenio_communities/communities/records/systemfields/deletion_status.py
@@ -109,6 +109,9 @@ def pre_commit(self, record):
     def pre_dump(self, record, data, **kwargs):
         """Dump the deletion status information."""
         status = CommunityDeletionStatus(record.model.deletion_status)
+        # mitigation of deletion_status.is_deleted missing from the mapping
+        # currently it is a string
+        # don't confuse with record.model.is_deleted!
         data["is_deleted"] = status.is_deleted
         data["deletion_status"] = status.status
 
@@ -116,5 +119,8 @@ def post_load(self, record, data, **kwargs):
         """After loading, set the deletion status."""
         deletion_status = data.get("deletion_status", None)
         self.__set__(record, deletion_status)
+        # mitigation of deletion_status.is_deleted missing from the mapping
+        # currently it is a string
+        # don't confuse with record.model.is_deleted!
         record.pop("is_deleted", None)
         record.pop("deletion_status", None)
diff --git a/invenio_communities/communities/resources/args.py b/invenio_communities/communities/resources/args.py
new file mode 100644
index 000000000..d7f679aed
--- /dev/null
+++ b/invenio_communities/communities/resources/args.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2023 CERN.
+#
+# Invenio-Communities is free software; you can redistribute it and/or
+# modify it under the terms of the MIT License; see LICENSE file for more
+# details.
+
+"""Schemas for parameter parsing."""
+
+
+from invenio_records_resources.resources.records.args import SearchRequestArgsSchema
+from marshmallow import fields
+
+
+class CommunitiesSearchRequestArgsSchema(SearchRequestArgsSchema):
+    """Extend schema with CSL fields."""
+
+    status = fields.Str()
+    include_deleted = fields.Bool()
diff --git a/invenio_communities/communities/resources/config.py b/invenio_communities/communities/resources/config.py
index fe093e143..e9a21cde1 100644
--- a/invenio_communities/communities/resources/config.py
+++ b/invenio_communities/communities/resources/config.py
@@ -21,6 +21,9 @@
 from invenio_records_resources.services.base.config import ConfiguratorMixin, FromConfig
 from invenio_requests.resources.requests.config import RequestSearchRequestArgsSchema
 
+from invenio_communities.communities.resources.args import (
+    CommunitiesSearchRequestArgsSchema,
+)
 from invenio_communities.communities.resources.serializer import (
     UICommunityJSONSerializer,
 )
@@ -60,12 +63,8 @@
         ),
         CommunityDeletedError: create_error_handler(
             lambda e: (
-                HTTPJSONException(code=404, description=_("Community not found"))
-                if not e.community.tombstone.is_visible
-                else HTTPJSONException(
-                    code=410,
-                    description=_("Community deleted"),
-                    tombstone=e.community.tombstone.dump(),
+                HTTPJSONException(
+                    code=410, description=_("The record has been deleted.")
                 )
             )
         ),
@@ -89,8 +88,11 @@ class CommunityResourceConfig(RecordResourceConfig, ConfiguratorMixin):
         "featured-item": "/communities/<pid_value>/featured/<featured_id>",
         "user-communities": "/user/communities",
         "community-requests": "/communities/<pid_value>/requests",
+        "restore-community": "/communities/<pid_value>/restore",
     }
 
+    request_search_args = CommunitiesSearchRequestArgsSchema
+
     request_view_args = {
         **RecordResourceConfig.request_view_args,
         "featured_id": ma.fields.Int(),
diff --git a/invenio_communities/communities/resources/resource.py b/invenio_communities/communities/resources/resource.py
index c1938088a..0e014d491 100644
--- a/invenio_communities/communities/resources/resource.py
+++ b/invenio_communities/communities/resources/resource.py
@@ -59,6 +59,7 @@ def create_url_rules(self):
             route("PUT", routes["featured-item"], self.featured_update),
             route("DELETE", routes["featured-item"], self.featured_delete),
             route("GET", routes["community-requests"], self.search_community_requests),
+            route("POST", routes["restore-community"], self.restore_community),
         ]
 
     @request_search_args
@@ -136,6 +137,36 @@ def update_logo(self):
         )
         return item.to_dict(), 200
 
+    #
+    # Deletion workflows
+    #
+    @request_headers
+    @request_view_args
+    @request_data
+    def delete(self):
+        """Read the related review request."""
+        self.service.delete_community(
+            g.identity,
+            resource_requestctx.view_args["pid_value"],
+            resource_requestctx.data,
+            revision_id=resource_requestctx.headers.get("if_match"),
+        )
+
+        return "", 204
+
+    @request_headers
+    @request_view_args
+    @request_data
+    def restore_community(self):
+        """Read the related review request."""
+        item = self.service.restore_community(
+            g.identity,
+            resource_requestctx.view_args["pid_value"],
+            resource_requestctx.data,
+        )
+
+        return item.to_dict(), 200
+
     @request_view_args
     def delete_logo(self):
         """Delete logo."""
diff --git a/invenio_communities/communities/services/components.py b/invenio_communities/communities/services/components.py
index 49247942e..14e9e7d6e 100644
--- a/invenio_communities/communities/services/components.py
+++ b/invenio_communities/communities/services/components.py
@@ -237,7 +237,7 @@ def update(self, identity, data=None, record=None, **kwargs):
 class CommunityDeletionComponent(ServiceComponent):
     """Service component for record deletion."""
 
-    def delete_community(self, identity, data=None, record=None, **kwargs):
+    def delete(self, identity, data=None, record=None, **kwargs):
         """Set the community's deletion status and tombstone information."""
         # Set the record's deletion status and tombstone information
         record.deletion_status = CommunityDeletionStatusEnum.DELETED
@@ -250,23 +250,19 @@ def update_tombstone(self, identity, data=None, record=None, **kwargs):
         """Update the community's tombstone information."""
         record.tombstone = data
 
-    def restore_community(self, identity, data=None, record=None, **kwargs):
+    def restore(self, identity, data=None, record=None, **kwargs):
         """Reset the community's deletion status and tombstone information."""
         record.deletion_status = CommunityDeletionStatusEnum.PUBLISHED
 
         # Remove the tombstone information
         record.tombstone = None
 
-        # Set a record to 'metadata only' if its files got cleaned up
-        if not record.files.entries:
-            record.files.enabled = False
-
-    def mark_community(self, identity, data=None, record=None, **kwargs):
+    def mark(self, identity, data=None, record=None, **kwargs):
         """Mark the community for purge."""
         record.deletion_status = CommunityDeletionStatusEnum.MARKED
         record.tombstone = record.tombstone
 
-    def unmark_community(self, identity, data=None, record=None, **kwargs):
+    def unmark(self, identity, data=None, record=None, **kwargs):
         """Unmark the community for purge, resetting it to soft-deleted state."""
         record.deletion_status = CommunityDeletionStatusEnum.DELETED
         record.tombstone = record.tombstone
diff --git a/invenio_communities/communities/services/config.py b/invenio_communities/communities/services/config.py
index 0b0516f74..08b361858 100644
--- a/invenio_communities/communities/services/config.py
+++ b/invenio_communities/communities/services/config.py
@@ -43,6 +43,7 @@
 from ..schema import CommunityFeaturedSchema, CommunitySchema, TombstoneSchema
 from .components import DefaultCommunityComponents
 from .links import CommunityLink
+from .search_params import IncludeDeletedCommunitiesParam, StatusParam
 from .sort import CommunitiesSortParam
 
 
@@ -66,6 +67,8 @@ class SearchOptions(SearchOptionsBase, SearchOptionsMixin):
         PaginationParam,
         CommunitiesSortParam,
         FacetsParam,
+        StatusParam,
+        IncludeDeletedCommunitiesParam,
     ]
 
 
diff --git a/invenio_communities/communities/services/search_params.py b/invenio_communities/communities/services/search_params.py
new file mode 100644
index 000000000..8a759167d
--- /dev/null
+++ b/invenio_communities/communities/services/search_params.py
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+#
+# This file is part of Invenio.
+# Copyright (C) 2023 CERN.
+#
+# Invenio is free software; you can redistribute it and/or modify it
+# under the terms of the MIT License; see LICENSE file for more details.
+
+"""Invenio Communities search params module."""
+from invenio_records_resources.services.records.params import ParamInterpreter
+
+from invenio_communities.communities.records.systemfields.deletion_status import (
+    CommunityDeletionStatusEnum,
+)
+
+
+class StatusParam(ParamInterpreter):
+    """Evaluates the 'status' parameter."""
+
+    def apply(self, identity, search, params):
+        """Evaluate the status parameter on the search."""
+        value = params.pop("status", None)
+        if value is not None and value in [
+            x.value for x in CommunityDeletionStatusEnum
+        ]:
+            search = search.filter("term", **{"deletion_status": value})
+        return search
+
+
+class IncludeDeletedCommunitiesParam(ParamInterpreter):
+    """Evaluates the include_deleted parameter."""
+
+    def apply(self, identity, search, params):
+        """Evaluate the include_deleted parameter on the search."""
+        value = params.pop("include_deleted", None)
+        # Filter prevents from displaying deleted records on main site search
+        # deleted records should appear only in admins panel
+        if value is None:
+            search = search.filter(
+                "term",
+                **{"deletion_status": CommunityDeletionStatusEnum.PUBLISHED.value}
+            )
+        return search
diff --git a/invenio_communities/communities/services/service.py b/invenio_communities/communities/services/service.py
index a9bbb19d8..98f6461b5 100644
--- a/invenio_communities/communities/services/service.py
+++ b/invenio_communities/communities/services/service.py
@@ -101,23 +101,6 @@ def expandable_fields(self):
             EntityResolverExpandableField("receiver"),
         ]
 
-    def delete(self, identity, id_, revision_id=None):
-        """Delete a record from database and search indexes."""
-        # we assert that record exists
-        # when calling super() the method will resolve again the record. We take that
-        # compromisation as not resolving it here results to a permission error instead
-        # of not-found
-        record = self.record_cls.pid.resolve(id_)
-
-        # check if requests are open
-        requests = self.search_community_requests(
-            identity, record.id, {"is_open": True}
-        )
-        if len(requests) > 0:
-            raise OpenRequestsForCommunityDeletionError(len(requests))
-
-        return super().delete(identity, record.id, revision_id)
-
     def search_user_communities(
         self, identity, params=None, search_preference=None, extra_filter=None, **kwargs
     ):
@@ -128,16 +111,22 @@ def search_user_communities(
         params = params or {}
 
         current_user_filter = CommunityMembers().query_filter(identity)
+        undeleted_filter = dsl.Q(
+            "term", **{"deletion_status": CommunityDeletionStatusEnum.PUBLISHED.value}
+        )
+
+        search_filter = current_user_filter & undeleted_filter
+
         if extra_filter:
-            current_user_filter = current_user_filter & extra_filter
+            search_filter &= extra_filter
 
         search_result = self._search(
             "search",
             identity,
             params,
             search_preference,
-            permission_action=None,
-            extra_filter=current_user_filter,
+            extra_filter=search_filter,
+            permission_action="read",
             **kwargs,
         ).execute()
 
@@ -463,18 +452,28 @@ def featured_delete(
     # Deletion workflows
     #
     @unit_of_work()
-    def delete_community(self, identity, id_, data, expand=False, uow=None):
+    def delete_community(
+        self, identity, id_, data=None, revision_id=None, expand=False, uow=None
+    ):
         """(Soft) delete a published community."""
         record = self.record_cls.pid.resolve(id_)
+        # Check permissions
+        self.require_permission(identity, "delete", record=record)
+        self.check_revision_id(record, revision_id)
+
         if record.deletion_status.is_deleted:
             raise DeletionStatusError(record, CommunityDeletionStatusEnum.PUBLISHED)
 
-        # Check permissions
-        self.require_permission(identity, "delete", record=record)
+        # check if requests are open
+        requests = self.search_community_requests(
+            identity, record.id, {"is_open": True}
+        )
+        if len(requests) > 0:
+            raise OpenRequestsForCommunityDeletionError(len(requests))
 
         # Load tombstone data with the schema
         data, errors = self.schema_tombstone.load(
-            data,
+            data or {},
             context={
                 "identity": identity,
                 "pid": record.pid,
@@ -484,9 +483,7 @@ def delete_community(self, identity, id_, data, expand=False, uow=None):
         )
 
         # Run components
-        self.run_components(
-            "delete_community", identity, data=data, record=record, uow=uow
-        )
+        self.run_components("delete", identity, data=data, record=record, uow=uow)
 
         # Commit and reindex record
         uow.register(RecordCommitOp(record, indexer=self.indexer))
@@ -500,6 +497,15 @@ def delete_community(self, identity, id_, data, expand=False, uow=None):
             expand=expand,
         )
 
+    @unit_of_work()
+    def delete(
+        self, identity, id_, data=None, expand=False, revision_id=None, uow=None
+    ):
+        """Alias for ``delete_community()``."""
+        return self.delete_community(
+            identity, id_, data, revision_id=revision_id, expand=expand, uow=uow
+        )
+
     @unit_of_work()
     def update_tombstone(self, identity, id_, data, expand=False, uow=None):
         """Update the tombstone information for the (soft) deleted community."""
@@ -550,7 +556,7 @@ def restore_community(self, identity, id_, expand=False, uow=None):
         self.require_permission(identity, "delete", record=record)
 
         # Run components
-        self.run_components("restore_community", identity, record=record, uow=uow)
+        self.run_components("restore", identity, record=record, uow=uow)
 
         # Commit and reindex record
         uow.register(RecordCommitOp(record, indexer=self.indexer))
@@ -575,7 +581,7 @@ def mark_community_for_purge(self, identity, id_, expand=False, uow=None):
         self.require_permission(identity, "purge", record=record)
 
         # Run components
-        self.run_components("mark_community", identity, record=record, uow=uow)
+        self.run_components("mark", identity, record=record, uow=uow)
 
         # Commit and reindex record
         uow.register(RecordCommitOp(record, indexer=self.indexer))
@@ -600,7 +606,7 @@ def unmark_community_for_purge(self, identity, id_, expand=False, uow=None):
         self.require_permission(identity, "purge", record=record)
 
         # Run components
-        self.run_components("unmark_community", identity, record=record, uow=uow)
+        self.run_components("unmark", identity, record=record, uow=uow)
 
         # Commit and reindex the record
         uow.register(RecordCommitOp(record, indexer=self.indexer))
@@ -635,76 +641,61 @@ def search(
         extra_filter=None,
         **kwargs,
     ):
-        """Search for active communities matching the querystring."""
-        status = CommunityDeletionStatusEnum.PUBLISHED.value
-        search_filter = dsl.Q("term", **{"deletion_status": status})
-        if extra_filter:
-            search_filter = search_filter & extra_filter
-
+        """Search for published communities matching the querystring."""
         return super().search(
             identity,
             params,
             search_preference,
             expand,
-            extra_filter=search_filter,
+            extra_filter=extra_filter,
+            # injects deleted records when user is permitted to see them
+            permission_action="read_deleted",
             **kwargs,
         )
 
-    def search_all(
-        self,
-        identity,
-        params=None,
-        search_preference=None,
-        expand=False,
-        extra_filter=None,
-        **kwargs,
-    ):
-        """Search for all (active and deleted) communities matching the querystring."""
-        self.require_permission(identity, "search_all")
-
-        # exclude drafts filter (drafts have no deletion status)
-        search_filter = dsl.Q(
-            "terms",
-            **{"deletion_status": [v.value for v in CommunityDeletionStatusEnum]},
-        )
-        if extra_filter:
-            search_filter &= extra_filter
-        search_result = self._search(
-            "search_all",
-            identity,
-            params,
-            search_preference,
-            record_cls=self.draft_cls,
-            search_opts=self.config.search_all,
-            extra_filter=search_filter,
-            permission_action="read",  # TODO this probably should be read_deleted
-            **kwargs,
-        ).execute()
-
-        return self.result_list(
-            self,
-            identity,
-            search_result,
-            params,
-            links_tpl=LinksTemplate(self.config.links_search, context={"args": params}),
-            links_item_tpl=self.links_item_tpl,
-            expandable_fields=self.expandable_fields,
-            expand=expand,
-        )
-
     #
     # Base methods, extended with handling of deleted records
     #
-    def read(self, identity, id_, expand=False, with_deleted=False):
+    def read(self, identity, id_, expand=False, include_deleted=False):
         """Retrieve a record."""
         record = self.record_cls.pid.resolve(id_)
         result = super().read(identity, id_, expand=expand)
 
-        if record.deletion_status.is_deleted and not with_deleted:
+        if not include_deleted and record.deletion_status.is_deleted:
             raise CommunityDeletedError(record, result_item=result)
+        if include_deleted and record.deletion_status.is_deleted:
+            can_read_deleted = self.check_permission(
+                identity, "read_deleted", record=record
+            )
+
+            if not can_read_deleted:
+                # displays tombstone
+                raise CommunityDeletedError(record, result_item=result)
 
         return result
 
+    @unit_of_work()
+    def update(self, identity, id_, data, revision_id=None, uow=None, expand=False):
+        """Replace a record."""
+        record = self.record_cls.pid.resolve(id_)
+
+        if record.deletion_status.is_deleted:
+            raise CommunityDeletedError(
+                record,
+                result_item=self.result_item(
+                    self,
+                    identity,
+                    record,
+                    links_tpl=self.links_item_tpl,
+                    expandable_fields=self.expandable_fields,
+                    expand=expand,
+                ),
+            )
+
+        return super().update(
+            identity, id_, data, revision_id=revision_id, uow=uow, expand=expand
+        )
+
     #
     # notification handlers
     #
diff --git a/invenio_communities/generators.py b/invenio_communities/generators.py
index f2c1f7526..af72a499a 100644
--- a/invenio_communities/generators.py
+++ b/invenio_communities/generators.py
@@ -22,6 +22,9 @@
 from invenio_records_permissions.generators import ConditionalGenerator, Generator
 from invenio_search.engine import dsl
 
+from .communities.records.systemfields.deletion_status import (
+    CommunityDeletionStatusEnum,
+)
 from .proxies import current_roles
 
 _Need = namedtuple("Need", ["method", "value", "role"])
@@ -142,17 +145,56 @@ def __init__(self, field, then_, else_):
         )
 
 
-class IfDeleted(ConditionalGenerator):
+class IfCommunityDeleted(Generator):
     """Conditional generator for deleted communities."""
 
-    def _condition(self, record=None, **kwargs):
-        """Check if the community is deleted."""
-        try:
-            return record.deletion_status.is_deleted
+    def __init__(self, then_, else_):
+        """Constructor."""
+        self.then_ = then_
+        self.else_ = else_
+
+    def generators(self, record):
+        """Get the "then" or "else" generators."""
+        if record is None:
+            # if no records, we assume it returns standard else response
+            return self.else_
+
+        is_deleted = record.deletion_status.is_deleted
+        return self.then_ if is_deleted else self.else_
+
+    def needs(self, record=None, **kwargs):
+        """Set of Needs granting permission."""
+        needs = [g.needs(record=record, **kwargs) for g in self.generators(record)]
+        return set(chain.from_iterable(needs))
+
+    def excludes(self, record=None, **kwargs):
+        """Set of Needs denying permission."""
+        needs = [g.excludes(record=record, **kwargs) for g in self.generators(record)]
+        return set(chain.from_iterable(needs))
 
-        except AttributeError:
-            # if the community doesn't have the attribute, we assume it's not deleted
-            return False
+    def make_query(self, generators, **kwargs):
+        """Make a query for one set of generators."""
+        queries = [g.query_filter(**kwargs) for g in generators]
+        queries = [q for q in queries if q]
+        return reduce(operator.or_, queries) if queries else None
+
+    def query_filter(self, **kwargs):
+        """Filters for current identity."""
+        q_then = dsl.Q("match_all")
+        q_else = dsl.Q(
+            "term", **{"deletion_status": CommunityDeletionStatusEnum.PUBLISHED.value}
+        )
+        then_query = self.make_query(self.then_, **kwargs)
+        else_query = self.make_query(self.else_, **kwargs)
+
+        if then_query and else_query:
+            return (q_then & then_query) | (q_else & else_query)
+        elif then_query:
+            return (q_then & then_query) | q_else
+        elif else_query:
+            return q_else & else_query
+        else:
+            return q_else
 
 
 #
diff --git a/invenio_communities/members/resources/config.py b/invenio_communities/members/resources/config.py
index 009e9dd05..8e63d54df 100644
--- a/invenio_communities/members/resources/config.py
+++ b/invenio_communities/members/resources/config.py
@@ -50,12 +50,8 @@ class MemberResourceConfig(RecordResourceConfig):
         ),
         CommunityDeletedError: create_error_handler(
             lambda e: (
-                HTTPJSONException(code=404, description=_("Community not found"))
-                if not e.community.tombstone.is_visible
-                else HTTPJSONException(
-                    code=410,
-                    description=_("Community deleted"),
-                    tombstone=e.community.tombstone.dump(),
+                HTTPJSONException(
+                    code=410, description=_("The record has been deleted.")
                 )
             )
         ),
diff --git a/invenio_communities/permissions.py b/invenio_communities/permissions.py
index 2e4b07426..6bf3059f7 100644
--- a/invenio_communities/permissions.py
+++ b/invenio_communities/permissions.py
@@ -20,6 +20,7 @@
     SystemProcess,
 )
 from invenio_records_permissions.policies import BasePermissionPolicy
+from invenio_users_resources.services.permissions import UserManager
 
 from .generators import (
     AllowedMemberTypes,
@@ -30,7 +31,7 @@
     CommunityOwners,
     CommunitySelfMember,
     GroupsEnabled,
-    IfDeleted,
+    IfCommunityDeleted,
     IfPolicyClosed,
     IfRestricted,
 )
@@ -48,10 +49,15 @@ class CommunityPermissionPolicy(BasePermissionPolicy):
         SystemProcess(),
     ]
 
-    can_update = [
-        IfDeleted(then_=[Disable()], else_=[CommunityOwners(), SystemProcess()])
+    # Used for search filtering of deleted records
+    # cannot be implemented inside can_read - otherwise permission will
+    # kick in before tombstone renders
+    can_read_deleted = [
+        IfCommunityDeleted(then_=[UserManager, SystemProcess()], else_=can_read)
     ]
 
+    can_update = [CommunityOwners(), SystemProcess()]
+
     can_delete = [CommunityOwners(), SystemProcess()]
 
     can_purge = [CommunityOwners(), SystemProcess()]
diff --git a/invenio_communities/requests/user_moderation/actions.py b/invenio_communities/requests/user_moderation/actions.py
index 48c429ac5..0519d8d4b 100644
--- a/invenio_communities/requests/user_moderation/actions.py
+++ b/invenio_communities/requests/user_moderation/actions.py
@@ -1,26 +1,114 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2023 CERN.
+# Copyright (C) 2023 TU Wien.
 #
 # Invenio-communities is free software; you can redistribute it and/or modify
 # it under the terms of the MIT License; see LICENSE file for more details.
 """Communities user moderation actions."""
 
+from collections import defaultdict
+
 from invenio_access.permissions import Identity, system_identity
-from invenio_records_resources.services.uow import RecordIndexOp, unit_of_work
+from invenio_i18n import lazy_gettext as _
+from invenio_pidstore.errors import PIDDoesNotExistError
 from invenio_search.engine import dsl
+from invenio_vocabularies.proxies import current_service as vocab_service
 
+from invenio_communities.communities.records.systemfields.deletion_status import (
+    CommunityDeletionStatusEnum,
+)
 from invenio_communities.proxies import current_communities
 
 
+def _get_communities_for_user(user_id):
+    """Helper function for getting all communities with the user as the sole owner.
+
+    Note: This function performs DB queries yielding all communities with the given
+    user as the sole owner (which is not hard-limited in the system) and performs
+    service calls on each of them. Thus, this function has the potential of being a very
+    heavy operation, and should not be called as part of the handling of an
+    HTTP request!
+    """
+    comm_cls = current_communities.service.record_cls
+    comm_model_cls = comm_cls.model_cls
+    mem_cls = current_communities.service.members.record_cls
+    mem_model_cls = mem_cls.model_cls
+
+    # collect the owners for each community
+    comm_owners = defaultdict(list)
+    for comm_owner in [
+        mem_cls(m.data, model=m)
+        for m in mem_model_cls.query.filter(mem_model_cls.role == "owner").all()
+    ]:
+        comm_owners[comm_owner.community_id].append(comm_owner)
+
+    # filter for communities that are owned solely by the user in question
+    relevant_comm_ids = [
+        comm_id
+        for comm_id, owners in comm_owners.items()
+        if len(owners) == 1 and str(owners[0].user_id) == user_id
+    ]
+
+    # resolve the communities in question
+    communities = [
+        comm_cls(m.data, model=m)
+        for m in comm_model_cls.query.filter(
+            comm_model_cls.id.in_(relevant_comm_ids)
+        ).all()
+    ]
+
+    return communities
+
+
 def on_block(user_id, uow=None, **kwargs):
-    """Removes communities that belong to a user."""
-    pass
+    """Removes records that belong to a user.
+
+    Note: This function operates on all records of a user and thus has the potential
+    to be a very heavy operation! Thus it should not be called as part of the handling
+    of an HTTP request!
+    """
+    user_id = str(user_id)
+    tombstone_data = {"note": _("User was blocked")}
+
+    # set the removal reason if the vocabulary item exists
+    try:
+        removal_reason_id = kwargs.get("removal_reason_id", "misconduct")
+        vocab = vocab_service.read(
+            identity=system_identity, id_=("removalreasons", removal_reason_id)
+        )
+        tombstone_data["removal_reason"] = {"id": vocab.id}
+    except PIDDoesNotExistError:
+        pass
+
+    # soft-delete all the communities of that user (only if they are the only owner)
+    for comm in _get_communities_for_user(user_id):
+        if not comm.deletion_status.is_deleted:
+            current_communities.service.delete_community(
+                system_identity,
+                comm.pid.pid_value,
+                tombstone_data,
+                uow=uow,
+            )
 
 
 def on_restore(user_id, uow=None, **kwargs):
-    """Restores communities that belong to a user."""
-    pass
+    """Restores records that belong to a user.
+
+    Note: This function operates on all records of a user and thus has the potential
+    to be a very heavy operation! Thus it should not be called as part of the handling
+    of an HTTP request!
+    """
+    user_id = str(user_id)
+
+    # restore all the deleted records of that user
+    for comm in _get_communities_for_user(user_id):
+        if comm.deletion_status == CommunityDeletionStatusEnum.DELETED:
+            current_communities.service.restore_community(
+                system_identity,
+                comm.pid.pid_value,
+                uow=uow,
+            )
 
 
 def on_approve(user_id, uow=None, **kwargs):
diff --git a/invenio_communities/templates/semantic-ui/invenio_communities/tombstone.html b/invenio_communities/templates/semantic-ui/invenio_communities/tombstone.html
index 91254e245..ecf2d30ed 100644
--- a/invenio_communities/templates/semantic-ui/invenio_communities/tombstone.html
+++ b/invenio_communities/templates/semantic-ui/invenio_communities/tombstone.html
@@ -1,27 +1,52 @@
-{# -*- coding: utf-8 -*-
+{#
+  Copyright (C) 2023 CERN.
+  Copyright (C) 2023 TU Wien.
 
-  This file is part of Invenio.
-  Copyright (C) 2016-2020 CERN.
-
-  Invenio is free software; you can redistribute it and/or modify it
+  Invenio App RDM is free software; you can redistribute it and/or modify it
   under the terms of the MIT License; see LICENSE file for more details.
 #}
-
 {% extends config.THEME_ERROR_TEMPLATE %}
 
 {%- set title = _("Tombstone") + " | " + config.THEME_SITENAME -%}
+{%- set removal_reason = _("Reason unknown") %}
+{%- if record.ui.tombstone.removal_reason %}
+  {%- set removal_reason = record.ui.tombstone.removal_reason.title_l10n %}
+{%- endif %}
+
+{%- block message %}
+<div class="container centered rel-pt-2">
+  <h1 class="ui header inline-block">
+    <i class="icon lightning" aria-hidden="true"></i>
+    <div class="content pl-0 rel-pr-1">
+      {{ _('Gone') }}
+    </div>
+  </h1>
 
-{% block message %}
-  <h1><i class="fa fa-flash"></i> {{_('Gone')}}</h1>
-  <p>
-  {% trans sitename=config.THEME_SITENAME %}
-    The community you are trying to access was removed from {{sitename}}. The
-    metadata of the community is kept for archival purposes.
-  {% endtrans %}
-  </p>
-  {% if community and community.removal_reason %}
   <p>
-    <strong>Reason for removal:</strong> {{community.removal_reason}}
+    {%- trans sitename=config.THEME_SITENAME %}
+      The record  you are trying to access was removed from {{ sitename }}. The
+      metadata of the record is kept for archival purposes.
+    {%- endtrans %}
   </p>
-  {% endif %}
+
+  <div class="ui message compact text-align-left">
+    <div class="content">
+      <p>
+        <strong>{{ _("Reason for removal:") }}</strong> {{ removal_reason }}
+      </p>
+      <p>
+        <strong>{{ _("Removed by:") }}</strong> {{ record.ui.tombstone.removed_by }}
+      </p>
+      {%- if record.ui.tombstone.note %}
+      <p>
+        <strong>{{ _("Removal note:") }}</strong> {{ record.ui.tombstone.note }}
+      </p>
+      {%- endif %}
+      <p>
+        <strong>{{ _("Date of removal:") }}</strong> {{ record.ui.tombstone.removal_date_l10n_long }}
+      </p>
+    </div>
+
+  </div>
+</div>
 {% endblock message %}
diff --git a/invenio_communities/views/ui.py b/invenio_communities/views/ui.py
index 590eaa2a6..028932d11 100644
--- a/invenio_communities/views/ui.py
+++ b/invenio_communities/views/ui.py
@@ -21,6 +21,7 @@
 
 from invenio_communities.proxies import current_communities
 
+from ..errors import CommunityDeletedError
 from ..searchapp import search_app_context
 from .communities import (
     communities_about,
@@ -215,6 +216,7 @@ def register_menus():
     blueprint.register_error_handler(
         PermissionDeniedError, record_permission_denied_error
     )
+    blueprint.register_error_handler(CommunityDeletedError, record_tombstone_error)
     blueprint.register_error_handler(PIDDeletedError, record_tombstone_error)
     blueprint.register_error_handler(PIDDoesNotExistError, not_found_error)
 
diff --git a/run-js-linter.sh b/run-js-linter.sh
index b93e4b127..c2203362c 100755
--- a/run-js-linter.sh
+++ b/run-js-linter.sh
@@ -19,6 +19,9 @@ for arg in $@; do
 	case ${arg} in
 		-i|--install)
 			npm install --no-save --no-package-lock @inveniosoftware/eslint-config-invenio@^2.0.0;;
+	  -f|--fix)
+	    printf "${GREEN}Run eslint${NC}\n";
+      npx eslint -c .eslintrc.yml invenio_communities/**/*.js --fix;;
 		*)
 			printf "Argument ${RED}$arg${NC} not supported\n"
 			exit;;
diff --git a/tests/communities/test_resources.py b/tests/communities/test_resources.py
index 70217a4ae..c3444fe5e 100644
--- a/tests/communities/test_resources.py
+++ b/tests/communities/test_resources.py
@@ -501,7 +501,7 @@ def test_simple_put_response(
     # Update deleted community
     res = client.delete(f"/communities/{id_}", headers=headers)
     assert res.status_code == 204
-    data["metadata"]["title"] = ("Deleted community",)
+    data["metadata"]["title"] = "Deleted community"
     res = client.put(f"/communities/{id_}", headers=headers, json=data)
     assert res.status_code == 410
     assert res.json["message"] == "The record has been deleted."
diff --git a/tests/communities/test_services.py b/tests/communities/test_services.py
index acdc671c8..85bbb58e5 100644
--- a/tests/communities/test_services.py
+++ b/tests/communities/test_services.py
@@ -414,9 +414,7 @@ def test_community_deletion(community_service, users, comm):
 
     # delete the community
     tombstone_info = {"note": "no specific reason, tbh"}
-    community = community_service.delete_community(
-        system_identity, community.id, tombstone_info
-    )
+    community = community_service.delete(system_identity, community.id, tombstone_info)
     tombstone = community._obj.tombstone
 
     # check if the tombstone information got added as expected
@@ -467,7 +465,7 @@ def test_invalid_community_deletion_workflows(community_service, comm):
     with pytest.raises(DeletionStatusError):
         community_service.unmark_community_for_purge(system_identity, comm.id)
 
-    comm = community_service.delete_community(system_identity, comm.id, {})
+    comm = community_service.delete(system_identity, comm.id, {})
     assert comm._obj.deletion_status == CommunityDeletionStatusEnum.DELETED
 
     # we cannot unmark a deleted community