diff --git a/modules/comment/comment.model.php b/modules/comment/comment.model.php
index 70e3b20fc..d025b578c 100644
--- a/modules/comment/comment.model.php
+++ b/modules/comment/comment.model.php
@@ -804,7 +804,7 @@ class commentModel extends comment
 				case 'content' :
 					if($search_keyword)
 					{
-						$search_keyword = str_replace(' ', '%', $search_keyword);
+						$search_keyword = trim(utf8_normalize_spaces($search_keyword));
 					}
 
 					$args->s_content = $search_keyword;
@@ -960,7 +960,7 @@ class commentModel extends comment
 				case 'content' :
 					if($search_keyword)
 					{
-						$search_keyword = str_replace(' ', '%', $search_keyword);
+						$search_keyword = trim(utf8_normalize_spaces($search_keyword));
 					}
 
 					$args->s_content = $search_keyword;
diff --git a/modules/comment/queries/getTotalCommentCountByGroupStatus.xml b/modules/comment/queries/getTotalCommentCountByGroupStatus.xml
index 6516a1f64..7805a5654 100644
--- a/modules/comment/queries/getTotalCommentCountByGroupStatus.xml
+++ b/modules/comment/queries/getTotalCommentCountByGroupStatus.xml
@@ -11,7 +11,7 @@
         <condition operation="notin" column="module_srl" var="exclude_module_srl" pipe="and" />
         <condition operation="equal" column="is_secret" var="s_is_secret" pipe="and" />
         <group pipe="and">
-            <condition operation="like" column="content" var="s_content" pipe="or" />
+            <condition operation="search" column="content" var="s_content" pipe="or" />
             <condition operation="like_prefix" column="user_name" var="s_user_name" pipe="or" />
             <condition operation="like_prefix" column="nick_name" var="s_nick_name" pipe="or" />
             <condition operation="like" column="email_address" var="s_email_address" pipe="or" />
diff --git a/modules/comment/queries/getTotalCommentCountWithinMemberByGroupStatus.xml b/modules/comment/queries/getTotalCommentCountWithinMemberByGroupStatus.xml
index dabd55ab1..9d72bc06b 100644
--- a/modules/comment/queries/getTotalCommentCountWithinMemberByGroupStatus.xml
+++ b/modules/comment/queries/getTotalCommentCountWithinMemberByGroupStatus.xml
@@ -12,7 +12,7 @@
         <condition operation="equal" column="member.member_srl" var="comments.member_srl" notnull="notnull" pipe="and" />
         <condition operation="equal" column="comments.is_secret" var="s_is_secret" pipe="and" />
         <group pipe="and">
-            <condition operation="like" column="comments.content" var="s_content" />
+            <condition operation="search" column="comments.content" var="s_content" />
             <condition operation="like_prefix" column="comments.user_name" var="s_user_name" pipe="or" />
             <condition operation="like_prefix" column="comments.nick_name" var="s_nick_name" pipe="or" />
             <condition operation="like" column="comments.email_address" var="s_email_address" pipe="or" />
diff --git a/modules/comment/queries/getTotalCommentList.xml b/modules/comment/queries/getTotalCommentList.xml
index cffd06614..17590bb39 100644
--- a/modules/comment/queries/getTotalCommentList.xml
+++ b/modules/comment/queries/getTotalCommentList.xml
@@ -22,7 +22,7 @@
 		<condition operation="in" column="comments.status" var="statusList" pipe="and" />
 		<condition operation="in" column="comments.member_srl" var="s_member_srl" pipe="and" />
 		<group pipe="and">
-            <condition operation="like" column="comments.content" var="s_content" pipe="or" />
+            <condition operation="search" column="comments.content" var="s_content" pipe="or" />
             <condition operation="like_prefix" column="comments.user_name" var="s_user_name" pipe="or" />
             <condition operation="like_prefix" column="comments.nick_name" var="s_nick_name" pipe="or" />
             <condition operation="like" column="comments.email_address" var="s_email_address" pipe="or" />
