diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 5e0c06d..6b41349 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -23,6 +23,7 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.pm.PackageManager;
+import android.database.DataSetObserver;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.preference.Preference;
@@ -47,7 +48,7 @@
     private static final String TAG = "SettingsPreferenceFragment";
 
     private static final int MENU_HELP = Menu.FIRST + 100;
-    private static final int DELAY_HIGHLIGHT_DURATION_MILLIS = 300;
+    private static final int DELAY_HIGHLIGHT_DURATION_MILLIS = 400;
 
     private static final String SAVE_HIGHLIGHTED_KEY = "android:preference_highlighted";
 
@@ -61,6 +62,18 @@
     private String mPreferenceKey;
     private boolean mPreferenceHighlighted = false;
 
+    private DataSetObserver mDataSetObserver = new DataSetObserver() {
+        @Override
+        public void onChanged() {
+            highlightPreferenceIfNeeded();
+        }
+
+        @Override
+        public void onInvalidated() {
+            highlightPreferenceIfNeeded();
+        }
+    };
+
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -99,11 +112,18 @@
 
     @Override
     protected void onBindPreferences() {
-        highlightPreferenceIfNeeded();
+        getPreferenceScreen().getRootAdapter().registerDataSetObserver(mDataSetObserver);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        getPreferenceScreen().getRootAdapter().unregisterDataSetObserver(mDataSetObserver);
     }
 
     public void highlightPreferenceIfNeeded() {
-        if (!mPreferenceHighlighted &&!TextUtils.isEmpty(mPreferenceKey)) {
+        if (isAdded() && !mPreferenceHighlighted &&!TextUtils.isEmpty(mPreferenceKey)) {
             highlightPreference(mPreferenceKey);
         }
     }
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 43f844d..95d2b03 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -565,7 +565,13 @@
             final int serviceCount = services.size();
             for (int i = 0; i < serviceCount; i++) {
                 PrintServiceInfo service = services.get(i);
+
+                ComponentName componentName = new ComponentName(
+                        service.getResolveInfo().serviceInfo.packageName,
+                        service.getResolveInfo().serviceInfo.name);
+
                 SearchIndexableRaw indexable = new SearchIndexableRaw(context);
+                indexable.key = componentName.flattenToString();
                 indexable.title = service.getResolveInfo().loadLabel(packageManager).toString();
                 indexable.summaryOn = context.getString(R.string.print_feature_state_on);
                 indexable.summaryOff = context.getString(R.string.print_feature_state_off);