diff --git a/app/assets/javascripts/inc/search.js b/app/assets/javascripts/inc/search.js
index 50f3835f..e8bc8405 100644
--- a/app/assets/javascripts/inc/search.js
+++ b/app/assets/javascripts/inc/search.js
@@ -4,33 +4,45 @@
 
 //extended jquery to search fast.
 $.extend($.expr[':'], {
-	'containsi': function (elem, i, match, array) {
-		return (elem.textContent || elem.innerText || '').toLowerCase().indexOf((match[3] || "").toLowerCase()) >= 0;
-	}
+    'containsi': function (elem, i, match, array) {
+        return (elem.textContent || elem.innerText || '').toLowerCase().indexOf((match[3] || "").toLowerCase()) >= 0;
+    }
 });
 var interval,sval;
 $(document).ready(function(){
-	$("#user_filter").keyup(function(e){
-		if((e.which>96 && e.which<123) || (e.which>64 && e.which<92) || (e.which == 32) || (e.which == 8)){ 
-			sval = $(this).val();
-			$(".checkbox").popover("hide");
-			$("div.checkblock").hide();
-			clearInterval(interval);
-			interval = setInterval(waitForSearch,1000);
-		}
-	})
+    $("#user_filter").keyup(function(e){
+        if((e.which>96 && e.which<123) || (e.which>64 && e.which<92) || (e.which == 32) || (e.which == 8)){ 
+            sval = $(this).val();
+            $(".checkbox").popover("hide");
+            $("div.checkblock").hide();
+            clearInterval(interval);
+            interval = setInterval(waitForSearch,1000);
+        }
+    })
 })
 var waitForSearch = function(){
-	if(sval){
-		var totalfoundbyname = $("div#users_checkbox_ary label.member-name:containsi("+sval+")").length
-		if(totalfoundbyname!=0){
-			$("div#users_checkbox_ary label.member-name:containsi("+sval+")").parent().parent().show();				
-		}else if(totalfoundbyname==0){
-			$("div#users_checkbox_ary div.for_unit:containsi("+sval+")").parent().show();
-		}	
-	}else{
-		$(".checkbox").popover('hide');	
-		$("div.checkblock").show();
-	}
-	clearInterval(interval);
+    if(sval){
+        var re1 = new RegExp("^[\u4E00-\uFA29]*$"); //Chinese character range 
+        var re2 = new RegExp("^[\uE7C7-\uE7F3]*$");
+        if ((re1.test(sval) && (re2.test(sval)))){
+
+            var totalfoundbyname = $("div#users_checkbox_ary label.member-name:contains("+sval+")").length
+            if(totalfoundbyname!=0){
+                $("div#users_checkbox_ary label.member-name:contains("+sval+")").parent().parent().show();                
+            }else if(totalfoundbyname==0){
+                $("div#users_checkbox_ary div.for_unit:contains("+sval+")").parent().show();
+            }
+        }else{
+            var totalfoundbyname = $("div#users_checkbox_ary label.member-name:containsi("+sval+")").length
+            if(totalfoundbyname!=0){
+                $("div#users_checkbox_ary label.member-name:containsi("+sval+")").parent().parent().show();                
+            }else if(totalfoundbyname==0){
+                $("div#users_checkbox_ary div.for_unit:containsi("+sval+")").parent().show();
+            }
+        }    
+    }else{
+        $(".checkbox").popover('hide');    
+        $("div.checkblock").show();
+    }
+    clearInterval(interval);
 }
\ No newline at end of file