diff --git a/o2web/source/x_component_Selector/Unit.js b/o2web/source/x_component_Selector/Unit.js
index cca4498d7592254c7c864e2e7877e16083b72c9e..83bbdef6a61fed67f0a9c5fec490b570dc721126 100644
--- a/o2web/source/x_component_Selector/Unit.js
+++ b/o2web/source/x_component_Selector/Unit.js
@@ -161,21 +161,30 @@ MWF.xApplication.Selector.Unit = new Class({
     },
 
     _listItemByKey: function(callback, failure, key){
-        if (this.options.units.length){
-            var units = [];
-            this.options.units.each(function(u){
-                if (typeOf(u)==="string"){
-                    units.push(u);
-                }
-                if (typeOf(u)==="object"){
-                    units.push(u.distinguishedName);
-                }
-            });
-            key = {"key": key, "unitList": units};
+        if( this.options.expandSubEnable ){
+            if (this.options.units.length){
+                var units = [];
+                this.options.units.each(function(u){
+                    if (typeOf(u)==="string"){
+                        units.push(u);
+                    }
+                    if (typeOf(u)==="object"){
+                        units.push(u.distinguishedName);
+                    }
+                });
+                key = {"key": key, "unitList": units};
+            }
+            this.orgAction.listUnitByKey(function(json){
+                if (callback) callback.apply(this, [json]);
+            }.bind(this), failure, key);
+        }else{
+            if (key){
+                this.initSearchArea(true);
+                this.searchInItems(key);
+            }else{
+                this.initSearchArea(false);
+            }
         }
-        this.orgAction.listUnitByKey(function(json){
-            if (callback) callback.apply(this, [json]);
-        }.bind(this), failure, key);
     },
     _getItem: function(callback, failure, id, async){
         this.orgAction.getUnit(function(json){
diff --git a/o2web/source/x_component_Selector/UnitWithType.js b/o2web/source/x_component_Selector/UnitWithType.js
index d84c17fc0808d4c258632935e2e0098529d64508..b507c6fa69969b19f2db9163dc9d9317e40b0c02 100644
--- a/o2web/source/x_component_Selector/UnitWithType.js
+++ b/o2web/source/x_component_Selector/UnitWithType.js
@@ -73,23 +73,32 @@ MWF.xApplication.Selector.UnitWithType = new Class({
     },
 
     _listItemByKey: function(callback, failure, key){
-        key = {"key": key};
-        if (this.options.units.length){
-            var units = [];
-            this.options.units.each(function(u){
-                if (typeOf(u)==="string"){
-                    units.push(u);
-                }
-                if (typeOf(u)==="object"){
-                    units.push(u.distinguishedName);
-                }
-            });
-            key.unitList = units;
+        if( this.options.expandSubEnable ){
+            key = {"key": key};
+            if (this.options.units.length){
+                var units = [];
+                this.options.units.each(function(u){
+                    if (typeOf(u)==="string"){
+                        units.push(u);
+                    }
+                    if (typeOf(u)==="object"){
+                        units.push(u.distinguishedName);
+                    }
+                });
+                key.unitList = units;
+            }
+            if (this.options.unitType) key.type = this.options.unitType;
+            this.orgAction.listUnitByKey(function(json){
+                if (callback) callback.apply(this, [json]);
+            }.bind(this), failure, key);
+        }else{
+            if (key){
+                this.initSearchArea(true);
+                this.searchInItems(key);
+            }else{
+                this.initSearchArea(false);
+            }
         }
-        if (this.options.unitType) key.type = this.options.unitType;
-        this.orgAction.listUnitByKey(function(json){
-            if (callback) callback.apply(this, [json]);
-        }.bind(this), failure, key);
     },
     _getItem: function(callback, failure, id, async){
         this.orgAction.getUnit(function(json){