diff --git a/action/ajax.php b/action/ajax.php
--- a/action/ajax.php
+++ b/action/ajax.php
@@ -1,241 +1,245 @@
 <?php
 
 /**
  * DokuWiki DAVCard PlugIn - Ajax component
  */
 
 if(!defined('DOKU_INC')) die();
 
 class action_plugin_davcard_ajax extends DokuWiki_Action_Plugin {
 
     /**
      * @var helper_plugin_davcard
      */
     private $hlp = null;
 
     function __construct() {
         $this->hlp =& plugin_load('helper','davcard');
     }
 
     function register(Doku_Event_Handler $controller) {
         $controller->register_hook('AJAX_CALL_UNKNOWN', 'BEFORE', $this, 'handle_ajax_call_unknown');
     }
 
     function handle_ajax_call_unknown(&$event, $param) {
       if($event->data != 'plugin_davcard') return;
       
       $event->preventDefault();
       $event->stopPropagation();
       global $INPUT;
       
       $action = trim($INPUT->post->str('action'));
       $id = trim($INPUT->post->str('id'));
       $page = trim($INPUT->post->str('page'));
       $params = $INPUT->post->arr('params');
       if(isset($_SERVER['REMOTE_USER']) && !is_null($_SERVER['REMOTE_USER']))
         $user = $_SERVER['REMOTE_USER'];
       else
         $user = null;
       
       if(!checkSecurityToken())
       {
           echo "CSRF Attack.";
           return;
       }
       
       $data = array();
       
       $data['result'] = false;
       $data['html'] = $this->getLang('unknown_error');
       
       // Parse the requested action
       switch($action)
       {
           // Add a new Contact
           case 'newContact':
               if($this->hlp->addContactEntryToAddressbookForPage($id, $user, $params) === true)
               {
                   $data['result'] = true;
               }
               else
               {
                   $data['result'] = false;
                   $data['html'] = $this->getLang('error_adding');
               }
           break;
           
           // Retrieve contact details
           case 'getContactDetails':
               $contactdata = $this->hlp->getContactByUri($id, $params['uri']);
               if($contactdata['result'] === true)
               {
                   // When we support pictures for editing contacts,
                   // we need to use the following line: 
                   // $contactdata['photo'] = base64_encode($contactdata['photo']);
                   // For now, we just save bandwidth :)
                   unset($contactdata['photo']);
                   $data['result'] = true;
                   $data['contactdata'] = $contactdata;
               }
               else
               {
                   $data['result'] = false;
-                  $data['html'] = $this->getLang('contact_not_found');
+                  $data['html'] = sprintf($this->getLang('contact_not_found'), 'ID='.$id.' URI='.$params['uri']);
               }
           break;
 
           // Edit a contact
           case 'editContact':
               if($this->hlp->editContactEntryToAddressbookForPage($id, $user, $params['uri'], $params) === true)
               {
                   $data['result'] = true;
               }
               else 
               {
                   $data['result'] = false;
                   $data['html'] = $this->getLang('error_editing');
               }
           break;
           // Delete a Contact
           case 'deleteContact':
               if($this->hlp->deleteContactEntryToAddressbookForPage($id, $user, $params['uri']) === true)
               {
                   $data['result'] = true;
               }
               else
               {
                   $data['result'] = false;
                   $data['html'] = $this->getLang('error_deleting');
               }
           break;
           // Get AJAX popup
           case 'getContactAjax':
               $contactdata = $this->hlp->getContactByUri($id, $params['uri']);
               $cardpattern = $this->getConf('popup_content');
+              if($contactdata['result'] === false)
+              {
+                  echo hsc($contactdata['formattedname']);
+              }
               echo '<div class="plugin_davcard_popup_container">';
               foreach($contactdata['photo'] as $data)
               {
                   if(isset($data['type']))
                     $type = $data['type'];
                   else
                     $type = '';
                   echo '<div class="plugin_davcard_popup_image">';
                   $imgdata = base64_encode($data['photo']);
                   $pattern = '/^(?:[;\/?:@&=+$,]|(?:[^\W_]|[-_.!~*\()\[\] ])|(?:%[\da-fA-F]{2}))*$/';
 
                   // PNG images
                   if($type == 'png')
                   {
                       $imgdata = 'data:image/png;base64,'.$imgdata;
-                      echo '<img src="'.$imgdata.'" alt="contact image" />';
+                      echo '<img src="'.hsc($imgdata).'" alt="contact image" />';
                   }
                   // JPEG images
                   elseif(($type == 'jpeg') || ($type == 'jpg'))
                   {
                       $imgdata = 'data:image/jpeg;base64,'.$imgdata;
-                      echo '<img src="'.$imgdata.'" alt="contact image" />';
+                      echo '<img src="'.hsc($imgdata).'" alt="contact image" />';
                   }
                   // GIF images
                   elseif($type == 'gif')
                   {
                       $imgdata = 'data:image/gif;base64,'.$imgdata;
-                      echo '<img src="'.$imgdata.'" alt="contact image" />';
+                      echo '<img src="'.hsc($imgdata).'" alt="contact image" />';
                   }
                   // URLs (no type given)
                   elseif(preg_match( $pattern, $string ) == 1)
                   {
-                      echo '<img src="'.$data['photo'].'" alt="contact image" />';
+                      echo '<img src="'.hsc($data['photo']).'" alt="contact image" />';
                   }
                   echo '</div>';
               }
               echo '<div class="plugin_davcard_popup_content">';
               $contactname = explode(';', $contactdata['structuredname']);
               if(count($contactname) > 1)
               {
                   $cardpattern = str_replace('<DCLASTNAME>', $contactname[0], $cardpattern);
                   $cardpattern = str_replace('<DCFIRSTNAME>', $contactname[1], $cardpattern);
               }
               if(count($contactdata['addr']) > 0)
               {
                   foreach($contactdata['addr'] as $data)
                   {
                       if(isset($data['type']) && ($data['type'] == 'work'))
                         $prefix = 'WORK';
                       else
                         $prefix = 'PRIVATE';
                       $cardpattern = str_replace('<DC'.$prefix.'STREET>', $data['address'][2], $cardpattern);
                       $cardpattern = str_replace('<DC'.$prefix.'CITY>', $data['address'][3], $cardpattern);
                       $cardpattern = str_replace('<DC'.$prefix.'ZIP>', $data['address'][5], $cardpattern);
                       $cardpattern = str_replace('<DC'.$prefix.'COUNTRY>', $data['address'][6], $cardpattern);
                   }
               }
               if(count($contactdata['tel']) > 0)
               {
                   $telArr = array();
                   foreach($contactdata['tel'] as $data)
                   {
                       if(isset($data['type']))
                         $type = $data['type'];
                       else
                         $type = 'other';
                       $type = $data['type'];
                       $telArr[] = $this->getLang('tel'.$type).': '.$data['number'];
                   }
                   $telStr = implode(' \\\\ ', $telArr);
                   $cardpattern = str_replace('<DCPHONE>', $telStr, $cardpattern);
               }
               if(count($contactdata['mail']) > 0)
               {
                   $mailArr = array();
                   foreach($contactdata['mail'] as $data)
                   {
                       $mailArr[] = '[['.$data['mail'].']]';
                   }
                   $mailStr = implode(' \\\\ ', $mailArr);
                   $cardpattern = str_replace('<DCEMAIL>', $mailStr, $cardpattern);
               }
               if($contactdata['birthday'] != '')
               {
                   $date = DateTime::createFromFormat('Ymd', $contactdata['birthday']);
                   $dateStr = $date->format($this->getConf('date_format'));
                   $cardpattern = str_replace('<DCBIRTHDAY>', $dateStr, $cardpattern);
               }
               if($contactdata['note'] != '')
               {
                   $notestr = str_replace('\n', ' \\ ', $contactdata['note']);
                   $cardpattern = str_replace('<DCNOTE>', $notestr, $cardpattern);
               }
               if($contactdata['title'] != '')
               {
                   $cardpattern = str_replace('<DCTITLE>', $contactdata['title'], $cardpattern);
               }
               if($contactdata['url'] != '')
               {
                   $url = $contactdata['url'];
                   if(strpos($url, '://') === false)
                     $url = 'http://'.$url;
                   $url = '[['.$url.']]';
                   $cardpattern = str_replace('<DCWEBSITE>', $url, $cardpattern);
               }
               
               $replace_match = '/^.*<DC.*>.*$(?:\r\n|\n)?/m';
               $cardpattern = preg_replace($replace_match, '', $cardpattern);
               echo $this->render_text($cardpattern);
               echo '</div>';
               echo '</div>';
               return;
           break;
       }
     
       // If we are still here, JSON output is requested
       
       //json library of DokuWiki
       require_once DOKU_INC . 'inc/JSON.php';
       $json = new JSON();
  
       //set content type
       header('Content-Type: application/json');
       echo $json->encode($data);            
     }
  
 }              
