diff --git a/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart
index b89e7735e..ad3ae9591 100644
--- a/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart
+++ b/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart
@@ -16,6 +16,7 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/search_controller.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_receive_time_type.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/search_email_filter.dart';
+import 'package:tmail_ui_user/features/thread/domain/model/search_query.dart';
 import 'package:tmail_ui_user/main/routes/app_routes.dart';
 import 'package:tmail_ui_user/main/routes/route_navigation.dart';
 
@@ -76,9 +77,10 @@ class AdvancedFilterController extends GetxController {
 
   void _updateFilterEmailFromAdvancedSearchView() {
     if (hasKeyWordFilterInputController.text.isNotEmpty) {
-      searchController.updateFilterEmail(hasKeyword: hasKeyWordFilterInputController.text.split(',').toSet());
+      searchController.updateFilterEmail(text: SearchQuery(hasKeyWordFilterInputController.text));
+      searchController.searchInputController.text = hasKeyWordFilterInputController.text;
     } else {
-      searchController.updateFilterEmail(hasKeyword: {});
+      searchController.updateFilterEmail(text: SearchQuery(searchController.searchInputController.text));
     }
 
     if (notKeyWordFilterInputController.text.isNotEmpty) {
@@ -194,7 +196,7 @@ class AdvancedFilterController extends GetxController {
     subjectFilterInputController.text =
         StringConvert.writeNullToEmpty(searchEmailFilter.subject);
     hasKeyWordFilterInputController.text = StringConvert.writeNullToEmpty(
-        searchEmailFilter.hasKeyword.firstOrNull);
+        searchEmailFilter.text?.value);
     notKeyWordFilterInputController.text = StringConvert.writeNullToEmpty(
         searchEmailFilter.notKeyword.firstOrNull);
     dateFilterInputController.text = StringConvert.writeNullToEmpty(
diff --git a/lib/features/mailbox_dashboard/presentation/controller/search_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/search_controller.dart
index 3934b4512..74ade426f 100644
--- a/lib/features/mailbox_dashboard/presentation/controller/search_controller.dart
+++ b/lib/features/mailbox_dashboard/presentation/controller/search_controller.dart
@@ -124,7 +124,6 @@ class SearchController extends BaseController {
     Set<String>? to,
     SearchQuery? text,
     String? subject,
-    Set<String>? hasKeyword,
     Set<String>? notKeyword,
     PresentationMailbox? mailbox,
     EmailReceiveTimeType? emailReceiveTimeType,
@@ -136,7 +135,6 @@ class SearchController extends BaseController {
       to: to,
       text: text,
       subject: subject,
-      hasKeyword: hasKeyword,
       notKeyword: notKeyword,
       mailbox: mailbox,
       emailReceiveTimeType: emailReceiveTimeType,
diff --git a/lib/features/mailbox_dashboard/presentation/model/search/search_email_filter.dart b/lib/features/mailbox_dashboard/presentation/model/search/search_email_filter.dart
index 3cd85c3b8..7e47fc97c 100644
--- a/lib/features/mailbox_dashboard/presentation/model/search/search_email_filter.dart
+++ b/lib/features/mailbox_dashboard/presentation/model/search/search_email_filter.dart
@@ -12,7 +12,6 @@ class SearchEmailFilter {
   final Set<String> to;
   final SearchQuery? text;
   final String? subject;
-  final Set<String> hasKeyword;
   final Set<String> notKeyword;
   final PresentationMailbox? mailbox;
   final EmailReceiveTimeType emailReceiveTimeType;
@@ -26,13 +25,11 @@ class SearchEmailFilter {
     bool? hasAttachment,
     this.text,
     this.subject,
-    Set<String>? hasKeyword,
     Set<String>? notKeyword,
     this.mailbox,
     this.before,
   })  : from = from ?? <String>{},
         to = to ?? <String>{},
-        hasKeyword = hasKeyword ?? <String>{},
         notKeyword = notKeyword ?? <String>{},
         hasAttachment = hasAttachment ?? false,
         emailReceiveTimeType =
@@ -43,7 +40,6 @@ class SearchEmailFilter {
     Set<String>? to,
     SearchQuery? text,
     String? subject,
-    Set<String>? hasKeyword,
     Set<String>? notKeyword,
     PresentationMailbox? mailbox,
     EmailReceiveTimeType? emailReceiveTimeType,
@@ -55,7 +51,6 @@ class SearchEmailFilter {
       to: to ?? this.to,
       text: text ?? this.text,
       subject: subject ?? this.subject,
-      hasKeyword: hasKeyword ?? this.hasKeyword,
       notKeyword: notKeyword ?? this.notKeyword,
       mailbox: mailbox ?? this.mailbox,
       emailReceiveTimeType: emailReceiveTimeType ?? this.emailReceiveTimeType,
@@ -81,8 +76,6 @@ class SearchEmailFilter {
           Operator.AND, to.map((e) => EmailFilterCondition(to: e)).toSet()),
       LogicFilterOperator(
           Operator.AND, from.map((e) => EmailFilterCondition(from: e)).toSet()),
-      LogicFilterOperator(
-          Operator.AND, hasKeyword.map((e) => EmailFilterCondition(hasKeyword: e)).toSet()),
       LogicFilterOperator(
           Operator.AND, notKeyword.map((e) => EmailFilterCondition(notKeyword: e)).toSet()),
       if(moreFilterCondition !=null) moreFilterCondition
@@ -98,7 +91,6 @@ extension SearchEmailFilterExtension on SearchEmailFilter {
       to: to,
       text: text,
       subject: subject,
-      hasKeyword: hasKeyword,
       notKeyword: notKeyword,
       mailbox: mailbox,
       emailReceiveTimeType: emailReceiveTimeType,
diff --git a/lib/features/search/presentation/search_email_controller.dart b/lib/features/search/presentation/search_email_controller.dart
index d4df84a57..fd80f2218 100644
--- a/lib/features/search/presentation/search_email_controller.dart
+++ b/lib/features/search/presentation/search_email_controller.dart
@@ -420,7 +420,6 @@ class SearchEmailController extends BaseController
     Set<String>? to,
     SearchQuery? text,
     String? subject,
-    Set<String>? hasKeyword,
     Set<String>? notKeyword,
     PresentationMailbox? mailbox,
     EmailReceiveTimeType? emailReceiveTimeType,
@@ -432,7 +431,6 @@ class SearchEmailController extends BaseController
       to: to,
       text: text,
       subject: subject,
-      hasKeyword: hasKeyword,
       notKeyword: notKeyword,
       mailbox: mailbox,
       emailReceiveTimeType: emailReceiveTimeType,