--- a/phoneengine/phonecntfinder2/src/cphcntmatch2.cpp	Fri Jun 04 10:19:18 2010 +0100
+++ b/phoneengine/phonecntfinder2/src/cphcntmatch2.cpp	Wed Jun 23 18:12:20 2010 +0300
@@ -122,7 +122,7 @@
 //
 TPtrC CPhCntMatch2::FirstName() const
 {
-    return FieldValue(QContactName::DefinitionName, QContactName::FieldFirst); 
+    return FieldValue(QContactName::DefinitionName, QContactName::FieldFirstName); 
 
 }
 // -----------------------------------------------------------------------------
@@ -131,7 +131,7 @@
 //
 TPtrC CPhCntMatch2::LastName() const
 {
-    return FieldValue(QContactName::DefinitionName, QContactName::FieldLast);
+    return FieldValue(QContactName::DefinitionName, QContactName::FieldLastName);
    
 }
 // -----------------------------------------------------------------------------
@@ -209,8 +209,8 @@
     QList<QContactAvatar> details = iContact.details<QContactAvatar>();
 
     for (int i=0;i<details.count();++i) {
-        if (details.at(i).subType() == QContactAvatar::SubTypeImage) {
-            returnValue = details.at(i).avatar();
+        if (!details.at(i).imageUrl().isEmpty()) {
+            returnValue = details.at(i).imageUrl().toEncoded();
             break;
         }
     }