diff --git a/helper.php b/helper.php
--- a/helper.php
+++ b/helper.php
@@ -1,614 +1,615 @@
 <?php
 /** 
   * Helper Class for the DAVCard plugin
   * This helper does the actual work.
   * 
   */
   
 // must be run within Dokuwiki
 if(!defined('DOKU_INC')) die();
 
 class helper_plugin_davcard extends DokuWiki_Plugin {
   
   protected $sqlite = null;
   
   
   /**
     * Constructor to load the configuration
     */
   public function helper_plugin_davcard() {
     $this->sqlite =& plugin_load('helper', 'sqlite');
     global $conf;
 
     if(!$this->sqlite)
     {
         if($conf['allowdebug'])
             dbglog('This plugin requires the sqlite plugin. Please install it.');
         msg('This plugin requires the sqlite plugin. Please install it.');
         return;
     }
     
     if(!$this->sqlite->init('davcard', DOKU_PLUGIN.'davcard/db/'))
     {
         if($conf['allowdebug'])
             dbglog('Error initialising the SQLite DB for DAVCard');
         return;
     }
   }
   
   private function getContactByDetails($id, $type, $params = array())
   {
     if(strpos($id, 'webdav://') === 0)
     {
         $wdc =& plugin_load('helper', 'webdavclient');
         if(is_null($wdc))
             return $this->getLang('no_wdc');
         $connectionId = str_replace('webdav://', '', $id);
         $settings = $wdc->getConnection($connectionId);
         
         if($settings === false)
             return array('formattedname' => $this->getLang('settings_not_found'));
         if($settings['type'] !== 'contacts')
             return array('formattedname' => $this->getLang('wrong_type'));
         
         $entries = $wdc->getAddressbookEntries($connectionId);
     }
     else 
     {
         $addressbookid = $this->getAddressbookIdForPage($id);
         $entries = $this->getAddressbookEntries($addressbookid);
     }
     foreach($entries as $entry)
     {
         switch($type)
         {
             case 'structuredname':
                 $contactdata = explode(';', strtolower($entry['structuredname']));
-                if(count($contactdata) < 2) // We need at least first and lat name
-                    return array('formattedname' => $this->getLang('contact_not_found'));
+                if(count($contactdata) < 2) // We need at least first and last name
+                    return array('formattedname' => sprintf($this->getLang('contact_not_found'), $params['firstname']. ' '.$params['lastname']));
                 if(($params['lastname'] != '') && 
                     ($contactdata[0] === $params['lastname']) 
                     || $params['lastname'] === '')
                 {
                     // last name matched or no last name given
                     if(($params['firstname'] != '') && 
                        ($contactdata[1] === $params['firstname']) 
                        || $params['firstname'] === '')
                     {
                         // first name matched too or no first name given
                         $info = $this->parseVcard($entry['contactdata'], $entry['uri']);
                         return $info;
                     }
                 }
             break;
             case 'formattedname':
                 if(trim(strtolower($entry['formattedname'])) == $params['formattedname'])
                 {
                     $info = $this->parseVcard($entry['contactdata'], $entry['uri']);
                     return $info;
                 }
             break;
             case 'email':
                 $info = $this->parseVcard($entry['contactdata'], $entry['uri']);
                 foreach($info['mail'] as $data)
                 {
                     if($data['mail'] === strtolower($params['email']))
                         return $info;
                 }
             break;
         }
     }
-    return array('formattedname' => $this->getLang('contact_not_found'));
+    return array('formattedname' => sprintf($this->getLang('contact_not_found'), $this->getLang('invalid_options')), 'result' => false);
   }
 
   public function getAddressbookEntries($id)
   {
       $query = "SELECT contactdata, uri, formattedname, structuredname FROM addressbookobjects WHERE addressbookid = ? ORDER BY formattedname ASC";
       $res = $this->sqlite->query($query, $id);
       return $this->sqlite->res2arr($res);
   }
  
   public function getContactByStructuredName($id, $firstname = '', $lastname = '')
   {
     return $this->getContactByDetails($id, 'structuredname', 
         array('firstname' => strtolower($firstname), 'lastname' => strtolower($lastname)));
   }
 
   public function getContactByEmail($id, $email)
   {
       // FIXME: Maybe it's a good idea to save the e-mail in the database as well!
       return $this->getContactByDetails($id, 'email', array('email' => strtolower($email)));
   }
    
   public function getContactByFormattedName($id, $name)
   {
       return $this->getContactByDetails($id, 'formattedname', array('formattedname' => strtolower($name)));
   }
   
   public function getContactByUri($id, $uri)
   {
     if(strpos($id, 'webdav://') === 0)
     {
         $wdc =& plugin_load('helper', 'webdavclient');
         if(is_null($wdc))
             return $this->getLang('no_wdc');
         $connectionId = str_replace('webdav://', '', $id);
         $settings = $wdc->getConnection($connectionId);
         
         if($settings === false)
             return array('formattedname' => $this->getLang('settings_not_found'), 'result' => false);
         if($settings['type'] !== 'contacts')
             return array('formattedname' => $this->getLang('wrong_type'), 'result' => false);
         
         $row = $wdc->getAddressbookEntryByUri($connectionId, $uri);
     }
     else
     {
         $addressbookid = $this->getAddressbookIdForPage($id);
         $row = $this->getAddressbookEntryByUri($addressbookid, $uri);       
     }
     
     if($row === false)
-        return array('formattedname' => $this->getLang('contact_not_found'), 'result' => false);
+        return array('formattedname' => sprintf($this->getLang('contact_not_found'), 'ID='.$id.' URI='.$uri), 'result' => false);
     $info = $this->parseVcard($row['contactdata'], $row['uri']);
     $info['result'] = true;
     return $info;
   }
   
   private function getAddressbookEntryByUri($id, $uri)
   {
       $query = "SELECT contactdata, addressbookid, etag, uri, formattedname, structuredname FROM addressbookobjects WHERE addressbookid = ? AND uri = ?";
       $res = $this->sqlite->query($query, $id, $uri);
       return $this->sqlite->res2row($res);
   }
   
   
   public function setAddressbookNameForPage($name, $description, $id = null, $userid = null)
   {
       if(is_null($id))
       {
           global $ID;
           $id = $ID;
       }
       if(is_null($userid))
       {
         if(isset($_SERVER['REMOTE_USER']) && !is_null($_SERVER['REMOTE_USER']))
         {
           $userid = $_SERVER['REMOTE_USER'];
         }
         else
         {
           $userid = uniqid('davcard-');
         }
       }
       $bookid = $this->getAddressbookIdForPage($id);
       if($bookid === false)
         return $this->createAddressbookForPage($name, $description, $id, $userid);
       
       $query = "UPDATE addressbooks SET displayname = ?, description = ? WHERE id = ?";
       $res = $this->sqlite->query($query, $name, $description, $bookid);
       if($res !== false)
         return true;
       return false;
   }
   
   public function getAddressbookIdForPage($id = null)
   {
       if(is_null($id))
       {
           global $ID;
           $id = $ID;
       }
       
       $query = "SELECT addressbookid FROM pagetoaddressbookmapping WHERE page = ?";
       $res = $this->sqlite->query($query, $id);
       $row = $this->sqlite->res2row($res);
       if(isset($row['addressbookid']))
       {
         $calid = $row['addressbookid'];
         return $calid;
       }
       return false;
   }
   
   public function createAddressbookForPage($name, $description, $id = null, $userid = null)
   {
       if(is_null($id))
       {
           global $ID;
           $id = $ID;
       }
       if(is_null($userid))
       {
         if(isset($_SERVER['REMOTE_USER']) && !is_null($_SERVER['REMOTE_USER']))
         {
           $userid = $_SERVER['REMOTE_USER'];
         }
         else
         {
           $userid = uniqid('davcard-');
         }
       }
       $values = array('principals/'.$userid, 
                       $name,
                       str_replace(array('/', ' ', ':'), '_', $id), 
                       $description,
                       1);
       $query = "INSERT INTO addressbooks (principaluri, displayname, uri, description, synctoken) ".
                "VALUES (?, ?, ?, ?, ?)";
       $res = $this->sqlite->query($query, $values);
       if($res === false)
         return false;
       
       // Get the new addressbook ID
       $query = "SELECT id FROM addressbooks WHERE principaluri = ? AND displayname = ? AND ".
                "uri = ? AND description = ? AND synctoken = ?";
       $res = $this->sqlite->query($query, $values);
       $row = $this->sqlite->res2row($res);
       
       // Update the pagetocalendarmapping table with the new calendar ID
       if(isset($row['id']))
       {
           $query = "INSERT INTO pagetoaddressbookmapping (page, addressbookid) VALUES (?, ?)";
           $res = $this->sqlite->query($query, $id, $row['id']);
           return ($res !== false);
       }
       
       return false;
   }
 
   public function deleteContactEntryToAddressbookForPage($id, $user, $uri)
   {
       if(strpos($id, 'webdav://') === 0)
       {
         $wdc =& plugin_load('helper', 'webdavclient');
         if(is_null($wdc))
             return $this->getLang('no_wdc');
         $connectionId = str_replace('webdav://', '', $id);
         $settings = $wdc->getConnection($connectionId);
         
         if($settings === false)
             return array('formattedname' => $this->getLang('settings_not_found'), 'result' => false);
         if($settings['type'] !== 'contacts')
             return array('formattedname' => $this->getLang('wrong_type'), 'result' => false);
         
         return $wdc->deleteAddressbookEntry($connectionId, $uri);
       }
       
       $addressbookid = $this->getAddressbookIdForPage($id);
       dbglog($addressbookid);
       dbglog($uri);
       $query = "DELETE FROM addressbookobjects WHERE uri = ? AND addressbookid = ?";
             dbglog($query);
       
       $res = $this->sqlite->query($query, $uri, $addressbookid);
       if($res !== false)
       {
           $this->updateSyncTokenLog($addressbookid, $uri, 'deleted');
           return true;
       }
       return false;
   }
 
   public function editContactEntryToAddressbookForPage($id, $user, $uri, $params)
   {
       require_once(DOKU_PLUGIN.'davcard/vendor/autoload.php');
       
       if(strpos($id, 'webdav://') === 0)
       {
         $wdc =& plugin_load('helper', 'webdavclient');
         if(is_null($wdc))
             return $this->getLang('no_wdc');
         $connectionId = str_replace('webdav://', '', $id);
         $settings = $wdc->getConnection($connectionId);
         
         if($settings === false)
             return array('formattedname' => $this->getLang('settings_not_found'), 'result' => false);
         if($settings['type'] !== 'contacts')
             return array('formattedname' => $this->getLang('wrong_type'), 'result' => false);
         
         $row = $wdc->getAddressbookEntryByUri($connectionId, $uri);
       }
       else
       {
         $addressbookid = $this->getAddressbookIdForPage($id);
         $row = $this->getAddressbookEntryByUri($addressbookid, $uri);       
       }
       $vcard = \Sabre\VObject\Reader::read($row['contactdata']);
       
       $vcard->remove('ADR');
       $vcard->remove('TEL');
       $vcard->remove('EMAIL');
       
       if(isset($params['phones']))
       {
           foreach($params['phones'] as $data)
           {
               $vcard->add('TEL', $data['number'], array('type' => $data['type']));
           }
       }
 
       if(isset($params['email']))
       {
           foreach($params['email'] as $data)
           {
               $vcard->add('EMAIL', $data['mail'], array('type' => $data['type']));
           }
       }
 
       if(isset($params['addresses']))
       {
           foreach($params['addresses'] as $data)
           {
               $vcard->add('ADR', array('', '', $data['street'], $data['city'], '', $data['zipcode'], $data['country']), array('type' => $data['type']));
           }
       }
       
       $structuredname = explode(';', (string)$vcard->N);
       $structuredname[0] = $params['lastname'];
       $structuredname[1] = $params['firstname'];
       $formattedname = $params['firstname'].' '.$params['lastname']; // FIXME: Make this configurable?
       $vcard->N = $structuredname;
       $vcard->FN = $formattedname;
       
       $contactdata = $vcard->serialize();
       
       if(strpos($id, 'webdav://') === 0)
       {
           return $wdc->editAddressbookEntry($connectionId, $uri, $contactdata);
       }
       else
       {
           $now = new \DateTime();
           $query = "UPDATE addressbookobjects SET contactdata = ?, lastmodified = ?, etag = ?, size = ?, formattedname = ?, structuredname = ? WHERE addressbookid = ? AND uri = ?";
           $res = $this->sqlite->query($query,
                                       $contactdata,
                                       $now->getTimestamp(),
                                       md5($contactdata),
                                       strlen($contactdata),
                                       $formattedname,
                                       implode(';', $structuredname),
                                       $addressbookid,
                                       $uri
                                       );
           if($res !== false)
           {
               $this->updateSyncTokenLog($addressbookid, $uri, 'modified');
               return true;
           }
       }
       return false;
   }
   
   public function addContactEntryToAddressbookForPage($id, $user, $params)
   {
       require_once(DOKU_PLUGIN.'davcard/vendor/autoload.php');
       
       $vcard = new \Sabre\VObject\Component\VCard();
       $formattedname = $params['firstname'].' '.$params['lastname']; // FIXME: Make this configurable?
       $structuredname = array($params['lastname'], $params['firstname'], '', '', '');
       $vcard->FN =  $formattedname;
       $vcard->N = $structuredname;
 
       if(isset($params['phones']))
       {
         foreach($params['phones'] as $data)
         {
             $vcard->add('TEL', $data['number'], array('type' => $data['type']));
         }
       }
       if(isset($params['email']))
       {
           foreach($params['email'] as $data)
           {
               $vcard->add('EMAIL', $data['mail'], array('type' => $data['type']));
           }
       }
       if(isset($params['addresses']))
       {
           foreach($params['addresses'] as $data)
           {
               $vcard->add('ADR', array('', '', $data['street'], $data['city'], '', $data['zipcode'], $data['country']), array('type' => $data['type']));
           }
       }
 
       $contactdata = $vcard->serialize();
       
       if(strpos($id, 'webdav://') === 0)
       {
           $wdc =& plugin_load('helper', 'webdavclient');
           if(is_null($wdc))
             return false;
           $connectionId = str_replace('webdav://', '', $id);
           return $wdc->addAddressbookEntry($connectionId, $contactdata);
       }
       else
       {
           $addressbookid = $this->getAddressbookIdForPage($id);
           $uri = uniqid('dokuwiki-').'.vcf';
           $now = new \DateTime();
           $query = "INSERT INTO addressbookobjects (contactdata, uri, addressbookid, lastmodified, etag, size, formattedname, structuredname) VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
           $res = $this->sqlite->query($query, 
                                       $contactdata, 
                                       $uri, 
                                       $addressbookid, 
                                       $now->getTimestamp(), 
                                       md5($contactdata), 
                                       strlen($contactdata), 
                                       $formattedname, 
                                       implode(';', $structuredname)
                                       );
           // If successfully, update the sync token database
           if($res !== false)
           {
               $this->updateSyncTokenLog($addressbookid, $uri, 'added');
               return true;
           }
       }
       return false;
   }
   
   public function parseVcard($card, $uri)
   {
     require_once(DOKU_PLUGIN.'davcard/vendor/autoload.php');
       
     $vObject = \Sabre\VObject\Reader::read($card);
       
     $formattedname = '';
     $structuredname = '';
     $tel = array();
     $addr = array();
     $mail = array();
     $photo = array();
     $birthday = '';
     $note = '';
     $title = '';
     $url = '';
     
     if(isset($vObject->FN))
       $formattedname = (string)$vObject->FN;
     
     if(isset($vObject->N))
       $structuredname = join(';', $vObject->N->getParts());
     
     if(isset($vObject->TEL))
     {
         foreach($vObject->TEL as $number)
         {
             if(isset($number['TYPE']))
                 $tel[] = array('type' => strtolower((string)$number['TYPE']), 'number' => (string)$number);
             else
                 $tel[] = array('number' => (string)$number);
         }
     }
     
     if(isset($vObject->ADR))
     {
         foreach($vObject->ADR as $adr)
         {
             if(isset($adr['TYPE']))
                 $addr[] = array('type' => strtolower((string)$adr['TYPE']), 'address' => $adr->getParts());
             else
                 $addr[] = array('address' => $adr->getParts());
         }
     }
     
     if(isset($vObject->EMAIL))
     {
         foreach($vObject->EMAIL as $email)
         {
             if(isset($email['TYPE']))
                 $mail[] = array('type' => strtolower((string)$email['TYPE']), 'mail' => (string)$email);
             else
                 $mail[] = array('mail' => (string)$email);
         }
     }
     
     if(isset($vObject->PHOTO))
     {
         if(isset($vObject->PHOTO['TYPE']))
         {
             $photo[] = array('type' => strtolower((string)$vObject->PHOTO['TYPE']), 'photo' => (string)$vObject->PHOTO);
         }
         else
             $photo[] = array('photo' => (string)$vObject->PHOTO);
     }
     
     if(isset($vObject->BDAY))
     {
         $birthday = (string)$vObject->BDAY;
         $birthday = str_replace('-', '', $birthday);
     }
     
     if(isset($vObject->NOTE))
     {
         $note = (string)$vObject->NOTE;
     }
     
     if(isset($vObject->TITLE))
     {
         $title = (string)$vObject->TITLE;
     }
     
     if(isset($vObject->URL))
     {
         $url = (string)$vObject->URL;
     }
     
     return array(
         'formattedname' => $formattedname,
         'structuredname' => $structuredname,
         'tel' => $tel,
         'mail' => $mail,
         'addr' => $addr,
         'uri' => $uri,
         'photo' => $photo,
         'birthday' => $birthday,
         'note' => $note,
         'title' => $title,
         'url' => $url,
+        'result' => true
     );
   }
 
   public function getAddressbookSettings($addressbookid)
   {
       $query = "SELECT id, principaluri, displayname, uri, description, synctoken FROM addressbooks WHERE id= ? ";
       $res = $this->sqlite->query($query, $addressbookid);
       $row = $this->sqlite->res2row($res);
       return $row;
   }
 
   public function getSyncTokenForAddressbook($addressbookid)
   {
       $row = $this->getAddressbookSettings($addressbookid);
       if(isset($row['synctoken']))
           return $row['synctoken'];
       return false;
   }
   
   /**
    * Helper function to convert the operation name to 
    * an operation code as stored in the database
    * 
    * @param string $operationName The operation name
    * 
    * @return mixed The operation code or false
    */
   public function operationNameToOperation($operationName)
   {
       switch($operationName)
       {
           case 'added':
               return 1;
           break;
           case 'modified':
               return 2;
           break;
           case 'deleted':
               return 3;
           break;
       }
       return false;
   }
   private function updateSyncTokenLog($addressbookid, $uri, $operation)
   {
       $currentToken = $this->getSyncTokenForAddressbook($addressbookid);
       $operationCode = $this->operationNameToOperation($operation);
       if(($operationCode === false) || ($currentToken === false))
           return false;
       $values = array($uri,
                       $currentToken,
                       $addressbookid,
                       $operationCode
       );
       $query = "INSERT INTO addressbookchanges (uri, synctoken, addressbookid, operation) VALUES(?, ?, ?, ?)";
       $res = $this->sqlite->query($query, $uri, $currentToken, $addressbookid, $operationCode);
       if($res === false)
         return false;
       $currentToken++;
       $query = "UPDATE addressbooks SET synctoken = ? WHERE id = ?";
       $res = $this->sqlite->query($query, $currentToken, $addressbookid);
       return ($res !== false);
   }
  
 }
