diff --git a/conf/backend/config-caldav.php b/conf/backend/config-caldav.php
index 6499eaf..a22a863 100644
--- a/conf/backend/config-caldav.php
+++ b/conf/backend/config-caldav.php
@@ -38,7 +38,7 @@ define('CALDAV_SERVER', '__CALDAV_SERVER__');
 // Server port
 define('CALDAV_PORT', '443');
 
-// Path
+// Base URL to principals calendar collection: use '%l' for local part or '%u' for full username
 define('CALDAV_PATH', '__CALDAV_PATH__');
 
 // Default CalDAV folder (calendar folder/principal). This will be marked as the default calendar in the mobile
diff --git a/conf/backend/config-carddav.php b/conf/backend/config-carddav.php
index 3020359..7a3f2fe 100644
--- a/conf/backend/config-carddav.php
+++ b/conf/backend/config-carddav.php
@@ -42,6 +42,7 @@ define('CARDDAV_PORT', '443');
 //      http://localhost/caldav.php/test@domain.com/addresses/personal
 //      http://localhost/caldav.php/test@domain.com/addresses/work
 //      You set the CARDDAV_PATH to '/caldav.php/%u/addresses/' and personal and work will be autodiscovered
+// %l: replaced with the local part of the username
 // %u: replaced with the username
 // %d: replaced with the domain
 //   Add the trailing /
@@ -50,6 +51,7 @@ define('CARDDAV_PATH', '__CARDDAV_PATH__');
 
 // Server path to the default addressbook
 //  Mobile device will create new contacts here. It must be under CARDDAV_PATH
+// %l: replaced with the local part of the username
 // %u: replaced with the username
 // %d: replaced with the domain
 //   Add the trailing /
@@ -57,18 +59,17 @@ define('CARDDAV_DEFAULT_PATH', '__CARDDAV_DEFAULT_PATH__');
 
 // Server path to the GAL addressbook. This addressbook is readonly and searchable by the user, but it will NOT be synced.
 // If you don't want GAL, comment it
+// %l: replaced with the local part of the username
 // %u: replaced with the username
 // %d: replaced with the domain
 //  Add the trailing /
-
 //define('CARDDAV_GAL_PATH', '/caldav.php/%d/GAL/');
 
-
 // Minimal length for the search pattern to do the real search.
-
 //define('CARDDAV_GAL_MIN_LENGTH', 5);
 
 // Addressbook display name, the name showed in the mobile device
+// %l: replaced with the local part of the username
 // %u: replaced with the username
 // %d: replaced with the domain
 define('CARDDAV_CONTACTS_FOLDER_NAME', '%u Addressbook');
diff --git a/conf/backend/config-imap.php b/conf/backend/config-imap.php
index ab9e2a3..e48d50b 100644
--- a/conf/backend/config-imap.php
+++ b/conf/backend/config-imap.php
@@ -223,3 +223,6 @@ define('IMAP_MEETING_USE_CALDAV', __FLAGTOCHANGE__);
 // methods and you will be unable to log in. Uncomment the following line to disable that authentication method.
 // Multiple methods can be specified as a comma-separated string.
 // define('IMAP_DISABLE_AUTHENTICATOR', 'GSSAPI');
+
+// Specify Which Charset the IMAP Search is going to use, Default is 'UTF-8' but you could use 'US-ASCII'
+define('IMAP_SEARCH_CHARSET', 'UTF-8');
diff --git a/conf/backend/config-searchldap.php b/conf/backend/config-searchldap.php
index a0d36b6..ca849d8 100644
--- a/conf/backend/config-searchldap.php
+++ b/conf/backend/config-searchldap.php
@@ -24,9 +24,8 @@
 * Consult LICENSE file for details
 ************************************************/
 
-// LDAP host and port
-define("LDAP_HOST", "ldap://127.0.0.1/");
-define("LDAP_PORT", "389");
+// LDAP server uri
+define("LDAP_SERVER_URI", "ldap://127.0.0.1:389/");
 
 // Set USER and PASSWORD if not using anonymous bind
 define("ANONYMOUS_BIND", true);
@@ -54,3 +53,6 @@ $ldap_field_map = array(
                     SYNC_GAL_MOBILEPHONE    => 'mobile',
                     SYNC_GAL_EMAILADDRESS   => 'mail',
                 );
+
+// Fallback to displayname if firstname and lastname not set
+define("LDAP_SEARCH_NAME_FALLBACK", false);