diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
index 3df65b2a0c9..aeba2257c72 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
@@ -223,7 +223,7 @@ public long size() {
             addCachedSize(cache, new CachedSize(size, System.currentTimeMillis()));
         }
 
-        LOGGER.trace("end::size()");
+        LOGGER.trace("end::size(): {}", size);
         return size;
     }
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
index 5a951425c1d..dfdd5ebc25d 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
@@ -116,9 +116,16 @@ public Iterator<W> internalIterator(long first, long count) {
             }
             query.setPaging(paging);
 
-            LOGGER.trace("Query {} with {}", type.getSimpleName(), query.debugDump());
+            if (LOGGER.isTraceEnabled()) {
+            	LOGGER.trace("Query {} with {}", type.getSimpleName(), query.debugDump());
+            }
 
             List<PrismObject<T>> list = getModel().searchObjects(type, query, options, task, result);
+            
+            if (LOGGER.isTraceEnabled()) {
+            	LOGGER.trace("Query {} resulted in {} objects", type.getSimpleName(), list.size());
+            }
+            
             for (PrismObject<T> object : list) {
                 getAvailableData().add(createDataObjectWrapper(object));
             }
@@ -170,7 +177,7 @@ protected int internalSize() {
             throw new RestartResponseException(PageError.class);
         }
 
-        LOGGER.trace("end::internalSize()");
+        LOGGER.trace("end::internalSize(): {}", count);
         return count;
     }
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePanel.html
index 685ce9ef973..c004cba0bb2 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePanel.html
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!--
-  ~ Copyright (c) 2010-2013 Evolveum
+  ~ Copyright (c) 2010-2015 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -21,6 +21,9 @@
     <div class="row">
         <div class="col-md-12 clearfix">
             <form class="form-inline pull-right search-form" wicket:id="searchForm">
+            	<div class="form-group">
+	                <select class="form-control input-sm" wicket:id="searchScope"/>
+	            </div>
                 <div wicket:id="basicSearch"/>
             </form>
         </div>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePanel.java