diff --git a/lang/en/lang.php b/lang/en/lang.php
--- a/lang/en/lang.php
+++ b/lang/en/lang.php
@@ -1,78 +1,79 @@
 <?php
 /**
  * English language file for DAVCard
  * 
  * @author Andreas Böhler <dev@aboehler.at>
  */
 $lang['unknown_error'] = 'Unknown Error';
 $lang['id_name_not_set'] = 'Either ID or Name must be set';
 $lang['loading_via_ajax'] = 'Loadig Contact Data...';
 $lang['no_wdc'] = 'Loading webdavclient PlugIn failed.';
 $lang['settings_not_found'] = 'The requested WebDAV connection was not found';
 $lang['wrong_type'] = 'The requested WebDAV connection is not of type contact';
-$lang['contact_not_found'] = 'The requested contact was not found';
+$lang['contact_not_found'] = 'The requested contact (%s) was not found';
 $lang['error_adding'] = 'Error adding contact';
 $lang['error_editing'] = 'Error editing contact';
 $lang['error_deleting'] = 'Error deleting contact';
+$lang['invalid_options'] = 'invalid options given';
 $lang['telvoice'] = 'Voice';
 $lang['telhome'] = 'Home';
 $lang['telmsg'] = 'Message';
 $lang['telwork'] = 'Work';
 $lang['telpref'] = 'preferred';
 $lang['telfax'] = 'Fax';
 $lang['telcell'] = 'Cell';
 $lang['telvideo'] = 'Video';
 $lang['telpager'] = 'Pager';
 $lang['telbbs'] = 'BBS';
 $lang['telmodem'] = 'Modem';
 $lang['telcar'] = 'Car';
 $lang['telisdn'] = 'ISDN';
 $lang['telpcs'] = 'PCS';
 $lang['telother'] = 'Other';
 $lang['adrintl'] = 'International';
 $lang['adrpostal'] = 'Postal';
 $lang['adrparcel'] = 'Parcel';
 $lang['adrwork'] = 'Work';
 $lang['adrdom'] = 'Domestic';
 $lang['adrhome'] = 'Home';
 $lang['adrpref'] = 'preferred';
 $lang['adrother'] = 'Other';
 $lang['created_by_davcard'] = 'Created by DAVCard';
 $lang['add_new'] = 'Add new entry';
 $lang['edit'] = 'Edit';
 $lang['name'] = 'Name';
 $lang['address'] = 'Address';
 $lang['phone'] = 'Phone';
 $lang['email'] = 'E-Mail';
 $lang['js']['confirmation'] = 'Confirmation';
 $lang['js']['yes'] = 'Yes';
 $lang['js']['no'] = 'No';
 $lang['js']['cancel'] = 'Cancel';
 $lang['js']['create'] = 'Create';
 $lang['js']['info'] = 'Info';
 $lang['js']['ok'] = 'OK';
 $lang['js']['edit'] = 'Edit';
 $lang['js']['edit_entry'] = 'Edit Entry';
 $lang['js']['create_entry'] = 'Create Entry';
 $lang['js']['delete'] = 'Delete';
 $lang['js']['really_delete_this_entry'] = 'Really delete this entry?';
 $lang['js']['firstname'] = 'First Name';
 $lang['js']['lastname'] = 'Last Name';
 $lang['js']['city'] = 'City';
 $lang['js']['zipcode'] = 'Zip Code';
 $lang['js']['cellphone'] = 'Cell Phone';
 $lang['js']['phone'] = 'Phone';
 $lang['js']['add_phone'] = 'Add Phonenumber';
 $lang['js']['add_mail'] = 'Add Mail';
 $lang['js']['addresses'] = 'Addresses';
 $lang['js']['street'] = 'Street';
 $lang['js']['country'] = 'Country';
 $lang['js']['email'] = 'Email';
 $lang['js']['loading'] = 'Loading...';
 $lang['js']['error_loading'] = 'Error loading contact data from server!';
 $lang['js']['workphone'] = 'Work Phone';
 $lang['js']['otherphone'] = 'Other Phone';
 $lang['js']['work'] = 'Work';
 $lang['js']['home'] = 'Home';
 $lang['js']['add_address'] = 'Add address';
 $lang['js']['other_address'] = 'Other Address';
