diff --git a/src/com/android/contacts/drawer/DrawerAdapter.java b/src/com/android/contacts/drawer/DrawerAdapter.java
index 5248603..54cd669 100644
--- a/src/com/android/contacts/drawer/DrawerAdapter.java
+++ b/src/com/android/contacts/drawer/DrawerAdapter.java
@@ -130,7 +130,7 @@
         mItemsList.add(mStatusBarSpacerItem);
         mItemsList.add(mNavSpacerItem);
         mItemsList.addAll(mPrimaryItems);
-        if (mAreGroupWritableAccountsAvailable) {
+        if (mAreGroupWritableAccountsAvailable || !mGroupEntries.isEmpty()) {
             mItemsList.add(mGroupHeader);
         }
         mItemsList.addAll(mGroupEntries);
diff --git a/src/com/android/contacts/list/DefaultContactListAdapter.java b/src/com/android/contacts/list/DefaultContactListAdapter.java
index bc76331..e50fe48 100644
--- a/src/com/android/contacts/list/DefaultContactListAdapter.java
+++ b/src/com/android/contacts/list/DefaultContactListAdapter.java
@@ -178,13 +178,10 @@
             uri = ContactListAdapter.buildSectionIndexerUri(uri);
         }
 
-        // The "All accounts" filter is the same as the entire contents of Directory.DEFAULT
         if (filter != null
                 && filter.filterType != ContactListFilter.FILTER_TYPE_CUSTOM
                 && filter.filterType != ContactListFilter.FILTER_TYPE_SINGLE_CONTACT) {
             final Uri.Builder builder = uri.buildUpon();
-            builder.appendQueryParameter(
-                    ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(Directory.DEFAULT));
             if (filter.filterType == ContactListFilter.FILTER_TYPE_ACCOUNT
                 || filter.filterType == ContactListFilter.FILTER_TYPE_GROUP_MEMBERS) {
                 filter.addAccountQueryParameterToUrl(builder);