diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.html
index 08e5305f171..34d57e67321 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.html
@@ -14,7 +14,7 @@
         <div class="col-sm-3" style="margin-top: 5px; width: fit-content" wicket:id="searchItemLabel" />
         <div class="col-sm-7" wicket:id="searchItemField" />
         <div class="col-sm-1">
-            <a wicket:id="removeButton" class="btn btn-xs" style="margin-top: 5px;">
+            <a wicket:id="removeButton" class="btn btn-xs btn-default" style="margin-top: 5px; border: none !important;">
                 <i class="fa fa-times-circle fa-lg" />
             </a>
         </div>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java
index 4fc0f9cc8b6..dc9cddf5f2e 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java
@@ -458,10 +458,10 @@ private IModel<String> createLabelModel() {
 
     private void deletePerformed(AjaxRequestTarget target) {
         SearchItem<T> item = getModelObject();
-
-        Search search = item.getSearch();
-        search.delete(item);
-
+        ((SearchValue)item.getValue()).setValue(null);
+//        Search search = item.getSearch();
+//        search.delete(item);
+//
         SearchPanel panel = findParent(SearchPanel.class);
         panel.refreshSearchForm(target);
         panel.searchPerformed(target);
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html
index b14c881d0c6..5fc23dabe7c 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html
@@ -34,9 +34,9 @@
                 <span class="caret"></span>
             </a>
         </div>
-        <a wicket:id="searchConfiguration" class="btn btn-sm btn-default">
-            <i class="fa fa-cog"></i>
-        </a>
+<!--        <a wicket:id="searchConfiguration" class="btn btn-sm btn-default">-->
+<!--            <i class="fa fa-cog"></i>-->
+<!--        </a>-->
 
         <div class="form-group" style="vertical-align: top; float:left;  padding-right: 5px;" wicket:id="searchContainer">
             <a wicket:id="searchSimple" class="btn btn-sm btn-primary" about="searchSimple">
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
index aea2cad7480..daeb06dc7cc 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
@@ -18,6 +18,7 @@
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.component.AjaxButton;
 import com.evolveum.midpoint.web.component.AjaxSubmitButton;
+import com.evolveum.midpoint.web.component.form.Form;
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItemAction;
 import com.evolveum.midpoint.web.component.menu.cog.MenuLinkPanel;
@@ -39,7 +40,6 @@
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.CheckBox;
-import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.TextArea;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.list.ListItem;
@@ -125,7 +125,7 @@ protected MoreDialogDto load() {
             }
         };
 
-        Form<?> form = new com.evolveum.midpoint.web.component.form.Form<>(ID_FORM);
+        Form<?> form = new Form<>(ID_FORM);
         add(form);
 
         ListView<SearchItem<?>> items = new ListView<SearchItem<?>>(ID_ITEMS,
@@ -169,17 +169,17 @@ public boolean isVisible() {
         more.setOutputMarkupId(true);
         moreGroup.add(more);
 
-        AjaxLink<Void> searchConfigurationButton = new AjaxLink<Void>(ID_SEARCH_CONFIGURATION) {
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public void onClick(AjaxRequestTarget target) {
-                searchConfigurationPerformed(target);
-            }
-        };
-        searchConfigurationButton.add(new VisibleBehaviour(() -> false));
-        searchConfigurationButton.setOutputMarkupId(true);
-        form.add(searchConfigurationButton);
+//        AjaxLink<Void> searchConfigurationButton = new AjaxLink<Void>(ID_SEARCH_CONFIGURATION) {
+//            private static final long serialVersionUID = 1L;
+//
+//            @Override
+//            public void onClick(AjaxRequestTarget target) {
+//                searchConfigurationPerformed(target);
+//            }
+//        };
+//        searchConfigurationButton.add(new VisibleBehaviour(() -> false));
+//        searchConfigurationButton.setOutputMarkupId(true);
+//        form.add(searchConfigurationButton);
 
         WebMarkupContainer searchContainer = new WebMarkupContainer(ID_SEARCH_CONTAINER);
         searchContainer.setOutputMarkupId(true);
@@ -219,6 +219,7 @@ public boolean isVisible() {
         });
         searchSimple.setOutputMarkupId(true);
         searchContainer.add(searchSimple);
+        form.setDefaultButton(searchSimple);
 
         WebMarkupContainer searchDropdown = new WebMarkupContainer(ID_SEARCH_DROPDOWN);
         searchDropdown.add(new VisibleEnableBehaviour() {