diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js
index b5685994c..6ad41dbf8 100644
--- a/modules/admin/tpl/js/admin.js
+++ b/modules/admin/tpl/js/admin.js
@@ -579,7 +579,7 @@ $('.modulefinder').xeModuleFinder();
 // Module Search : A New Version Of Module Finder
 jQuery(function($){
 
-$.fn.xeModuleSearch = function(){
+_xeModuleSearch = function(){
 	var t = this;
 	var $t = $(this);
 
@@ -763,7 +763,12 @@ $.fn.xeModuleSearch = function(){
 
 	return this;
 };
-$('.moduleSearch').each($.fn.xeModuleSearch);
+
+$.fn.xeModuleSearch = function(){
+	$(this).each(_xeModuleSearch);
+};
+
+$('.moduleSearch').xeModuleSearch();
 });
 
 // Sortable table
diff --git a/modules/admin/tpl/js/admin.min.js b/modules/admin/tpl/js/admin.min.js
index 6e98a2f65..6191edf6c 100644
--- a/modules/admin/tpl/js/admin.min.js
+++ b/modules/admin/tpl/js/admin.min.js
@@ -17,12 +17,12 @@ jQuery(function(a){a.fn.xeModuleFinder=function(){this.not(".xe-module-finder").
 k;f++)e=a("<li />").appendTo(b),a('<button type="button" />').text(g[f].domain).data("site_srl",g[f].site_srl).appendTo(e)}})}).end().find(".tgContent.suggestion").delegate("button","click",function(){var d,b;d=a(this);b=d.closest(".modulefinder");b.find("a.tgAnchor.findsite").trigger("close.tc");a.exec_json("module.procModuleAdminGetList",{site_srl:d.data("site_srl")},function(e){var d=e.module_list,g;if(!e.error&&d){e=b.find(".moduleList").data("module_list",d).removeAttr("disabled").empty();for(g in d)d.hasOwnProperty(g)&&
 a("<option />").attr("value",g).text(d[g].title).appendTo(e);e.prop("selectedIndex",0).change().focus();e.is(":visible")||e.slideDown(100,function(){b.find(".moduleIdList:not(:visible)").slideDown(100).trigger("show")}).trigger("show")}})}).end().find(".moduleList,.moduleIdList").hide().end().find(".moduleList").change(function(){var d,b,e;d=a(this);b=d.val();e=d.data("module_list");if(e[b]){e=e[b].list;d=d.closest(".modulefinder").find(".moduleIdList").removeAttr("disabled").empty();for(var j in e)e.hasOwnProperty(j)&&
 a("<option />").attr("value",e[j].module_srl).text(e[j].browser_title).appendTo(d);d.prop("selectedIndex",0).change()}});return this};a(".modulefinder").xeModuleFinder()});