diff --git a/style.css b/style.css
--- a/style.css
+++ b/style.css
@@ -1,108 +1,107 @@
 div.dokuwiki a.plugin_davcard_url:link,
 div.dokuwiki a.plugin_davcard_url:active,
 div.dokuwiki a.plugin_davcard_url:hover,
 div.dokuwiki a.plugin_davcard_url:visited {
     position: relative;
-    padding-left: 18px;
     z-index: 10;
 }
 
 div.dokuwiki a.plugin_davcard_url:link span.plugin_davcard_popup,
 div.dokuwiki a.plugin_davcard_url:active span.plugin_davcard_popup,
 div.dokuwiki a.plugin_davcard_url:visited span.plugin_davcard_popup {
     display: none;
 }
 
 div.dokuwiki a.plugin_davcard_url:hover {
     text-decoration: none !important;
     z-index: 15;
 }
 
 div.dokuwiki a.plugin_davcard_url:hover span.plugin_davcard_popup {
     display: block;
     position: absolute;
     top: 1.2em;
     left: 18px;
     width: 20em;
     height: 64px;
     min-height: 64px;
     height: auto;
     background-color: __background__;
     border: 1px solid __border__;
     padding: 0.5em;
     font-size: 90%;
 }
 
 div.dokuwiki a.plugin_davcard_url span.plugin_davcard_nopopup {
     display:none;
 }
 
 div.dokuwiki a.plugin_davcard_url:hover span.plugin_davcard_popup span.adr,
 div.dokuwiki a.plugin_davcard_url:hover span.plugin_davcard_popup span.tel,
 div.dokuwiki a.plugin_davcard_url:hover span.plugin_davcard_popup span.email_outer,
 div.dokuwiki #davcardAddressbookList span.adr,
 div.dokuwiki #davcardAddressbookList span.tel 
 {
     display:block;
     position: relative;
     margin-left: 45px;
 }
 
 div.dokuwiki a.plugin_davcard_url:hover span.plugin_davcard_popup span.adr span.type,
 div.dokuwiki a.plugin_davcard_url:hover span.plugin_davcard_popup span.tel span.type,
 div.dokuwiki a.plugin_davcard_url:hover span.plugin_davcard_popup span.email_type,
 div.dokuwiki #davcardAddressbookList span.adr span.type,
 div.dokuwiki #davcardAddressbookList span.tel span.type
 {
     font-weight: bold;
     margin-left: -45px;
     position: absolute;
 }
 
 div.dokuwiki .plugin_davcard_popup_overlay {
     position: absolute;
     padding: 0.5em;
     margin-top: 1em;
 }
 
 
 div.dokuwiki .plugin_davcard_popup_overlay ul {
     margin: 0;
     list-style-type: none;
 }
 
 div.dokuwiki .plugin_davcard_popup_overlay ul li {
     margin-left: 2em;
 }
 
 div.dokuwiki .plugin_davcard_popup_overlay ul li.dataov_name {
     margin-left: 0;
     margin-bottom: 0.3em;
 }
 
 div.dokuwiki .plugin_davcard_popup_overlay ul li.dataov_name div {
     font-weight: bold;
 }
 
 div.dokuwiki .plugin_davcard_popup_overlay img {
     max-width: 100px;
     height: auto;
 }
 
 div.dokuwiki .plugin_davcard_popup_overlay .plugin_davcard_popup_container {
 
 }
 
 div.dokuwiki .plugin_davcard_popup_overlay .plugin_davcard_popup_image {
     float: left;
 }
 
 div.dokuwiki .plugin_davcard_popup_overlay .plugin_davcard_popup_content {
     float: right;
 }
 
 div.dokuwiki .plugin_davcard_popup_overlay .plugin_davcard_popup_container::after {
     content:"";
     display:block;
     clear:both;
 }
