diff --git a/app/src/main/java/org/linphone/LinphoneManager.java b/app/src/main/java/org/linphone/LinphoneManager.java
index 5db27f84c..763f76072 100644
--- a/app/src/main/java/org/linphone/LinphoneManager.java
+++ b/app/src/main/java/org/linphone/LinphoneManager.java
@@ -655,6 +655,7 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
     }
 
     private synchronized void destroyCore() {
+        Log.w("[Manager] Destroying Core");
         sExited = true;
         ContactsManagerDestroy();
         BluetoothManagerDestroy();
@@ -861,6 +862,8 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
             // at 0
             if (LinphonePreferences.instance().isPushNotificationEnabled()
                     || LinphonePreferences.instance().isBackgroundModeEnabled()) {
+                Log.w(
+                        "[Manager] Setting network reachability to False to prevent unregister and allow incoming push notifications");
                 mCore.setNetworkReachable(false);
             }
         }
diff --git a/app/src/main/java/org/linphone/contacts/ContactsFragment.java b/app/src/main/java/org/linphone/contacts/ContactsFragment.java
index ecdb03d50..e140e356f 100644
--- a/app/src/main/java/org/linphone/contacts/ContactsFragment.java
+++ b/app/src/main/java/org/linphone/contacts/ContactsFragment.java
@@ -223,7 +223,6 @@ public class ContactsFragment extends Fragment
             return;
         }
         changeContactsToggle();
-        mContactAdapter.setIsSearchMode(true);
 
         List<LinphoneContact> listContact;
 
@@ -237,6 +236,7 @@ public class ContactsFragment extends Fragment
         }
 
         mContactAdapter = new ContactsAdapter(mContext, listContact, this, mSelectionHelper);
+        mContactAdapter.setIsSearchMode(true);
 
         //		mContactsList.setChoiceMode(AbsListView.CHOICE_MODE_MULTIPLE);
         mSelectionHelper.setAdapter(mContactAdapter);