-jQuery(function(a){a.fn.xeModuleSearch=function(){function d(a,b){var e;a.find("li div").width("");a.css("height","");a.css("overflow-y","");a.height()>b&&(e=a.find("li div"),e.width(e.width()-20+"px"),a.css("height",b+"px"),a.css("overflow-y","auto"))}function b(b){var e,f=RegExp(b,"ig"),g=q;h.empty();i=0;for(c=g.length;i<c;i++){e=g[i].domain;if(b){if(!e.match(f))continue;e=e.replace(f,function(a){return'<span class="highlight">'+a+"</span>"})}$li=a("<li />").appendTo(h);a('<a href="#" >').html("<div>"+
+jQuery(function(a){_xeModuleSearch=function(){function d(a,b){var e;a.find("li div").width("");a.css("height","");a.css("overflow-y","");a.height()>b&&(e=a.find("li div"),e.width(e.width()-20+"px"),a.css("height",b+"px"),a.css("overflow-y","auto"))}function b(b){var e,f=RegExp(b,"ig"),g=q;h.empty();i=0;for(c=g.length;i<c;i++){e=g[i].domain;if(b){if(!e.match(f))continue;e=e.replace(f,function(a){return'<span class="highlight">'+a+"</span>"})}$li=a("<li />").appendTo(h);a('<a href="#" >').html("<div>"+
 e+'</div><span class="icon-circle-arrow-right" style="display:inline-block;float:right;width:16px;height:16px;"></span>').data("site_srl",g[i].site_srl).appendTo($li)}d(h,x-l.parent("DIV").height())}var e=this,j=a(this),g=j.find(".moduleSearchWindow"),f=g.find(".siteList"),k=g.find(".moduleTypeList"),n=g.find(".moduleInstanceList"),h=f.find("UL"),o=k.find("UL"),m=n.find("UL"),l=g.find("INPUT.siteListSearchInput"),q,x=280;l.keyup(function(){b(l.val())});"undefined"==typeof console&&(console={log:function(){}});
 j.not(".xe-module-search").addClass("xe-module-search").find("a.tgAnchor.moduleSearch").bind("before-open.tc",function(){var e;e=a(this);h.empty();m.empty();k.hide();n.hide();a.exec_json("admin.getSiteAllList",{domain:""},function(d){var h=d.site_list;d.error||!a.isArray(h)?e.trigger("close.tc"):(q=h,b(l.val()),l.focus())})}).end().find(".tgContent .siteListUL").delegate("a","click",function(b){var e;e=a(this);e.closest(".modulefinder");o.empty();n.hide();a.exec_json("module.procModuleAdminGetList",
 {site_srl:e.data("site_srl")},function(b){var f=b.module_list,l;if(!b.error&&f){for(l in f)f.hasOwnProperty(l)&&($li=a("<li />").appendTo(o),a('<a href="#" >').html("<div>"+f[l].title+'</div><span class="icon-circle-arrow-right" style="display:inline-block;float:right;width:16px;height:16px;"></span>').data("moduleInstanceList",f[l].list).appendTo($li));g.find(".moduleTypeList").show();d(o,x);h.find("li").removeClass("on");e.parent("li").addClass("on")}});b.preventDefault()}).end().find(".moduleTypeListUL").delegate("a",
 "click",function(b){var f,h;f=a(this);if(h=f.data("moduleInstanceList")){e.sSelectedModuleType=f.text();m.empty();for(var l in h)h.hasOwnProperty(l)&&($li=a("<li />").appendTo(m),a('<a href="#" >').html("<div>"+h[l].browser_title+"</div>").data("module_srl",h[l].module_srl).appendTo($li));n.show();d(m,x);o.find("li").removeClass("on");f.parent("li").addClass("on");b.preventDefault()}}).end().find(".moduleInstanceListUL").delegate("a","click",function(b){$this=a(this);e.sSelectedModuleInstanceName=
-$this.text();e.sSelectedModuleSrl=$this.data("module_srl");j.trigger("moduleSelect",[e.sSelectedModuleType,e.sSelectedModuleInstanceName,e.sSelectedModuleSrl]);a(".tgAnchor.moduleSearch").trigger("close.tc");b.preventDefault()});return this};a(".moduleSearch").each(a.fn.xeModuleSearch)});
+$this.text();e.sSelectedModuleSrl=$this.data("module_srl");j.trigger("moduleSelect",[e.sSelectedModuleType,e.sSelectedModuleInstanceName,e.sSelectedModuleSrl]);a(".tgAnchor.moduleSearch").trigger("close.tc");b.preventDefault()});return this};a.fn.xeModuleSearch=function(){a(this).each(_xeModuleSearch)};a(".moduleSearch").xeModuleSearch()});
 jQuery(function(a){function d(a,b){for(var d=0,f=0;a&&a!=b;)d+=a.offsetTop,f+=a.offsetLeft,a=a.offsetParent;return{top:d,left:f}}var b=a('<tr class="placeholder"><td>&nbsp;</td></tr>');a.fn.xeSortableTable=function(){this.not(".xe-sortable-table").addClass("xe-sortable-table").delegate("button.dragBtn","mousedown.st",function(e){var j,g,f,k,n,h,o,m,l,q;if(1==e.which){g=a(this);f=g.closest("tr");k=g.closest("table");q=k.get(0).offsetParent;g=f.height();n=f.width();before_event=a.Event("before-drag.st");
 k.trigger(before_event);if(before_event.isDefaultPrevented())return!1;j=e.pageY;h=d(f.get(0),q);$clone=f.attr("target",!0).clone(!0).appendTo(k);l=(e=k.find("thead th")).length;e.filter("[colspan]").attr("colspan",function(a,b){l+=b-1});b.find("td").attr("colspan",l);o=[];k.find("tbody>tr:not([target],.sticky,:hidden)").each(function(){var b=a(this),e;e=d(this,q);o.push({top:e.top,bottom:e.top+b.height(),$item:b})});$clone.addClass("draggable").css({position:"absolute",opacity:0.6,width:n,height:g,
 left:h.left,top:h.top,zIndex:100});b.css({position:"absolute",opacity:0.6,width:n,height:"10px",left:h.left,top:h.top,backgroundColor:"#bbb",overflow:"hidden",zIndex:99}).appendTo(k);f.css("opacity",0.6);a(document).unbind("mousedown.st mouseup.st").bind("mousemove.st",function(a){var e,d,f;m=null;a=h.top-(j-a.pageY);e=0;for(d=o.length;e<d;e++)f=o[e],e&&f.top>a||e<d-1&&f.bottom<a||(m={element:f.$item},f.top>a-12?(m.state="before",b.css("top",f.top-5)):(m.state="after",b.css("top",f.bottom-5)));$clone.css({top:a})}).bind("mouseup.st",