diff --git a/syntax/card.php b/syntax/card.php
--- a/syntax/card.php
+++ b/syntax/card.php
@@ -1,211 +1,215 @@
 <?php
 /**
  * DokuWiki Plugin DAVCard (Contact Syntax Component)
  *
  * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
  * @author  Andreas Böhler <dev@aboehler.at>
  */
 
 // must be run within Dokuwiki
 if(!defined('DOKU_INC')) die();
 
 if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
 require_once(DOKU_PLUGIN.'syntax.php');
 
 class syntax_plugin_davcard_card extends DokuWiki_Syntax_Plugin {
     
     protected $hlp = null;
     
     // Load the helper plugin
     public function syntax_plugin_davcard_card() {  
         $this->hlp =& plugin_load('helper', 'davcard');     
     }
     
     
     /**
      * What kind of syntax are we?
      */
     function getType(){
         return 'substition';
     }
 
     /**
      * What about paragraphs?
      */
     function getPType(){
         return 'normal';
     }
 
     /**
      * Where to sort in?
      */
     function getSort(){
         return 165;
     }
 
     /**
      * Connect pattern to lexer
      */
     function connectTo($mode) {
         $this->Lexer->addSpecialPattern('\{\{davcard>[^}]*\}\}',$mode,'plugin_davcard_card');
         $this->Lexer->addSpecialPattern('\{\{davcardclient>[^}]*\}\}',$mode,'plugin_davcard_card');
     }
 
     /**
      * Handle the match
      */
     function handle($match, $state, $pos, Doku_Handler $handler){
         global $ID;
         $data = array('name' => '',
                       'id' => $ID,
                       'firstname' => '',
                       'lastname' => '',
                       'email' => '',
                       'uri' => '',
                       );
         if(strpos($match, '{{davcardclient') === 0)
         {
             $options = trim(substr($match,16,-2));
             $defaultId = $this->getConf('default_client_id');
             if(isset($defaultId) && ($defaultId != ''))
             {
                 $data['id'] = $defaultId;
             }  
         }
         else
         {
             $options = trim(substr($match,10,-2));
         }
         
         $options = explode(',', $options);
 
         foreach($options as $option)
         {
             list($key, $val) = explode('=', $option);
             $key = strtolower(trim($key));
             $val = trim($val);
             switch($key)
             {
                 default:
                     $data[$key] = $val;
             }
         }
         // FIXME: This is nonsense
         if($data['id'] === '')
         {
             if(($data['name'] === '') || (($data['firstname'] === '') && ($data['lastname'] === '')))
             {
                 msg($this->getLang('id_name_not_set'), -1);
             }
         }
         return $data;
     }
     
     /**
      * Create output
      */
     function render($format, Doku_Renderer $R, $data) {
         if($format == 'metadata')
         {
             if(strpos($data['id'], 'webdav://') === 0)
             {
                 $connectionId = str_replace('webdav://', '', $data['id']);
                 $R->meta['plugin_davcard']['webdavclient'][] = $connectionId;
                 return true;
             }
         }
         if($format != 'xhtml') 
             return false;
         
         
         $contactdata = array();
-
+        $srch = '';
         if($data['name'] !== '')
         {
             $contactdata = $this->hlp->getContactByFormattedName($data['id'], $data['name']);
+            $srch = $data['name'];
         }
         elseif(($data['firstname'] !== '') || ($data['lastname'] !== ''))
         {
             $contactdata = $this->hlp->getContactByStructuredName($data['id'], $data['firstname'], $data['lastname']);
+            $srch = $data['firstname'].' '.$data['lastname'];
         }
         elseif(($data['email'] !== ''))
         {
             $contactdata = $this->hlp->getContactByEmail($data['id'], $data['email']);
+            $srch = 'E-Mail = '.$data['email'];
         }
         elseif(($data['uri'] !== ''))
         {
             $contactdata = $this->hlp->getContactByUri($data['id'], $data['uri']);
+            $srch = 'URI = '.$data['uri'];
         }
-        if($contactdata === false)
+        if($contactdata['result'] === false)
         {
-            $contactdata['formattedname'] = $this->getLang('contact_not_found');
-            $contactdata['uri'] = '';
+            $R->doc .= sprintf($this->getLang('contact_not_found'), $srch);
+            return;
         }
         
         $R->doc .= '<a class="url fn plugin_davcard_url" href="#" data-davcarduri="'
             .$contactdata['uri'].'" data-davcardid="'.$data['id'].'">'.$contactdata['formattedname'];
         $R->doc .= '<span class="plugin_davcard_popup vcard">';
         if(count($contactdata['addr']) > 0)
         {
             $R->doc .= '<span class="adr">';
             foreach($contactdata['addr'] as $dat)
             {
                 if(isset($data['type']))
                     $type = $dat['type'];
                 else
                     $type = 'other';
                 $R->doc .= '<span class="type">'.$this->getLang('adr'.strtolower($type)).'</span>';
                 if($dat['address'][2] != '')
                 {
                     $R->doc .= '<span class="street-address">'.$dat['address'][2].'</span><br>';
                 }
                 if($dat['address'][5] != '')
                 {
                     $R->doc .= '<span class="postal-code">'.$dat['address'][5].' </span>';
                 }
                 if($dat['address'][3] != '')
                 {
                     $R->doc .= '<span class="locality">'.$dat['address'][3].'</span><br>';
                 }
 
                 if($dat['address'][6] != '')
                 {
                     $R->doc .= '<span class="country-name">'.$dat['address'][6].'</span>';
                 }
             }
             $R->doc .= '</span>';
         }
         if(count($contactdata['tel']) > 0)
         {
             $R->doc .= '<span class="tel">';
             foreach($contactdata['tel'] as $dat)
             {
                 if(isset($dat['type']))
                     $type = $dat['type'];
                 else
                     $type = 'other';
                 $R->doc .= '<span class="type">'.$this->getLang('tel'.strtolower($type)).' </span>';
                 $R->doc .= $dat['number'].'<br>';
             }
             $R->doc .= '</span>';
         }
         if(count($contactdata['mail']) > 0)
         {
             $R->doc .= '<span class="email_outer"><span class="email_type">EMail</span>';
             foreach($contactdata['mail'] as $dat)
             {
                 $R->doc .= '<span class="email">'.$dat['mail'].'</span><br>';
             }
             $R->doc .= '</span>';
         }
         
         $R->doc .= '</span>';
         $R->doc .= '</a>';
         
     }
 
 
    
 }
 
 // vim:ts=4:sw=4:et:enc=utf-8: