diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 6fa8b00b6c5..357d6580fb2 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -50,8 +50,8 @@
             android:icon="@drawable/ic_reduce_bright_colors"
             android:persistent="false"
             android:title="@string/reduce_bright_colors_preference_title"
-            settings:controller="com.android.settings.accessibility.ReduceBrightColorsPreferenceController"
-            settings:keywords="@string/keywords_reduce_bright_colors"/>
+            settings:keywords="@string/keywords_reduce_bright_colors"
+            settings:controller="com.android.settings.accessibility.ReduceBrightColorsPreferenceController"/>
 
         <SwitchPreference
             android:key="dark_ui_mode_accessibility"
@@ -67,6 +67,7 @@
             android:icon="@drawable/ic_accessibility_magnification"
             android:persistent="false"
             android:title="@string/accessibility_screen_magnification_title"
+            settings:keywords="@string/keywords_magnification"
             settings:controller="com.android.settings.accessibility.MagnificationPreferenceController"/>
 
     </PreferenceCategory>
@@ -112,7 +113,7 @@
             android:persistent="false"
             android:summary="@string/live_caption_summary"
             android:title="@string/live_caption_title"
-            settings:searchable="false"
+            settings:keywords="@string/keywords_live_caption"
             settings:controller="com.android.settings.accessibility.LiveCaptionPreferenceController"/>
 
         <Preference
@@ -128,6 +129,7 @@
             android:icon="@drawable/ic_rtt_settings"
             android:summary="@string/summary_placeholder"
             android:title="@string/rtt_settings_title"
+            settings:keywords="@string/keywords_rtt"
             settings:controller="com.android.settings.accessibility.RTTSettingPreferenceController"/>
 
     </PreferenceCategory>
@@ -143,6 +145,7 @@
             android:persistent="false"
             android:summary="@string/accessibility_hearingaid_not_connected_summary"
             android:title="@string/accessibility_hearingaid_title"
+            settings:keywords="@string/keywords_hearing_aids"
             settings:controller="com.android.settings.accessibility.AccessibilityHearingAidPreferenceController"/>
 
         <Preference
diff --git a/res/xml/accessibility_tap_assistance.xml b/res/xml/accessibility_tap_assistance.xml
index b96dee6a6f2..63adc9d5365 100644
--- a/res/xml/accessibility_tap_assistance.xml
+++ b/res/xml/accessibility_tap_assistance.xml
@@ -40,5 +40,6 @@
         android:key="autoclick_preference"
         android:persistent="false"
         android:title="@string/accessibility_autoclick_preference_title"
+        settings:keywords="@string/keywords_auto_click"
         settings:controller="com.android.settings.accessibility.AutoclickPreferenceController"/>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/accessibility_text_and_display.xml b/res/xml/accessibility_text_and_display.xml
index abc5622ee06..659acab5846 100644
--- a/res/xml/accessibility_text_and_display.xml
+++ b/res/xml/accessibility_text_and_display.xml
@@ -43,6 +43,7 @@
         android:icon="@drawable/ic_force_bold"
         android:persistent="false"
         android:title="@string/force_bold_text"
+        settings:keywords="@string/keywords_bold_text"
         settings:controller="com.android.settings.accessibility.FontWeightAdjustmentPreferenceController"/>
 
     <Preference
@@ -51,6 +52,7 @@
         android:key="daltonizer_preference"
         android:persistent="false"
         android:title="@string/accessibility_display_daltonizer_preference_title"
+        settings:keywords="@string/keywords_color_correction"
         settings:controller="com.android.settings.accessibility.DaltonizerPreferenceController"/>
 
     <Preference
@@ -59,6 +61,7 @@
         android:key="toggle_inversion_preference"
         android:persistent="false"
         android:title="@string/accessibility_display_inversion_preference_title"
+        settings:keywords="@string/keywords_color_inversion"
         settings:controller="com.android.settings.accessibility.ColorInversionPreferenceController"/>
 
     <SwitchPreference
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 27bf0ba206f..ab8b3859def 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -105,7 +105,8 @@
     <com.android.settings.display.ScreenZoomPreference
         android:key="display_settings_screen_zoom"
         android:title="@string/screen_zoom_title"
-        android:fragment="com.android.settings.display.ScreenZoomSettings"/>
+        android:fragment="com.android.settings.display.ScreenZoomSettings"
+        settings:keywords="@string/keywords_display_size"/>
 
     <SwitchPreference
         android:key="show_operator_name"
diff --git a/res/xml/display_settings_v2.xml b/res/xml/display_settings_v2.xml
index 50879da9068..e0eb9bba542 100644
--- a/res/xml/display_settings_v2.xml
+++ b/res/xml/display_settings_v2.xml
@@ -80,7 +80,8 @@
         <com.android.settings.display.ScreenZoomPreference
             android:key="display_settings_screen_zoom"
             android:title="@string/screen_zoom_title"
-            android:fragment="com.android.settings.display.ScreenZoomSettings"/>
+            android:fragment="com.android.settings.display.ScreenZoomSettings"
+            settings:keywords="@string/keywords_display_size"/>
     </PreferenceCategory>
 
     <PreferenceCategory