diff --git a/public/pages/ConfigureModel/containers/__tests__/__snapshots__/ConfigureModel.test.tsx.snap b/public/pages/ConfigureModel/containers/__tests__/__snapshots__/ConfigureModel.test.tsx.snap
index edd26cde..4fc368c7 100644
--- a/public/pages/ConfigureModel/containers/__tests__/__snapshots__/ConfigureModel.test.tsx.snap
+++ b/public/pages/ConfigureModel/containers/__tests__/__snapshots__/ConfigureModel.test.tsx.snap
@@ -1131,426 +1131,6 @@ exports[`<ConfigureModel /> spec editing model configuration renders the compone
             class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
             style="margin: 0px;"
           >
-            <div
-              class="euiAccordion euiAccordion-isOpen euiAccordion__noTopBorder"
-            >
-              <div
-                class="euiAccordion__triggerWrapper"
-              >
-                <button
-                  aria-controls="featureList.0"
-                  aria-expanded="true"
-                  class="euiAccordion__button euiAccordionForm__noTopPaddingButton"
-                  id="random_html_id"
-                  type="button"
-                >
-                  <span
-                    class="euiAccordion__iconWrapper"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="euiIcon euiIcon--medium euiAccordion__icon euiAccordion__icon-isOpen"
-                      focusable="false"
-                      height="16"
-                      role="img"
-                      viewBox="0 0 16 16"
-                      width="16"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="m5.157 13.069 4.611-4.685a.546.546 0 0 0 0-.768L5.158 2.93a.552.552 0 0 1 0-.771.53.53 0 0 1 .759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 0 1-.76 0 .552.552 0 0 1 0-.771Z"
-                        fill-rule="nonzero"
-                      />
-                    </svg>
-                  </span>
-                  <span
-                    class="euiIEFlexWrapFix"
-                  >
-                    <div
-                      id="featureAccordionHeaders.0"
-                    >
-                      <div
-                        class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                      >
-                        <div
-                          class="euiFlexItem"
-                        >
-                          <h5
-                            class="euiTitle euiTitle--xsmall euiAccordionForm__title"
-                          >
-                            Add feature
-                          </h5>
-                        </div>
-                      </div>
-                    </div>
-                  </span>
-                </button>
-                <div
-                  class="euiAccordion__optionalAction"
-                >
-                  <button
-                    class="euiButton euiButton--danger euiButton--small"
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButton__content"
-                    >
-                      <span
-                        class="euiButton__text"
-                      >
-                        Delete
-                      </span>
-                    </span>
-                  </button>
-                </div>
-              </div>
-              <div
-                aria-labelledby="random_html_id"
-                class="euiAccordion__childWrapper"
-                id="featureList.0"
-                role="region"
-                tabindex="-1"
-              >
-                <div>
-                  <div
-                    class="euiAccordion__padding--l"
-                  >
-                    <div
-                      class="euiFormRow euiFormRow--compressed"
-                      id="random_html_id-row"
-                    >
-                      <div
-                        class="euiFormRow__labelWrapper"
-                      >
-                        <label
-                          aria-invalid="false"
-                          class="euiFormLabel euiFormRow__label"
-                          for="random_html_id"
-                        >
-                          Feature name
-                        </label>
-                      </div>
-                      <div
-                        class="euiFormRow__fieldWrapper"
-                      >
-                        <div
-                          class="euiFormControlLayout euiFormControlLayout--compressed"
-                        >
-                          <div
-                            class="euiFormControlLayout__childrenWrapper"
-                          >
-                            <input
-                              aria-describedby="random_html_id-help-0"
-                              class="euiFieldText euiFieldText--compressed"
-                              data-test-subj="featureNameTextInput-0"
-                              id="random_html_id"
-                              name="featureList.0.featureName"
-                              placeholder="Enter feature name"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="euiFormHelpText euiFormRow__text"
-                          id="random_html_id-help-0"
-                        >
-                          Enter a descriptive name. The name must be unique within this detector. Feature name must contain 1-64 characters. Valid characters are a-z, A-Z, 0-9, -(hyphen) and _(underscore).
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFormRow euiFormRow--compressed"
-                      id="random_html_id-row"
-                    >
-                      <div
-                        class="euiFormRow__labelWrapper"
-                      >
-                        <label
-                          aria-invalid="false"
-                          class="euiFormLabel euiFormRow__label"
-                          for="random_html_id"
-                        >
-                          Feature state
-                        </label>
-                      </div>
-                      <div
-                        class="euiFormRow__fieldWrapper"
-                      >
-                        <div
-                          class="euiCheckbox euiCheckbox--compressed"
-                        >
-                          <input
-                            checked=""
-                            class="euiCheckbox__input"
-                            id="random_html_id"
-                            name="featureList.0.featureEnabled"
-                            type="checkbox"
-                            value="true"
-                          />
-                          <div
-                            class="euiCheckbox__square"
-                          />
-                          <label
-                            class="euiCheckbox__label"
-                            for="random_html_id"
-                          >
-                            Enable feature
-                          </label>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFormRow euiFormRow--compressed"
-                      id="random_html_id-row"
-                    >
-                      <div
-                        class="euiFormRow__labelWrapper"
-                      >
-                        <label
-                          aria-invalid="false"
-                          class="euiFormLabel euiFormRow__label"
-                          for="random_html_id"
-                        >
-                          Find anomalies based on
-                        </label>
-                      </div>
-                      <div
-                        class="euiFormRow__fieldWrapper"
-                      >
-                        <div
-                          class="euiFormControlLayout euiFormControlLayout--compressed"
-                        >
-                          <div
-                            class="euiFormControlLayout__childrenWrapper"
-                          >
-                            <select
-                              class="euiSelect euiSelect--compressed"
-                              id="random_html_id"
-                              name="featureList.0.featureType"
-                            >
-                              <option
-                                value="simple_aggs"
-                              >
-                                Field value
-                              </option>
-                              <option
-                                value="custom_aggs"
-                              >
-                                Custom expression
-                              </option>
-                            </select>
-                            <div
-                              class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                            >
-                              <span
-                                class="euiFormControlLayoutCustomIcon"
-                              >
-                                <svg
-                                  aria-hidden="true"
-                                  class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
-                                  focusable="false"
-                                  height="16"
-                                  role="img"
-                                  viewBox="0 0 16 16"
-                                  width="16"
-                                  xmlns="http://www.w3.org/2000/svg"
-                                >
-                                  <path
-                                    d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
-                                    fill-rule="non-zero"
-                                  />
-                                </svg>
-                              </span>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFormRow euiFormRow--compressed"
-                      id="random_html_id-row"
-                    >
-                      <div
-                        class="euiFormRow__labelWrapper"
-                      >
-                        <label
-                          aria-invalid="false"
-                          class="euiFormLabel euiFormRow__label"
-                          for="random_html_id"
-                        >
-                          Aggregation method
-                        </label>
-                      </div>
-                      <div
-                        class="euiFormRow__fieldWrapper"
-                      >
-                        <div
-                          class="euiFormControlLayout euiFormControlLayout--compressed"
-                        >
-                          <div
-                            class="euiFormControlLayout__childrenWrapper"
-                          >
-                            <select
-                              aria-describedby="random_html_id-help-0"
-                              class="euiSelect euiSelect--compressed"
-                              data-test-subj="aggregationType"
-                              id="random_html_id"
-                              name="featureList.0.aggregationBy"
-                            >
-                              <option
-                                value="avg"
-                              >
-                                average()
-                              </option>
-                              <option
-                                value="value_count"
-                              >
-                                count()
-                              </option>
-                              <option
-                                value="sum"
-                              >
-                                sum()
-                              </option>
-                              <option
-                                value="min"
-                              >
-                                min()
-                              </option>
-                              <option
-                                value="max"
-                              >
-                                max()
-                              </option>
-                            </select>
-                            <div
-                              class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                            >
-                              <span
-                                class="euiFormControlLayoutCustomIcon"
-                              >
-                                <svg
-                                  aria-hidden="true"
-                                  class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
-                                  focusable="false"
-                                  height="16"
-                                  role="img"
-                                  viewBox="0 0 16 16"
-                                  width="16"
-                                  xmlns="http://www.w3.org/2000/svg"
-                                >
-                                  <path
-                                    d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
-                                    fill-rule="non-zero"
-                                  />
-                                </svg>
-                              </span>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="euiFormHelpText euiFormRow__text"
-                          id="random_html_id-help-0"
-                        >
-                          The aggregation method determines what constitutes an anomaly. For example, if you choose min(), the detector focuses on finding anomalies based on the minimum values of your feature.
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="euiFormRow euiFormRow--compressed"
-                      id="random_html_id-row"
-                    >
-                      <div
-                        class="euiFormRow__labelWrapper"
-                      >
-                        <label
-                          aria-invalid="false"
-                          class="euiFormLabel euiFormRow__label"
-                          for="random_html_id"
-                        >
-                          Field
-                        </label>
-                      </div>
-                      <div
-                        class="euiFormRow__fieldWrapper"
-                      >
-                        <div
-                          aria-expanded="false"
-                          aria-haspopup="listbox"
-                          class="euiComboBox euiComboBox--compressed"
-                          data-test-subj="featureFieldTextInput-0"
-                          name="featureList.0.aggregationOf"
-                          role="combobox"
-                        >
-                          <div
-                            class="euiFormControlLayout euiFormControlLayout--compressed"
-                          >
-                            <div
-                              class="euiFormControlLayout__childrenWrapper"
-                            >
-                              <div
-                                class="euiComboBox__inputWrap euiComboBox__inputWrap--compressed euiComboBox__inputWrap--noWrap euiComboBox__inputWrap-isClearable"
-                                data-test-subj="comboBoxInput"
-                                tabindex="-1"
-                              >
-                                <p
-                                  class="euiComboBoxPlaceholder"
-                                >
-                                  Select field
-                                </p>
-                                <div
-                                  class="euiComboBox__input"
-                                  style="font-size: 14px; display: inline-block;"
-                                >
-                                  <input
-                                    aria-controls=""
-                                    data-test-subj="comboBoxSearchInput"
-                                    id="random_html_id"
-                                    role="textbox"
-                                    style="box-sizing: content-box; width: 2px;"
-                                    value=""
-                                  />
-                                  <div
-                                    style="position: absolute; top: 0px; left: 0px; visibility: hidden; height: 0px; overflow: scroll; white-space: pre; font-family: -webkit-small-control; letter-spacing: normal; text-transform: none;"
-                                  />
-                                </div>
-                              </div>
-                              <div
-                                class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                              >
-                                <button
-                                  aria-label="Open list of options"
-                                  class="euiFormControlLayoutCustomIcon euiFormControlLayoutCustomIcon--clickable"
-                                  data-test-subj="comboBoxToggleListButton"
-                                  type="button"
-                                >
-                                  <svg
-                                    aria-hidden="true"
-                                    class="euiIcon euiIcon--small euiFormControlLayoutCustomIcon__icon"
-                                    focusable="false"
-                                    height="16"
-                                    role="img"
-                                    viewBox="0 0 16 16"
-                                    width="16"
-                                    xmlns="http://www.w3.org/2000/svg"
-                                  >
-                                    <path
-                                      d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
-                                      fill-rule="non-zero"
-                                    />
-                                  </svg>
-                                </button>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
             <div
               class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
               style="padding: 12px 0px;"
@@ -1579,7 +1159,7 @@ exports[`<ConfigureModel /> spec editing model configuration renders the compone
                   <p>
                     You can add up to
                      
-                    4
+                    5
                      
                     more features.
                   </p>
diff --git a/public/pages/DefineDetector/containers/__tests__/__snapshots__/DefineDetector.test.tsx.snap b/public/pages/DefineDetector/containers/__tests__/__snapshots__/DefineDetector.test.tsx.snap
index d189d980..9e49f7a3 100644
--- a/public/pages/DefineDetector/containers/__tests__/__snapshots__/DefineDetector.test.tsx.snap
+++ b/public/pages/DefineDetector/containers/__tests__/__snapshots__/DefineDetector.test.tsx.snap
@@ -1593,7 +1593,7 @@ exports[`<DefineDetector /> empty creating detector definition renders the compo
                     xmlns="http://www.w3.org/2000/svg"
                   >
                     <path
-                      d="M7.999 15.999a8 8 0 1 1 0-16 8 8 0 0 1 0 16ZM8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14ZM3.5 5h9a.5.5 0 1 1 0 1h-9a.5.5 0 0 1 0-1Zm2 3h5a.5.5 0 1 1 0 1h-5a.5.5 0 0 1 0-1Zm2 3h1a.5.5 0 1 1 0 1h-1a.5.5 0 1 1 0-1Z"
+                      d="m9.759 12.652-1.8 2.25-.78-.625 1.8-2.25A.1.1 0 0 0 9 11.965V8.362a1 1 0 0 1 .232-.64l4.631-5.558A.1.1 0 0 0 13.787 2H2.213a.1.1 0 0 0-.077.164l4.631 5.558a1 1 0 0 1 .232.64v5.853a.1.1 0 0 0 .178.062l.781.625c-.65.812-1.959.353-1.959-.687V8.362L1.368 2.804C.771 2.088 1.281 1 2.214 1h11.573c.932 0 1.442 1.088.845 1.804L10 8.362v3.603a1.1 1.1 0 0 1-.241.687Z"
                       fill-rule="evenodd"
                     />
                   </svg>
@@ -2679,7 +2679,7 @@ exports[`<DefineDetector /> empty editing detector definition renders the compon
                     xmlns="http://www.w3.org/2000/svg"
                   >
                     <path
-                      d="M7.999 15.999a8 8 0 1 1 0-16 8 8 0 0 1 0 16ZM8 15A7 7 0 1 0 8 1a7 7 0 0 0 0 14ZM3.5 5h9a.5.5 0 1 1 0 1h-9a.5.5 0 0 1 0-1Zm2 3h5a.5.5 0 1 1 0 1h-5a.5.5 0 0 1 0-1Zm2 3h1a.5.5 0 1 1 0 1h-1a.5.5 0 1 1 0-1Z"
+                      d="m9.759 12.652-1.8 2.25-.78-.625 1.8-2.25A.1.1 0 0 0 9 11.965V8.362a1 1 0 0 1 .232-.64l4.631-5.558A.1.1 0 0 0 13.787 2H2.213a.1.1 0 0 0-.077.164l4.631 5.558a1 1 0 0 1 .232.64v5.853a.1.1 0 0 0 .178.062l.781.625c-.65.812-1.959.353-1.959-.687V8.362L1.368 2.804C.771 2.088 1.281 1 2.214 1h11.573c.932 0 1.442 1.088.845 1.804L10 8.362v3.603a1.1 1.1 0 0 1-.241.687Z"
                       fill-rule="evenodd"
                     />
                   </svg>
@@ -3258,4 +3258,4 @@ exports[`<DefineDetector /> empty editing detector definition renders the compon
     </div>
   </div>
 </div>
-`;
\ No newline at end of file
+`;