diff --git a/izanami-frontend/src/App.css b/izanami-frontend/src/App.css
index dc9896bb6..22b1f6ba9 100644
--- a/izanami-frontend/src/App.css
+++ b/izanami-frontend/src/App.css
@@ -32,10 +32,10 @@ header .nav-link {
 }
 
 .feature-separator {
-  text-align: center;
+  margin-left: 24px;
   font-weight: bold;
-  margin-top: 8px;
-  margin-bottom: 8px;
+  margin-top: 4px;
+  margin-bottom: 4px;
 }
 
 .error-message {
diff --git a/izanami-frontend/src/components/ConditionInput.tsx b/izanami-frontend/src/components/ConditionInput.tsx
index 99fe22957..5264ead3e 100644
--- a/izanami-frontend/src/components/ConditionInput.tsx
+++ b/izanami-frontend/src/components/ConditionInput.tsx
@@ -1,28 +1,31 @@
 import * as React from "react";
 import {
   DAYS,
+  TClassicalCondition,
   TClassicalContextOverload,
   THourPeriod,
+  TValuedCondition,
   ValuedFeature,
 } from "../utils/types";
 import Select from "react-select";
 import CreatableSelect from "react-select/creatable";
 import { customStyles } from "../styles/reactSelect";
-import { Strategy } from "./FeatureTable";
+import { Rule, Strategy, Period as PeriodDetails } from "./FeatureTable";
 import { useEffect } from "react";
 import {
   useFieldArray,
   Controller,
   useFormContext,
   FieldErrors,
+  useWatch,
 } from "react-hook-form";
 import { format, parse, startOfDay } from "date-fns";
 import { DEFAULT_TIMEZONE, TimeZoneSelect } from "./TimeZoneSelect";
 import { ErrorDisplay } from "./FeatureForm";
 import { Tooltip } from "./Tooltip";
 
-export function ConditionsInput() {
-  const { control, watch } = useFormContext();
+export function ConditionsInput(props: { folded: boolean }) {
+  const { control, watch, getValues } = useFormContext();
 
   const { fields, append, remove } = useFieldArray({
     control,
@@ -30,37 +33,117 @@ export function ConditionsInput() {
   });
 
   const resultType = watch("resultType");
-
+  const conditions = watch("conditions");
   return (
     <>
-      {fields.map((condition, index) => (
-        <fieldset
-          className="mt-2 sub_container sub_container-bglighter anim__popUp"
-          key={`condition-${index}`}
-        >
-          <h5>
-            {resultType === "boolean"
-              ? "Activation condition"
-              : "Alternative value"}{" "}
-            #{index}{" "}
-            <button
-              className="btn btn-danger btn-sm m-2"
-              type="button"
-              onClick={() => {
-                remove(index);
-              }}
-            >
-              Delete
-            </button>
-          </h5>
-          <ConditionInput index={index} />
-        </fieldset>
-      ))}
+      {fields.length > 0 ? (
+        resultType === "boolean" ? (
+          <h5 className="mt-4">Activation conditions</h5>
+        ) : (
+          <h5 className="mt-4">Alternative values</h5>
+        )
+      ) : null}
+      {fields.map(({ id }, index) => {
+        const condition = conditions?.[index];
+        const emptyCondition =
+          Object.entries(condition).filter(([key, value]) => value !== "")
+            .length === 0;
+
+        return (
+          <div
+            className="accordion condition-accordion"
+            id={`${id}-accordion`}
+            key={id}
+          >
+            <div className="accordion-item mt-3">
+              <h3 className="accordion-header">
+                <button
+                  className={`accordion-button ${
+                    props.folded ? "collapsed" : ""
+                  }`}
+                  type="button"
+                  data-bs-toggle="collapse"
+                  data-bs-target={`#${id}-accordion-collapse`}
+                  aria-expanded={!props.folded}
+                  aria-controls={`${id}-accordion-collapse`}
+                >
+                  <div className="d-flex align-items-center justify-content-between w-100">
+                    <div className="d-flex flex-row align-items-center">
+                      <div>
+                        {resultType === "boolean" ? (
+                          <>
+                            <span className="fw-bold">
+                              Activation condition #{index}
+                            </span>
+                            {emptyCondition ? (
+                              <>&nbsp;{"<Empty condition>"}</>
+                            ) : (
+                              ""
+                            )}
+                          </>
+                        ) : emptyCondition ? (
+                          "<No value specified>"
+                        ) : (
+                          <>
+                            Alternative value{" "}
+                            <span className="fw-bold">{condition?.value}</span>
+                          </>
+                        )}
+                        &nbsp;
+                      </div>
+                      {condition && !emptyCondition ? (
+                        <>
+                          <ConditionSummary condition={condition} />
+                        </>
+                      ) : null}
+                    </div>
+                    <button
+                      className="btn btn-danger btn-sm"
+                      type="button"
+                      onClick={(e) => {
+                        remove(index);
+                      }}
+                    >
+                      Delete
+                    </button>
+                  </div>
+                </button>
+              </h3>
+              <div
+                className={`accordion-collapse collapse ${
+                  props.folded ? "" : "show"
+                }`}
+                aria-labelledby="headingOne"
+                data-bs-parent={`#${id}-accordion`}
+                id={`${id}-accordion-collapse`}
+              >
+                <div className="accordion-body">
+                  <ConditionInput index={index} />
+                </div>
+              </div>
+            </div>
+          </div>
+        );
+      })}
       <div className="d-flex align-items-center justify-content-end mb-2 ms-3 mt-3">
         <button
           className="btn btn-secondary btn-sm"
           type="button"
-          onClick={() => append({})}
+          onClick={() => {
+            append({});
+            // This is super dirty, however bootstrap accordion state is really hard to control programatically
+            // the need is to have existing accordions closed by default (on edition) but to have new one opened
+
+            if (props.folded) {
+              setTimeout(() => {
+                const buttons = document.querySelectorAll(
+                  "button.accordion-button"
+                );
+                const last = buttons?.[buttons.length - 1] as HTMLButtonElement;
+                last.click();
+              }, 0);
+            }
+          }}
         >
           {resultType === "boolean"
             ? fields.length > 0
@@ -90,6 +173,22 @@ export function ConditionsInput() {
   );
 }
 
+function ConditionSummary(props: { condition: TClassicalCondition }) {
+  const { period, rule } = props.condition;
+
+  return (
+    <div
+      className="d-flex flex-column border-start border-2"
+      style={{
+        paddingLeft: "8px",
+      }}
+    >
+      {period && <PeriodDetails period={period as any} />}
+      {rule && <Rule rule={rule} />}
+    </div>
+  );
+}
+
 function ConditionInput(props: { index: number }) {
   const [specificPeriods, setSpecificPeriods] = React.useState(false);
   const { index } = props;
@@ -129,7 +228,7 @@ function ConditionInput(props: { index: number }) {
         {resultType !== "boolean" && (
           <>
             <legend>
-              <h6>Result value</h6>
+              <h5>Result value</h5>
             </legend>
             <label className="mb-4">
               Alternative value
@@ -157,7 +256,7 @@ function ConditionInput(props: { index: number }) {
           </>
         )}
         <legend>
-          <h6>Time rule</h6>
+          <h5>Time rule</h5>
         </legend>
         <label>
           Active only on specific periods
@@ -175,14 +274,22 @@ function ConditionInput(props: { index: number }) {
               if (e.target.checked) {
                 const period = getValues(`conditions.${index}.period`);
                 if (!period || JSON.stringify(period) === "{}") {
-                  setValue(`conditions.${index}.period`, {
-                    begin: startOfDay(new Date()),
-                    activationDays: {
-                      days: DAYS.slice(),
+                  setValue(
+                    `conditions.${index}.period`,
+                    {
+                      begin: startOfDay(new Date()),
+                      activationDays: {
+                        days: DAYS.slice(),
+                      },
+                      hourPeriods: [],
+                      timezone:
+                        Intl.DateTimeFormat().resolvedOptions().timeZone,
+                      end: null as any,
                     },
-                    hourPeriods: [],
-                    timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
-                  });
+                    {
+                      shouldValidate: true,
+                    }
+                  );
                 }
               } else {
                 setValue(`conditions.${index}.period`, undefined);
@@ -195,7 +302,7 @@ function ConditionInput(props: { index: number }) {
       </fieldset>
       <fieldset style={{ border: "none" }} className="mt-3">
         <legend>
-          <h6>User rule</h6>
+          <h5>User rule</h5>
         </legend>
         <label>
           Strategy to use
diff --git a/izanami-frontend/src/components/FeatureForm.tsx b/izanami-frontend/src/components/FeatureForm.tsx
index 1e840cacf..4254e99bf 100644
--- a/izanami-frontend/src/components/FeatureForm.tsx
+++ b/izanami-frontend/src/components/FeatureForm.tsx
@@ -1251,7 +1251,7 @@ export function V2FeatureForm(props: {
                 }}
               />
             </label>
-            {type === "Classic" && <ConditionsInput />}
+            {type === "Classic" && <ConditionsInput folded={!!defaultValue} />}
             {type === "Existing WASM script" && <ExistingScript />}
             {type === "New WASM script" && <WasmInput />}
             <div
diff --git a/izanami-frontend/src/components/FeatureTable.tsx b/izanami-frontend/src/components/FeatureTable.tsx
index 4ed70fc35..0a240d3e4 100644
--- a/izanami-frontend/src/components/FeatureTable.tsx
+++ b/izanami-frontend/src/components/FeatureTable.tsx
@@ -153,7 +153,7 @@ function PeriodDetails(props: { period: TFeaturePeriod }): JSX.Element {
   }
 }
 
-function Period({ period }: { period: TFeaturePeriod }): JSX.Element {
+export function Period({ period }: { period: TFeaturePeriod }): JSX.Element {
   let display = "";
   if (period.begin && period.end) {
     display = `from ${format(period.begin, "PPPp")} to ${format(
@@ -173,14 +173,14 @@ function Period({ period }: { period: TFeaturePeriod }): JSX.Element {
   );
 }
 
-function Rule(props: { rule: TFeatureRule }): JSX.Element {
+export function Rule(props: { rule: TFeatureRule }): JSX.Element {
   const { rule } = props;
   if (isPercentageRule(rule)) {
-    return <>For {`${rule.percentage}% of users`}</>;
+    return <>for {`${rule.percentage}% of users`}</>;
   } else if (isUserListRule(rule)) {
-    return <>{`Only for : ${rule.users.join(", ")}`}</>;
+    return <>{`only for : ${rule.users.join(", ")}`}</>;
   } else {
-    return <>For all users</>;
+    return <>for all users</>;
   }
 }
 export function possiblePaths(contexts: TContext[], path = ""): string[] {
@@ -242,11 +242,17 @@ function NonBooleanConditionsDetails({
   const { value } = resultDetail;
   return (
     <>
-      <span className="fw-semibold">Base value is</span>&nbsp;
-      <span className="fst-italic">{value}</span>
       {conditions.map((cond, idx) => {
-        return <NonBooleanConditionDetails key={idx} condition={cond} />;
+        return (
+          <>
+            <NonBooleanConditionDetails key={idx} condition={cond} />
+            <div className="feature-separator">-OR-</div>
+          </>
+        );
       })}
+      <span className="fw-semibold">Value is</span>&nbsp;
+      <span className="fst-italic">{value}</span>
+      &nbsp;otherwise
     </>
   );
 }
@@ -267,7 +273,7 @@ function NonBooleanConditionDetails({
   );
 }
 
-function ConditionDetails({
+export function ConditionDetails({
   conditions,
   resultDetail,
 }: {
@@ -1587,16 +1593,18 @@ export function FeatureTable(props: {
           if (!maybeContexts || maybeContexts.length === 0) {
             return (
               <div className="d-flex justify-start align-items-center">
+                <span style={{ paddingRight: "0.25rem" }}>{feature.name}</span>
                 <ResultTypeIcon resultType={feature.resultType} />
-                <span style={{ paddingLeft: "0.75rem" }}>{feature.name}</span>
               </div>
             );
           } else {
             return (
               <div className="d-flex align-items-center">
-                <ResultTypeIcon resultType={feature.resultType} />
                 <div className="d-flex py-2">
-                  <span style={{ paddingLeft: "0.75rem" }}>{feature.name}</span>
+                  <span style={{ paddingRight: "0.25rem" }}>
+                    {feature.name}
+                  </span>
+                  <ResultTypeIcon resultType={feature.resultType} />
                   <button
                     className="top-10 align-self-start badge rounded-pill bg-primary-outline"
                     role="button"
diff --git a/izanami-frontend/src/components/OverloadCreationForm.tsx b/izanami-frontend/src/components/OverloadCreationForm.tsx
index a1296a0c0..c64604ffb 100644
--- a/izanami-frontend/src/components/OverloadCreationForm.tsx
+++ b/izanami-frontend/src/components/OverloadCreationForm.tsx
@@ -208,7 +208,7 @@ export function OverloadCreationForm(props: {
               }}
             />
           </label>
-          {type === "Classic" && <ConditionsInput />}
+          {type === "Classic" && <ConditionsInput folded={true} />}
           {type === "Existing WASM script" && <ExistingScript />}
           {type === "New WASM script" && <WasmInput />}
           <div className="d-flex justify-content-end">
diff --git a/izanami-frontend/src/components/ResultTypeIcon.tsx b/izanami-frontend/src/components/ResultTypeIcon.tsx
index 41e9ae133..4b423c9fe 100644
--- a/izanami-frontend/src/components/ResultTypeIcon.tsx
+++ b/izanami-frontend/src/components/ResultTypeIcon.tsx
@@ -6,8 +6,8 @@ const NumberTypeIcon = () => (
   <svg
     xmlns=" http://www.w3.org/2000/svg"
     viewBox="0 0 301.95 240.38"
-    width="18"
-    height="18"
+    width="12"
+    height="12"
     style={{ marginTop: "-2px" }}
   >
     <g id="Calque_2" data-name="Calque 2">
@@ -79,12 +79,12 @@ export const ResultTypeIcon = (props: {
   color?: string;
 }) => {
   const rs = props.resultType;
-  const color = props.color ?? "var(--color_level3)";
+  const color = props.color ?? "var(--color_level1)";
   return (
     <div className="custom-badge" style={{ fill: color }} aria-hidden>
       {rs === "boolean" ? (
         <i
-          style={{ fontSize: "18px", color: color }}
+          style={{ fontSize: "14px", color: color }}
           className="fa-solid fa-toggle-off"
         ></i>
       ) : rs === "string" ? (
diff --git a/izanami-frontend/src/index.scss b/izanami-frontend/src/index.scss
index 89e8b9746..0c348fb89 100644
--- a/izanami-frontend/src/index.scss
+++ b/izanami-frontend/src/index.scss
@@ -278,6 +278,17 @@ input[type="time"] {
   z-index: 1001;
 }
 
+.condition-accordion {
+  .accordion-body {
+    background-color: var(--bg-color_level25) !important;
+  }
+
+  .accordion-button {
+    background-color: var(--bg-color_level3) !important;
+    box-shadow: none !important;
+  }
+}
+
 .log-result-count {
   color: var(--color_level3);
 }
diff --git a/izanami-frontend/src/utils/icons.tsx b/izanami-frontend/src/utils/icons.tsx
index a9ceb226b..fc1b51233 100644
--- a/izanami-frontend/src/utils/icons.tsx
+++ b/izanami-frontend/src/utils/icons.tsx
@@ -20,7 +20,7 @@ export function StringIcon(props: object) {
   return (
     <svg
       style={{ marginTop: "-3px" }}
-      height="12px"
+      height="10px"
       viewBox="0 0 8.3977594 4.1816964"
     >
       <g id="layer1" transform="translate(-13.854308,-12.137085)">
diff --git a/izanami-frontend/src/utils/queries.tsx b/izanami-frontend/src/utils/queries.tsx
index e57d4a13a..66d05c241 100644
--- a/izanami-frontend/src/utils/queries.tsx
+++ b/izanami-frontend/src/utils/queries.tsx
@@ -1361,37 +1361,15 @@ export function importUsersFile(tenant: string, file: FileList): Promise<any> {
   });
 }
 
-export function searchEntities(
-  query: string,
-  filter: string[] = []
-): Promise<SearchResult[]> {
-  let filterString = "";
-  if (filter.length > 0) {
-    filterString = filter.map(encodeURIComponent).join("&filter=");
-  }
-  return handleFetchJsonResponse(
-    fetch(
-      `/api/admin/search?query=${encodeURIComponent(query)}${
-        filterString ? `&filter=${filterString}` : ""
-      }`
-    )
-  );
+export function searchEntities(query: string): Promise<SearchResult[]> {
+  return handleFetchJsonResponse(fetch(`/api/admin/search?query=${query}`));
 }
 export function searchEntitiesByTenant(
   tenant: string,
-  query: string,
-  filter: string[] = []
+  query: string
 ): Promise<SearchResult[]> {
-  let filterString = "";
-  if (filter.length > 0) {
-    filterString = filter.map(encodeURIComponent).join("&filter=");
-  }
   return handleFetchJsonResponse(
-    fetch(
-      `/api/admin/tenants/${tenant}/search?query=${encodeURIComponent(query)}${
-        filterString ? `&filter=${filterString}` : ""
-      }`
-    )
+    fetch(`/api/admin/tenants/${tenant}/search?query=${query}`)
   );
 }
 
diff --git a/izanami-frontend/src/utils/types.ts b/izanami-frontend/src/utils/types.ts
index 810f2efeb..e08fcf793 100644
--- a/izanami-frontend/src/utils/types.ts
+++ b/izanami-frontend/src/utils/types.ts
@@ -321,6 +321,7 @@ export interface TWasmConfigSource {
 }
 
 export interface TClassicalCondition {
+  id: string;
   rule?: TFeatureRule;
   period?: TFeaturePeriod;
 }
diff --git a/izanami-frontend/tests/audit.spec.ts b/izanami-frontend/tests/audit.spec.ts
index aae92006e..566350fc4 100644
--- a/izanami-frontend/tests/audit.spec.ts
+++ b/izanami-frontend/tests/audit.spec.ts
@@ -8,7 +8,7 @@ import {
 } from "./testBuilder";
 
 test.use({
-  headless: false,
+  headless: true,
 });
 
 test.describe("Audit screen should", () => {
@@ -86,6 +86,7 @@ test.describe("Audit screen should", () => {
     await page.getByLabel("Bulk action").click();
     await page.getByRole("option", { name: "Enable" }).click();
     await page.getByRole("button", { name: "Enable 6 features" }).click();
+    await expect(page.getByRole("cell", { name: "Enabled" })).toHaveCount(6);
     await page.getByRole("link", { name: "Logs" }).click();
     await expect(page.getByText("30 results")).toBeVisible();
     await expect(page.locator("li").filter({ hasText: "..." })).toBeVisible();
diff --git a/izanami-frontend/tests/features.spec.ts b/izanami-frontend/tests/features.spec.ts
index 2cee8728c..32ea20d1c 100644
--- a/izanami-frontend/tests/features.spec.ts
+++ b/izanami-frontend/tests/features.spec.ts
@@ -203,6 +203,7 @@ test.describe("Project screen should", () => {
     await expect(page.getByRole("row", { name: "test" })).toBeVisible();
 
     await featureAction(page, "Edit");
+    await page.getByRole("button", { name: "Activation condition #0" }).click();
     await page.getByLabel("date-range-from").fill("2023-10-25T00:00");
     await page.getByLabel("date-range-to").fill("2030-01-02T10:10");
     await page.getByLabel("Remove TUESDAY").click();
@@ -216,7 +217,7 @@ test.describe("Project screen should", () => {
 
     await page
       .getByRole("cell", {
-        name: "Active : from December 8th, 2024 at 12:00 AM to January 1st, 2030 at 10:10 AM on MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY from 10:00:00 to 14:00:00 For all users",
+        name: "Active : from October 25th, 2023 at 12:00 AM to January 2nd, 2030 at 10:10 AM on MONDAY, WEDNESDAY, THURSDAY, FRIDAY, SUNDAY from 11:01:00 to 15:15:00 for all users",
       })
       .click();
   });