diff --git a/modules/comment/queries/getTotalCommentListWithinMember.xml b/modules/comment/queries/getTotalCommentListWithinMember.xml
index e01d28d08..00705ace5 100644
--- a/modules/comment/queries/getTotalCommentListWithinMember.xml
+++ b/modules/comment/queries/getTotalCommentListWithinMember.xml
@@ -16,7 +16,7 @@
 		<condition operation="in" column="comments.status" var="statusList" pipe="and" />
 		<condition operation="in" column="comments.member_srl" var="s_member_srl" pipe="and" />
         <group pipe="and">
-            <condition operation="like" column="comments.content" var="s_content" />
+            <condition operation="search" column="comments.content" var="s_content" />
             <condition operation="like_prefix" column="comments.user_name" var="s_user_name" pipe="or" />
             <condition operation="like_prefix" column="comments.nick_name" var="s_nick_name" pipe="or" />
             <condition operation="like" column="comments.email_address" var="s_email_address" pipe="or" />
diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index 294962447..98b6f1b9a 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -1317,7 +1317,7 @@ class documentModel extends document
 				case 'tag' :
 				case 'title_content' :
 					$use_division = true;
-					$search_keyword = str_replace(' ', '%', $search_keyword);
+					$search_keyword = trim(utf8_normalize_spaces($search_keyword));
 					if($search_target == 'title_content')
 					{
 						$args->s_title = $search_keyword;
diff --git a/modules/document/queries/getDocumentCount.xml b/modules/document/queries/getDocumentCount.xml
index a33ce2773..9edba2211 100644
--- a/modules/document/queries/getDocumentCount.xml
+++ b/modules/document/queries/getDocumentCount.xml
@@ -13,8 +13,8 @@
         <condition operation="equal" column="member_srl" var="member_srl" filter="number" pipe="and" />
         <condition operation="in" column="status" var="statusList" pipe="and" />
         <group pipe="and">
-            <condition operation="like" column="title" var="s_title" />
-            <condition operation="like" column="content" var="s_content" pipe="and" />
+            <condition operation="search" column="title" var="s_title" />
+            <condition operation="search" column="content" var="s_content" pipe="and" />
             <condition operation="equal" column="user_name" var="s_user_name" pipe="and" />
             <condition operation="equal" column="user_id" var="s_user_id" pipe="or" />
             <condition operation="equal" column="nick_name" var="s_nick_name" pipe="or" />
diff --git a/modules/document/queries/getDocumentList.xml b/modules/document/queries/getDocumentList.xml
index a9f7de549..47f71318f 100644
--- a/modules/document/queries/getDocumentList.xml
+++ b/modules/document/queries/getDocumentList.xml
@@ -17,8 +17,8 @@
             <condition operation="below" column="list_order" var="last_division" pipe="and" />
         </group>
         <group pipe="and">
-            <condition operation="like" column="title" var="s_title" />
-            <condition operation="like" column="content" var="s_content" pipe="or" />
+            <condition operation="search" column="title" var="s_title" />
+            <condition operation="search" column="content" var="s_content" pipe="or" />
             <condition operation="like_prefix" column="user_name" var="s_user_name" pipe="or" />
             <condition operation="like_prefix" column="user_id" var="s_user_id" pipe="or" />
             <condition operation="like_prefix" column="nick_name" var="s_nick_name" pipe="or" />
diff --git a/modules/document/queries/getDocumentListWithExtraVars.xml b/modules/document/queries/getDocumentListWithExtraVars.xml
index 59e3f876a..db2342f15 100644
--- a/modules/document/queries/getDocumentListWithExtraVars.xml
+++ b/modules/document/queries/getDocumentListWithExtraVars.xml
@@ -25,8 +25,8 @@
 		<condition operation="more" column="documents.last_update" var="start_date" pipe="and" />
 		<condition operation="less" column="documents.last_update" var="end_date" pipe="and" />
 		<group pipe="and">
-			<condition operation="like" column="documents.title" var="s_title" />
-			<condition operation="like" column="documents.content" var="s_content" pipe="or" />
+			<condition operation="search" column="documents.title" var="s_title" />
+			<condition operation="search" column="documents.content" var="s_content" pipe="or" />
 			<condition operation="like_prefix" column="documents.user_name" var="s_user_name" pipe="or" />
 			<condition operation="like_prefix" column="documents.user_id" var="s_user_id" pipe="or" />
 			<condition operation="like_prefix" column="documents.nick_name" var="s_nick_name" pipe="or" />