diff --git a/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java b/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
index 9aaaef8f0..7dd8376c3 100644
--- a/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
+++ b/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
@@ -119,7 +119,7 @@ class AsyncContactsLoader extends AsyncTask<Void, Void, AsyncContactsLoader.Asyn
                             // No refkey so it's a standalone contact
                             contact = new LinphoneContact();
                             contact.setFriend(friend);
-                            contact.refresh();
+                            contact.syncValuesFromFriend();
                             data.contacts.add(contact);
                         }
                     }
diff --git a/app/src/main/java/org/linphone/contacts/ContactsAdapter.java b/app/src/main/java/org/linphone/contacts/ContactsAdapter.java
index 146608d72..87a9b5329 100644
--- a/app/src/main/java/org/linphone/contacts/ContactsAdapter.java
+++ b/app/src/main/java/org/linphone/contacts/ContactsAdapter.java
@@ -112,7 +112,7 @@ public class ContactsAdapter extends SelectableAdapter<ContactViewHolder>
         return mContacts.get(position);
     }
 
-    public void setmIsSearchMode(boolean set) {
+    public void setIsSearchMode(boolean set) {
         mIsSearchMode = set;
     }
 
diff --git a/app/src/main/java/org/linphone/contacts/ContactsFragment.java b/app/src/main/java/org/linphone/contacts/ContactsFragment.java
index 27750bf02..c46e35c02 100644
--- a/app/src/main/java/org/linphone/contacts/ContactsFragment.java
+++ b/app/src/main/java/org/linphone/contacts/ContactsFragment.java
@@ -208,7 +208,7 @@ public class ContactsFragment extends Fragment
             return;
         }
         changeContactsToggle();
-        mContactAdapter.setmIsSearchMode(true);
+        mContactAdapter.setIsSearchMode(true);
 
         List<LinphoneContact> listContact;
 
@@ -239,7 +239,8 @@ public class ContactsFragment extends Fragment
         mNoContact.setVisibility(View.GONE);
         mContactsList.setVisibility(View.VISIBLE);
         boolean isEditionEnabled = false;
-        if (mSearchView.getQuery().toString().equals("")) {
+        String query = mSearchView.getQuery().toString();
+        if (query.equals("")) {
             if (mOnlyDisplayLinphoneContacts) {
                 listContact = ContactsManager.getInstance().getSIPContacts();
             } else {
@@ -247,13 +248,9 @@ public class ContactsFragment extends Fragment
             }
         } else {
             if (mOnlyDisplayLinphoneContacts) {
-                listContact =
-                        ContactsManager.getInstance()
-                                .getSIPContacts(mSearchView.getQuery().toString());
+                listContact = ContactsManager.getInstance().getSIPContacts(query);
             } else {
-                listContact =
-                        ContactsManager.getInstance()
-                                .getContacts(mSearchView.getQuery().toString());
+                listContact = ContactsManager.getInstance().getContacts(query);
             }
         }
 
diff --git a/app/src/main/java/org/linphone/contacts/LinphoneContact.java b/app/src/main/java/org/linphone/contacts/LinphoneContact.java
index 9e6c1c37a..3b0aaf2da 100644
--- a/app/src/main/java/org/linphone/contacts/LinphoneContact.java
+++ b/app/src/main/java/org/linphone/contacts/LinphoneContact.java
@@ -444,24 +444,9 @@ public class LinphoneContact extends AndroidContact
         setPhotoUri(getContactPictureUri());
     }
 
-    public void refresh() {
-        mAddresses = new ArrayList<>();
-        /*if (isAndroidContact()) {
-            Pair<String, String> names = getContactNames();
-            if (names != null) {
-                mFirstName = names.first;
-                mLastName = names.second;
-            }
-
-            mOrganization = getNativeContactOrganization();
-            getAndroidIds();
-
-            mHasSipAddress = false;
-            for (LinphoneNumberOrAddress noa : getAddressesAndNumbersForAndroidContact()) {
-                addNumberOrAddress(noa);
-            }
-        }*/
+    public void syncValuesFromFriend() {
         if (isFriend()) {
+            mAddresses = new ArrayList<>();
             mFullName = mFriend.getName();
             mLastName = mFriend.getVcard().getFamilyName();
             mFirstName = mFriend.getVcard().getGivenName();