index 4a547a1b53d..e72098134c8 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePanel.java
@@ -1,21 +1,51 @@
+/*
+ * Copyright (c) 2010-2015 Evolveum
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.evolveum.midpoint.web.component.org;
 
-import com.evolveum.midpoint.prism.PrismContext;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
+import org.apache.wicket.extensions.markup.html.repeater.tree.ISortableTreeProvider;
+import org.apache.wicket.extensions.markup.html.repeater.tree.TableTree;
+import org.apache.wicket.extensions.markup.html.repeater.tree.table.TreeColumn;
+import org.apache.wicket.extensions.markup.html.repeater.tree.theme.WindowsTheme;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+
 import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.prism.PrismReferenceValue;
 import com.evolveum.midpoint.prism.delta.ObjectDelta;
-import com.evolveum.midpoint.prism.match.PolyStringNormMatchingRule;
-import com.evolveum.midpoint.prism.polystring.PolyStringNormalizer;
-import com.evolveum.midpoint.prism.query.AndFilter;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
-import com.evolveum.midpoint.prism.query.OrgFilter;
-import com.evolveum.midpoint.prism.query.SubstringFilter;
-import com.evolveum.midpoint.schema.constants.ObjectTypes;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.component.BasicSearchPanel;
-import com.evolveum.midpoint.web.component.TabbedPanel;
 import com.evolveum.midpoint.web.component.data.ObjectDataProvider;
 import com.evolveum.midpoint.web.component.data.TablePanel;
 import com.evolveum.midpoint.web.component.data.column.CheckBoxHeaderColumn;
@@ -24,13 +54,12 @@
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItemAction;
 import com.evolveum.midpoint.web.component.util.LoadableModel;
-import com.evolveum.midpoint.web.component.util.SimplePanel;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.web.page.PageBase;
+import com.evolveum.midpoint.web.page.admin.users.component.AbstractTreeTablePanel;
 import com.evolveum.midpoint.web.page.admin.users.component.OrgTreeProvider;
 import com.evolveum.midpoint.web.page.admin.users.component.SelectableFolderContent;
 import com.evolveum.midpoint.web.page.admin.users.component.TreeTablePanel;
-import com.evolveum.midpoint.web.page.admin.users.dto.OrgDto;
 import com.evolveum.midpoint.web.page.admin.users.dto.OrgTableDto;
 import com.evolveum.midpoint.web.page.admin.users.dto.OrgTreeDto;
 import com.evolveum.midpoint.web.page.admin.users.dto.TreeStateSet;
@@ -39,78 +68,29 @@
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.web.util.WebModelUtils;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.OrgType;
-import org.apache.commons.lang.StringUtils;
-import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
-import org.apache.wicket.extensions.markup.html.repeater.tree.ISortableTreeProvider;
-import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;
-import org.apache.wicket.extensions.markup.html.repeater.tree.TableTree;
-import org.apache.wicket.extensions.markup.html.repeater.tree.table.TreeColumn;
-import org.apache.wicket.extensions.markup.html.repeater.tree.theme.WindowsTheme;
-import org.apache.wicket.extensions.markup.html.tabs.ITab;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
 
-public class OrgTreeTablePanel extends SimplePanel{
+/**
+ * Used in assignment dialog when "assign org" is chosen.
+ * 
+ * Mostly copy&paste from TreeTablePanel. But we do not mind now. It will be
+ * reworked anyway.
+ * 
+ * @author katkav
+ */
+public class OrgTreeTablePanel extends AbstractTreeTablePanel{
 	
     private static final Trace LOGGER = TraceManager.getTrace(TreeTablePanel.class);
 
-    private static final int CONFIRM_DELETE = 0;
-    private static final int CONFIRM_DELETE_ROOT = 1;
-
-    private static final String DOT_CLASS = TreeTablePanel.class.getName() + ".";
-    private static final String OPERATION_DELETE_OBJECTS = DOT_CLASS + "deleteObjects";
-    private static final String OPERATION_DELETE_OBJECT = DOT_CLASS + "deleteObject";
-    private static final String OPERATION_MOVE_OBJECTS = DOT_CLASS + "moveObjects";
-    private static final String OPERATION_MOVE_OBJECT = DOT_CLASS + "moveObject";
-    private static final String OPERATION_UPDATE_OBJECTS = DOT_CLASS + "updateObjects";
-    private static final String OPERATION_UPDATE_OBJECT = DOT_CLASS + "updateObject";
-    private static final String OPERATION_RECOMPUTE = DOT_CLASS + "recompute";
-
-    private static final String ID_TREE = "tree";
-    private static final String ID_TREE_CONTAINER = "treeContainer";
-    private static final String ID_CONTAINER_CHILD_ORGS = "childOrgContainer";
-    private static final String ID_CONTAINER_MANAGER = "managerContainer";
-    private static final String ID_CONTAINER_MEMBER = "memberContainer";
-    private static final String ID_CHILD_TABLE = "childUnitTable";
-    private static final String ID_MANAGER_TABLE = "managerTable";
-    private static final String ID_MEMBER_TABLE = "memberTable";
-    private static final String ID_FORM = "form";
-    private static final String ID_CONFIRM_DELETE_POPUP = "confirmDeletePopup";
-    private static final String ID_MOVE_POPUP = "movePopup";
-    private static final String ID_ADD_DELETE_POPUP = "addDeletePopup";
-    private static final String ID_TREE_MENU = "treeMenu";
-    private static final String ID_TREE_HEADER = "treeHeader";
-    private static final String ID_SEARCH_FORM = "searchForm";
-    private static final String ID_BASIC_SEARCH = "basicSearch";
-
-    private IModel<OrgTreeDto> selected = new LoadableModel<OrgTreeDto>() {
-
-        @Override
-        protected OrgTreeDto load() {
-            return getRootFromProvider();
-        }
-    };
-
     public OrgTreeTablePanel(String id, IModel<String> rootOid) {
         super(id, rootOid);
+        
+        selected = new LoadableModel<OrgTreeDto>() {
+            @Override
+            protected OrgTreeDto load() {
+                return getRootFromProvider();
+            }
+        };
     }
 
     @Override
@@ -181,7 +161,7 @@ public String getObject() {
         initSearch();
     }
 
-    protected CharSequence computeTreeHeight(){
+    protected CharSequence computeTreeHeight() {
         return "updateHeight('" + getMarkupId()
                 + "', ['#" + OrgTreeTablePanel.this.get(ID_FORM).getMarkupId() + "'], ['#"
                 + OrgTreeTablePanel.this.get(ID_TREE_HEADER).getMarkupId() + "'])";
@@ -233,29 +213,6 @@ public boolean isVisible() {
         childOrgUnitContainer.add(childTable);
     }
 
-    /**
-     * TODO - test search
-     * */
-    private void initSearch() {
-        Form form = new Form(ID_SEARCH_FORM);
-        form.setOutputMarkupId(true);
-        add(form);
-
-        BasicSearchPanel basicSearch = new BasicSearchPanel(ID_BASIC_SEARCH, new Model()) {
-
-            @Override
-            protected void clearSearchPerformed(AjaxRequestTarget target) {
-                clearTableSearchPerformed(target);
-            }
-
-            @Override
-            protected void searchPerformed(AjaxRequestTarget target) {
-                tableSearchPerformed(target);
-            }
-        };
-        form.add(basicSearch);
-    }
-
     private List<InlineMenuItem> createTreeMenu() {
         List<InlineMenuItem> items = new ArrayList<>();
 
@@ -282,15 +239,6 @@ public void onClick(AjaxRequestTarget target) {
         return items;
     }
 
-   
-    private OrgTreeDto getRootFromProvider() {
-        TableTree<OrgTreeDto, String> tree = getTree();
-        ITreeProvider<OrgTreeDto> provider = tree.getProvider();
-        Iterator<? extends OrgTreeDto> iterator = provider.getRoots();
-
-        return iterator.hasNext() ? iterator.next() : null;
-    }
-
     private List<IColumn<OrgTableDto, String>> createChildTableColumns() {
         List<IColumn<OrgTableDto, String>> columns = new ArrayList<>();
 
@@ -337,45 +285,7 @@ public List<OrgTableDto> getSelectedOrgs() {
 
         return objects;
     }
-
-       private PrismReferenceValue createPrismRefValue(OrgDto dto) {
-        PrismReferenceValue value = new PrismReferenceValue();
-        value.setOid(dto.getOid());
-        value.setRelation(dto.getRelation());
-        value.setTargetType(ObjectTypes.getObjectType(dto.getType()).getTypeQName());
-        return value;
-    }
-
    
-    private void refreshTabbedPanel(AjaxRequestTarget target) {
-        PageBase page = getPageBase();
-
-        TabbedPanel tabbedPanel = findParent(TabbedPanel.class);
-        IModel<List<ITab>> tabs = tabbedPanel.getTabs();
-
-        if (tabs instanceof LoadableModel) {
-            ((LoadableModel) tabs).reset();
-        }
-
-        tabbedPanel.setSelectedTab(0);
-
-        target.add(tabbedPanel);
-        target.add(page.getFeedbackPanel());
-    }
-
-    private TableTree<OrgTreeDto, String> getTree() {
-        return (TableTree<OrgTreeDto, String>) get(createComponentPath(ID_TREE_CONTAINER, ID_TREE));
-    }
-
-    private WebMarkupContainer getOrgChildContainer() {
-        return (WebMarkupContainer) get(createComponentPath(ID_FORM, ID_CONTAINER_CHILD_ORGS));
-    }
-
-  
-    private TablePanel getOrgChildTable() {
-        return (TablePanel) get(createComponentPath(ID_FORM, ID_CONTAINER_CHILD_ORGS, ID_CHILD_TABLE));
-    }
-
     private void selectTreeItemPerformed(AjaxRequestTarget target) {
         BasicSearchPanel<String> basicSearch = (BasicSearchPanel) get(createComponentPath(ID_SEARCH_FORM, ID_BASIC_SEARCH));
         basicSearch.getModel().setObject(null);
@@ -391,54 +301,7 @@ private void selectTreeItemPerformed(AjaxRequestTarget target) {
             target.add(get(ID_SEARCH_FORM));
         }
     }
-
-    private ObjectQuery createOrgChildQuery() {
-        OrgTreeDto dto = selected.getObject();
-        String oid = (String) (dto != null ? dto.getOid() : getModel().getObject());
-
-        OrgFilter org = OrgFilter.createOrg(oid, OrgFilter.Scope.ONE_LEVEL);
-
-        BasicSearchPanel<String> basicSearch = (BasicSearchPanel) get(createComponentPath(ID_SEARCH_FORM, ID_BASIC_SEARCH));
-        String object = basicSearch.getModelObject();
-
-        if (StringUtils.isEmpty(object)) {
-            return ObjectQuery.createObjectQuery(org);
-        }
-
-        PageBase page = getPageBase();
-        PrismContext context = page.getPrismContext();
-
-        PolyStringNormalizer normalizer = context.getDefaultPolyStringNormalizer();
-        String normalizedString = normalizer.normalize(object);
-        if (StringUtils.isEmpty(normalizedString)) {
-            return ObjectQuery.createObjectQuery(org);
-        }
-
-        SubstringFilter substring =  SubstringFilter.createSubstring(ObjectType.F_NAME, ObjectType.class, context,
-                PolyStringNormMatchingRule.NAME, normalizedString);
-
-        AndFilter and = AndFilter.createAnd(org, substring);
-
-        return ObjectQuery.createObjectQuery(and);
-    }
-
-   
-    private void collapseAllPerformed(AjaxRequestTarget target) {
-        TableTree<OrgTreeDto, String> tree = getTree();
-        TreeStateModel model = (TreeStateModel) tree.getDefaultModel();
-        model.collapseAll();
-
-        target.add(tree);
-    }
-
-    private void expandAllPerformed(AjaxRequestTarget target) {
-        TableTree<OrgTreeDto, String> tree = getTree();
-        TreeStateModel model = (TreeStateModel) tree.getDefaultModel();
-        model.expandAll();
-
-        target.add(tree);
-    }
-
+  
    
     private void updateActivationPerformed(AjaxRequestTarget target, boolean enable) {
         List<OrgTableDto> objects = getSelectedOrgs(target);
@@ -467,25 +330,30 @@ private void updateActivationPerformed(AjaxRequestTarget target, boolean enable)
         refreshTable(target);
     }
 
-    private void refreshTable(AjaxRequestTarget target) {
+    @Override
+    protected void refreshTable(AjaxRequestTarget target) {
         ObjectDataProvider orgProvider = (ObjectDataProvider) getOrgChildTable().getDataTable().getDataProvider();
         orgProvider.clearCache();
 
         target.add(getOrgChildContainer());
     }
 
-    
-    private void clearTableSearchPerformed(AjaxRequestTarget target) {
-        BasicSearchPanel basicSearch = (BasicSearchPanel) get(createComponentPath(ID_SEARCH_FORM, ID_BASIC_SEARCH));
-        basicSearch.getModel().setObject(null);
+    private void collapseAllPerformed(AjaxRequestTarget target) {
+        TableTree<OrgTreeDto, String> tree = getTree();
+        TreeStateModel model = (TreeStateModel) tree.getDefaultModel();
+        model.collapseAll();
 
-        refreshTable(target);
+        target.add(tree);
     }
 
-    private void tableSearchPerformed(AjaxRequestTarget target) {
-        refreshTable(target);
-    }
+    private void expandAllPerformed(AjaxRequestTarget target) {
+        TableTree<OrgTreeDto, String> tree = getTree();
+        TreeStateModel model = (TreeStateModel) tree.getDefaultModel();
+        model.expandAll();
 
+        target.add(tree);
+    }
+    
     private static class TreeStateModel extends AbstractReadOnlyModel<Set<OrgTreeDto>> {
 
         private TreeStateSet<OrgTreeDto> set = new TreeStateSet<>();
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractTreeTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractTreeTablePanel.java
new file mode 100644
index 00000000000..c9ee4c35710
--- /dev/null
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractTreeTablePanel.java
@@ -0,0 +1,241 @@
+/*
+ * Copyright (c) 2010-2015 Evolveum
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.evolveum.midpoint.web.page.admin.users.component;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;
+import org.apache.wicket.extensions.markup.html.repeater.tree.TableTree;
+import org.apache.wicket.extensions.markup.html.tabs.ITab;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.DropDownChoice;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+
+import com.evolveum.midpoint.prism.PrismContext;
+import com.evolveum.midpoint.prism.PrismReferenceValue;
+import com.evolveum.midpoint.prism.match.PolyStringNormMatchingRule;
+import com.evolveum.midpoint.prism.polystring.PolyStringNormalizer;
+import com.evolveum.midpoint.prism.query.AndFilter;
+import com.evolveum.midpoint.prism.query.ObjectQuery;
+import com.evolveum.midpoint.prism.query.OrFilter;
+import com.evolveum.midpoint.prism.query.OrgFilter;
+import com.evolveum.midpoint.prism.query.SubstringFilter;
+import com.evolveum.midpoint.schema.constants.ObjectTypes;
+import com.evolveum.midpoint.util.logging.Trace;
+import com.evolveum.midpoint.util.logging.TraceManager;
+import com.evolveum.midpoint.web.component.BasicSearchPanel;
+import com.evolveum.midpoint.web.component.TabbedPanel;
+import com.evolveum.midpoint.web.component.data.TablePanel;
+import com.evolveum.midpoint.web.component.util.LoadableModel;
+import com.evolveum.midpoint.web.component.util.SimplePanel;
+import com.evolveum.midpoint.web.page.PageBase;
+import com.evolveum.midpoint.web.page.admin.users.dto.OrgDto;
+import com.evolveum.midpoint.web.page.admin.users.dto.OrgTreeDto;
+import com.evolveum.midpoint.web.util.StringResourceChoiceRenderer;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.OrgType;
+
+/**
+ * Common superclass for TreeTablePanel and OrgTreeTablePanel
+ *
+ * @author semancik
+ */
+public abstract class AbstractTreeTablePanel extends SimplePanel<String> {
+
+    private static final Trace LOGGER = TraceManager.getTrace(AbstractTreeTablePanel.class);
+
+    protected static final int CONFIRM_DELETE = 0;
+    protected static final int CONFIRM_DELETE_ROOT = 1;
+
+    protected static final String DOT_CLASS = AbstractTreeTablePanel.class.getName() + ".";
+    protected static final String OPERATION_DELETE_OBJECTS = DOT_CLASS + "deleteObjects";
+    protected static final String OPERATION_DELETE_OBJECT = DOT_CLASS + "deleteObject";
+    protected static final String OPERATION_MOVE_OBJECTS = DOT_CLASS + "moveObjects";
+    protected static final String OPERATION_MOVE_OBJECT = DOT_CLASS + "moveObject";
+    protected static final String OPERATION_UPDATE_OBJECTS = DOT_CLASS + "updateObjects";
+    protected static final String OPERATION_UPDATE_OBJECT = DOT_CLASS + "updateObject";
+    protected static final String OPERATION_RECOMPUTE = DOT_CLASS + "recompute";
+
+    protected static final String ID_TREE = "tree";
+    protected static final String ID_TREE_CONTAINER = "treeContainer";
+    protected static final String ID_CONTAINER_CHILD_ORGS = "childOrgContainer";
+    protected static final String ID_CONTAINER_MANAGER = "managerContainer";
+    protected static final String ID_CONTAINER_MEMBER = "memberContainer";
+    protected static final String ID_CHILD_TABLE = "childUnitTable";
+    protected static final String ID_MANAGER_TABLE = "managerTable";
+    protected static final String ID_MEMBER_TABLE = "memberTable";
+    protected static final String ID_FORM = "form";
+    protected static final String ID_CONFIRM_DELETE_POPUP = "confirmDeletePopup";
+    protected static final String ID_MOVE_POPUP = "movePopup";
+    protected static final String ID_ADD_DELETE_POPUP = "addDeletePopup";
+    protected static final String ID_TREE_MENU = "treeMenu";
+    protected static final String ID_TREE_HEADER = "treeHeader";
+    protected static final String ID_SEARCH_FORM = "searchForm";
+    protected static final String ID_BASIC_SEARCH = "basicSearch";
+    protected static final String ID_SEARCH_SCOPE = "searchScope";
+
+    protected static final String SEARCH_SCOPE_SUBTREE = "subtree";
+    protected static final String SEARCH_SCOPE_ONE = "one";
+    protected static final List<String> SEARCH_SCOPE_VALUES = Arrays.asList( SEARCH_SCOPE_SUBTREE, SEARCH_SCOPE_ONE);
+    
+    protected IModel<OrgTreeDto> selected;
+    
+    public AbstractTreeTablePanel(String id, IModel<String> rootOid) {
+        super(id, rootOid);
+    }
+
+    protected void initSearch() {
+        Form form = new Form(ID_SEARCH_FORM);
+        form.setOutputMarkupId(true);
+        add(form);
+        
+        
+        DropDownChoice<String> seachScrope = new DropDownChoice<String>(ID_SEARCH_SCOPE, Model.of(SEARCH_SCOPE_SUBTREE),
+        		SEARCH_SCOPE_VALUES, new StringResourceChoiceRenderer("TreeTablePanel.search.scope"));
+        form.add(seachScrope);
+
+        BasicSearchPanel basicSearch = new BasicSearchPanel(ID_BASIC_SEARCH, new Model()) {
+
+            @Override
+            protected void clearSearchPerformed(AjaxRequestTarget target) {
+                clearTableSearchPerformed(target);
+            }
+
+            @Override
+            protected void searchPerformed(AjaxRequestTarget target) {
+                tableSearchPerformed(target);
+            }
+        };
+        form.add(basicSearch);
+    }
+
+
+    protected OrgTreeDto getRootFromProvider() {
+        TableTree<OrgTreeDto, String> tree = getTree();
+        ITreeProvider<OrgTreeDto> provider = tree.getProvider();
+        Iterator<? extends OrgTreeDto> iterator = provider.getRoots();
+
+        return iterator.hasNext() ? iterator.next() : null;
+    }
+
+
+    protected PrismReferenceValue createPrismRefValue(OrgDto dto) {
+        PrismReferenceValue value = new PrismReferenceValue();
+        value.setOid(dto.getOid());
+        value.setRelation(dto.getRelation());
+        value.setTargetType(ObjectTypes.getObjectType(dto.getType()).getTypeQName());
+        return value;
+    }
+
+
+    protected void refreshTabbedPanel(AjaxRequestTarget target) {
+        PageBase page = getPageBase();
+
+        TabbedPanel tabbedPanel = findParent(TabbedPanel.class);
+        IModel<List<ITab>> tabs = tabbedPanel.getTabs();
+
+        if (tabs instanceof LoadableModel) {
+            ((LoadableModel) tabs).reset();
+        }
+
+        tabbedPanel.setSelectedTab(0);
+
+        target.add(tabbedPanel);
+        target.add(page.getFeedbackPanel());
+    }
+
+    protected TableTree<OrgTreeDto, String> getTree() {
+        return (TableTree<OrgTreeDto, String>) get(createComponentPath(ID_TREE_CONTAINER, ID_TREE));
+    }
+
+    protected WebMarkupContainer getOrgChildContainer() {
+        return (WebMarkupContainer) get(createComponentPath(ID_FORM, ID_CONTAINER_CHILD_ORGS));
+    }
+
+    protected TablePanel getOrgChildTable() {
+        return (TablePanel) get(createComponentPath(ID_FORM, ID_CONTAINER_CHILD_ORGS, ID_CHILD_TABLE));
+    }
+
+    protected ObjectQuery createOrgChildQuery() {
+        OrgTreeDto dto = selected.getObject();
+        String oid = dto != null ? dto.getOid() : getModel().getObject();
+
+        BasicSearchPanel<String> basicSearch = (BasicSearchPanel) get(createComponentPath(ID_SEARCH_FORM, ID_BASIC_SEARCH));
+        String object = basicSearch.getModelObject();
+
+        DropDownChoice<String> searchScopeChoice = (DropDownChoice) get(createComponentPath(ID_SEARCH_FORM, ID_SEARCH_SCOPE));
+        String scope = searchScopeChoice.getModelObject();
+
+        if (StringUtils.isBlank(object)) {
+        	object = null;
+        }
+        
+        OrgFilter org;
+        if (object == null || SEARCH_SCOPE_ONE.equals(scope)) {
+        	org = OrgFilter.createOrg(oid, OrgFilter.Scope.ONE_LEVEL);
+        } else {
+        	org = OrgFilter.createOrg(oid, OrgFilter.Scope.SUBTREE);
+        }
+
+        if (object == null) {
+            return ObjectQuery.createObjectQuery(org);
+        }
+        
+        PageBase page = getPageBase();
+        PrismContext context = page.getPrismContext();
+
+        PolyStringNormalizer normalizer = context.getDefaultPolyStringNormalizer();
+        String normalizedString = normalizer.normalize(object);
+        if (StringUtils.isEmpty(normalizedString)) {
+            return ObjectQuery.createObjectQuery(org);
+        }
+
+        SubstringFilter substringName =  SubstringFilter.createSubstring(OrgType.F_NAME, OrgType.class, context,
+                PolyStringNormMatchingRule.NAME, normalizedString);
+        
+        SubstringFilter substringDisplayName =  SubstringFilter.createSubstring(OrgType.F_DISPLAY_NAME, OrgType.class, context,
+                PolyStringNormMatchingRule.NAME, normalizedString);
+        OrFilter orName = OrFilter.createOr(substringName, substringDisplayName);
+        AndFilter and = AndFilter.createAnd(org, orName);
+        ObjectQuery query = ObjectQuery.createObjectQuery(and);
+        
+        if(LOGGER.isTraceEnabled()){
+            LOGGER.trace("Searching child orgs of org {} with query:\n{}", oid, query.debugDump());
+        }
+
+        return query;
+    }
+
+    protected abstract void refreshTable(AjaxRequestTarget target);
+    
+    protected void clearTableSearchPerformed(AjaxRequestTarget target) {
+        BasicSearchPanel basicSearch = (BasicSearchPanel) get(createComponentPath(ID_SEARCH_FORM, ID_BASIC_SEARCH));
+        basicSearch.getModel().setObject(null);
+
+        refreshTable(target);
+    }
+
+    protected void tableSearchPerformed(AjaxRequestTarget target) {
+        refreshTable(target);
+    }
+}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.html
index 2576aa189a1..5c16d22e4be 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.html
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!--
-  ~ Copyright (c) 2010-2013 Evolveum
+  ~ Copyright (c) 2010-2015 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
index a4a3d183ca5..17f24d02dba 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Evolveum
+ * Copyright (c) 2010-2015 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -104,73 +104,40 @@
 import java.util.Set;
 
 /**
+ * Used as a main component of the Org tree page.
+ * 
  * todo create function computeHeight() in midpoint.js, update height properly when in "mobile" mode... [lazyman]
  * todo implement midpoint theme for tree [lazyman]
  *
  * @author lazyman
  */
-public class TreeTablePanel extends SimplePanel<String> {
+public class TreeTablePanel extends AbstractTreeTablePanel {
 
     private static final Trace LOGGER = TraceManager.getTrace(TreeTablePanel.class);
 
-    private static final int CONFIRM_DELETE = 0;
-    private static final int CONFIRM_DELETE_ROOT = 1;
-
-    private static final String DOT_CLASS = TreeTablePanel.class.getName() + ".";
-    private static final String OPERATION_DELETE_OBJECTS = DOT_CLASS + "deleteObjects";
-    private static final String OPERATION_DELETE_OBJECT = DOT_CLASS + "deleteObject";
-    private static final String OPERATION_MOVE_OBJECTS = DOT_CLASS + "moveObjects";
-    private static final String OPERATION_MOVE_OBJECT = DOT_CLASS + "moveObject";
-    private static final String OPERATION_UPDATE_OBJECTS = DOT_CLASS + "updateObjects";
-    private static final String OPERATION_UPDATE_OBJECT = DOT_CLASS + "updateObject";
-    private static final String OPERATION_RECOMPUTE = DOT_CLASS + "recompute";
-
-    private static final String ID_TREE = "tree";
-    private static final String ID_TREE_CONTAINER = "treeContainer";
-    private static final String ID_CONTAINER_CHILD_ORGS = "childOrgContainer";
-    private static final String ID_CONTAINER_MANAGER = "managerContainer";
-    private static final String ID_CONTAINER_MEMBER = "memberContainer";
-    private static final String ID_CHILD_TABLE = "childUnitTable";
-    private static final String ID_MANAGER_TABLE = "managerTable";
-    private static final String ID_MEMBER_TABLE = "memberTable";
-    private static final String ID_FORM = "form";
-    private static final String ID_CONFIRM_DELETE_POPUP = "confirmDeletePopup";
-    private static final String ID_MOVE_POPUP = "movePopup";
-    private static final String ID_ADD_DELETE_POPUP = "addDeletePopup";
-    private static final String ID_TREE_MENU = "treeMenu";
-    private static final String ID_TREE_HEADER = "treeHeader";
-    private static final String ID_SEARCH_FORM = "searchForm";
-    private static final String ID_BASIC_SEARCH = "basicSearch";
-    private static final String ID_SEARCH_SCOPE = "searchScope";
-
-    private static final String SEARCH_SCOPE_SUBTREE = "subtree";
-    private static final String SEARCH_SCOPE_ONE = "one";
-    private static final List<String> SEARCH_SCOPE_VALUES = Arrays.asList( SEARCH_SCOPE_SUBTREE, SEARCH_SCOPE_ONE);
-    
-    private IModel<OrgTreeDto> selected = new LoadableModel<OrgTreeDto>() {
-
-        @Override
-        protected OrgTreeDto load() {
-            TabbedPanel currentTabbedPanel = null;
-            MidPointAuthWebSession session = TreeTablePanel.this.getSession();
-            SessionStorage storage = session.getSessionStorage();
-            if (getTree().findParent(TabbedPanel.class) != null) {
-                currentTabbedPanel = getTree().findParent(TabbedPanel.class);
-                int tabId = currentTabbedPanel.getSelectedTab();
-                if (storage.getUsers().getSelectedTabId() != -1 && tabId != storage.getUsers().getSelectedTabId()){
-                    storage.getUsers().setSelectedItem(null);
-                }
-            }
-            if (storage.getUsers().getSelectedItem() != null){
-                return storage.getUsers().getSelectedItem();
-            } else {
-                return getRootFromProvider();
-            }
-        }
-    };
-
     public TreeTablePanel(String id, IModel<String> rootOid) {
         super(id, rootOid);
+        
+        selected = new LoadableModel<OrgTreeDto>() {
+            @Override
+            protected OrgTreeDto load() {
+                TabbedPanel currentTabbedPanel = null;
+                MidPointAuthWebSession session = TreeTablePanel.this.getSession();
+                SessionStorage storage = session.getSessionStorage();
+                if (getTree().findParent(TabbedPanel.class) != null) {
+                    currentTabbedPanel = getTree().findParent(TabbedPanel.class);
+                    int tabId = currentTabbedPanel.getSelectedTab();
+                    if (storage.getUsers().getSelectedTabId() != -1 && tabId != storage.getUsers().getSelectedTabId()){
+                        storage.getUsers().setSelectedItem(null);
+                    }
+                }
+                if (storage.getUsers().getSelectedItem() != null){
+                    return storage.getUsers().getSelectedItem();
+                } else {
+                    return getRootFromProvider();
+                }
+            }
+        };
     }
 
     @Override
@@ -455,34 +422,6 @@ public boolean isVisible() {
         memberContainer.add(memberTablePanel);
     }
 
-    /**
-     * TODO - test search
-     * */
-    private void initSearch() {
-        Form form = new Form(ID_SEARCH_FORM);
-        form.setOutputMarkupId(true);
-        add(form);
-        
-        
-        DropDownChoice<String> seachScrope = new DropDownChoice<String>(ID_SEARCH_SCOPE, Model.of(SEARCH_SCOPE_SUBTREE),
-        		SEARCH_SCOPE_VALUES, new StringResourceChoiceRenderer("TreeTablePanel.search.scope"));
-        form.add(seachScrope);
-
-        BasicSearchPanel basicSearch = new BasicSearchPanel(ID_BASIC_SEARCH, new Model()) {
-
-            @Override
-            protected void clearSearchPerformed(AjaxRequestTarget target) {
-                clearTableSearchPerformed(target);
-            }
-
-            @Override
-            protected void searchPerformed(AjaxRequestTarget target) {
-                tableSearchPerformed(target);
-            }
-        };
-        form.add(basicSearch);
-    }
-
     private List<InlineMenuItem> createTreeMenu() {
         List<InlineMenuItem> items = new ArrayList<>();
 
@@ -565,14 +504,6 @@ public String getObject() {
         };
     }
 
-    private OrgTreeDto getRootFromProvider() {
-        TableTree<OrgTreeDto, String> tree = getTree();
-        ITreeProvider<OrgTreeDto> provider = tree.getProvider();
-        Iterator<? extends OrgTreeDto> iterator = provider.getRoots();
-
-        return iterator.hasNext() ? iterator.next() : null;
-    }
-
     private List<IColumn<OrgTableDto, String>> createChildTableColumns() {
         List<IColumn<OrgTableDto, String>> columns = new ArrayList<>();
 
@@ -999,14 +930,6 @@ private void movePerformed(AjaxRequestTarget target, OrgUnitBrowser.Operation op
         dialog.show(target);
     }
 
-    private PrismReferenceValue createPrismRefValue(OrgDto dto) {
-        PrismReferenceValue value = new PrismReferenceValue();
-        value.setOid(dto.getOid());
-        value.setRelation(dto.getRelation());
-        value.setTargetType(ObjectTypes.getObjectType(dto.getType()).getTypeQName());
-        return value;
-    }
-
     private ObjectDelta createMoveDelta(PrismObject<OrgType> orgUnit, OrgTreeDto oldParent, OrgTableDto newParent,
                                         OrgUnitBrowser.Operation operation) {
         ObjectDelta delta = orgUnit.createDelta(ChangeType.MODIFY);
@@ -1088,30 +1011,6 @@ private void moveConfirmedPerformed(AjaxRequestTarget target, OrgTreeDto oldPare
         refreshTabbedPanel(target);
     }
 
-    private void refreshTabbedPanel(AjaxRequestTarget target) {
-        PageBase page = getPageBase();
-
-        TabbedPanel tabbedPanel = findParent(TabbedPanel.class);
-        IModel<List<ITab>> tabs = tabbedPanel.getTabs();
-
-        if (tabs instanceof LoadableModel) {
-            ((LoadableModel) tabs).reset();
-        }
-
-        tabbedPanel.setSelectedTab(0);
-
-        target.add(tabbedPanel);
-        target.add(page.getFeedbackPanel());
-    }
-
-    private TableTree<OrgTreeDto, String> getTree() {
-        return (TableTree<OrgTreeDto, String>) get(createComponentPath(ID_TREE_CONTAINER, ID_TREE));
-    }
-
-    private WebMarkupContainer getOrgChildContainer() {
-        return (WebMarkupContainer) get(createComponentPath(ID_FORM, ID_CONTAINER_CHILD_ORGS));
-    }
-
     private WebMarkupContainer getMemberContainer() {
         return (WebMarkupContainer) get(createComponentPath(ID_FORM, ID_CONTAINER_MEMBER));
     }
@@ -1120,10 +1019,6 @@ private WebMarkupContainer getManagerContainer() {
         return (WebMarkupContainer) get(createComponentPath(ID_FORM, ID_CONTAINER_MANAGER));
     }
 
-    private TablePanel getOrgChildTable() {
-        return (TablePanel) get(createComponentPath(ID_FORM, ID_CONTAINER_CHILD_ORGS, ID_CHILD_TABLE));
-    }
-
     private TablePanel getMemberTable() {
         return (TablePanel) get(createComponentPath(ID_FORM, ID_CONTAINER_MEMBER, ID_MEMBER_TABLE));
     }
@@ -1149,52 +1044,6 @@ private void selectTreeItemPerformed(AjaxRequestTarget target) {
         target.add(get(ID_SEARCH_FORM));
     }
 
-    private ObjectQuery createOrgChildQuery() {
-        OrgTreeDto dto = selected.getObject();
-        String oid = dto != null ? dto.getOid() : getModel().getObject();
-
-        BasicSearchPanel<String> basicSearch = (BasicSearchPanel) get(createComponentPath(ID_SEARCH_FORM, ID_BASIC_SEARCH));
-        String object = basicSearch.getModelObject();
-
-        DropDownChoice<String> searchScopeChoice = (DropDownChoice) get(createComponentPath(ID_SEARCH_FORM, ID_SEARCH_SCOPE));
-        String scope = searchScopeChoice.getModelObject();
-
-        if (StringUtils.isBlank(object)) {
-        	object = null;
-        }
-        
-        OrgFilter org;
-        if (object == null || SEARCH_SCOPE_ONE.equals(scope)) {
-        	org = OrgFilter.createOrg(oid, OrgFilter.Scope.ONE_LEVEL);
-        } else {
-        	org = OrgFilter.createOrg(oid, OrgFilter.Scope.SUBTREE);
-        }
-
-        if (object == null) {
-            return ObjectQuery.createObjectQuery(org);
-        }
-        
-        PageBase page = getPageBase();
-        PrismContext context = page.getPrismContext();
-
-        PolyStringNormalizer normalizer = context.getDefaultPolyStringNormalizer();
-        String normalizedString = normalizer.normalize(object);
-        if (StringUtils.isEmpty(normalizedString)) {
-            return ObjectQuery.createObjectQuery(org);
-        }
-
-        SubstringFilter substring =  SubstringFilter.createSubstring(ObjectType.F_NAME, ObjectType.class, context,
-                PolyStringNormMatchingRule.NAME, normalizedString);
-
-        AndFilter and = AndFilter.createAnd(org, substring);
-        ObjectQuery query = ObjectQuery.createObjectQuery(and);
-        
-        if(LOGGER.isTraceEnabled()){
-            LOGGER.trace("Searching child rgs of org {} with query:\n{}", oid, query.debugDump());
-        }
-
-        return query;
-    }
 
     private ObjectQuery createManagerTableQuery(){
         ObjectQuery query = null;
@@ -1356,7 +1205,8 @@ private void updateActivationPerformed(AjaxRequestTarget target, boolean enable)
         refreshTable(target);
     }
 
-    private void refreshTable(AjaxRequestTarget target) {
+    @Override
+    protected void refreshTable(AjaxRequestTarget target) {
         ObjectDataProvider orgProvider = (ObjectDataProvider) getOrgChildTable().getDataTable().getDataProvider();
         orgProvider.clearCache();
 
@@ -1489,17 +1339,6 @@ private void deleteRootConfirmedPerformed(AjaxRequestTarget target) {
         refreshTabbedPanel(target);
     }
 
-    private void clearTableSearchPerformed(AjaxRequestTarget target) {
-        BasicSearchPanel basicSearch = (BasicSearchPanel) get(createComponentPath(ID_SEARCH_FORM, ID_BASIC_SEARCH));
-        basicSearch.getModel().setObject(null);
-
-        refreshTable(target);
-    }
-
-    private void tableSearchPerformed(AjaxRequestTarget target) {
-        refreshTable(target);
-    }
-
     private static class TreeStateModel extends AbstractReadOnlyModel<Set<OrgTreeDto>> {
 
         private TreeStateSet<OrgTreeDto> set = new TreeStateSet<OrgTreeDto>();