diff --git a/classes/configtable.php b/classes/configtable.php
index df66608..9edbacc 100644
--- a/classes/configtable.php
+++ b/classes/configtable.php
@@ -166,7 +166,7 @@ private function createTablesIfNotExist()
 			imd_id int(10) unsigned NOT NULL AUTO_INCREMENT,
 			imd_imf_id int(10) unsigned NOT NULL,
 			imd_imi_id int(10) unsigned NOT NULL,
-			imd_value varchar(4000),
+			imd_value varchar(4000) NOT NULL DEFAULT \'\',
 			PRIMARY KEY (imd_id)
 		');
 
@@ -185,11 +185,11 @@ private function createTablesIfNotExist()
 			iml_id int(10) unsigned NOT NULL AUTO_INCREMENT,
 			iml_imi_id int(10) unsigned NOT NULL,	
 			iml_imf_id int(10) unsigned NOT NULL,	
-			iml_value_old varchar(4000),	
-			iml_value_new varchar(4000),	
+			iml_value_old varchar(4000) NOT NULL DEFAULT \'\',	
+			iml_value_new varchar(4000) NOT NULL DEFAULT \'\',	
 			iml_usr_id_create int(10) unsigned DEFAULT NULL,
 			iml_timestamp_create timestamp NULL DEFAULT CURRENT_TIMESTAMP,	
-			iml_comment varchar(255) NULL,	
+			iml_comment varchar(255) NOT NULL DEFAULT \'\',	
 			PRIMARY KEY (iml_id)
 		');
 
diff --git a/import/import_items.php b/import/import_items.php
index 2f79723..92cdf10 100644
--- a/import/import_items.php
+++ b/import/import_items.php
@@ -110,7 +110,15 @@
             $val = $values[$imfNameIntern];
         }
         elseif($imfNameIntern === 'KEEPER') {
-            $sql = 'SELECT usr_id, CONCAT(last_name.usd_value, \', \', first_name.usd_value, IFNULL(CONCAT(\', \', postcode.usd_value),\'\'), IFNULL(CONCAT(\' \', city.usd_value),\'\'), IFNULL(CONCAT(\', \', street.usd_value),\'\') ) as name
+            if (substr_count($values[$imfNameIntern], ',') === 1) {
+                $sql = 'SELECT usr_id, CONCAT(last_name.usd_value, \', \', first_name.usd_value) as name
+                    FROM ' . TBL_USERS . '
+                    JOIN ' . TBL_USER_DATA . ' as last_name ON last_name.usd_usr_id = usr_id AND last_name.usd_usf_id = ' . $gProfileFields->getProperty('LAST_NAME', 'usf_id') . '
+                    JOIN ' . TBL_USER_DATA . ' as first_name ON first_name.usd_usr_id = usr_id AND first_name.usd_usf_id = ' . $gProfileFields->getProperty('FIRST_NAME', 'usf_id') . '
+                    WHERE usr_valid = 1 AND EXISTS (SELECT 1 FROM ' . TBL_MEMBERS . ', ' . TBL_ROLES . ', ' . TBL_CATEGORIES . ' WHERE mem_usr_id = usr_id AND mem_rol_id = rol_id AND mem_begin <= \'' . DATE_NOW . '\' AND mem_end > \'' . DATE_NOW . '\' AND rol_valid = 1 AND rol_cat_id = cat_id AND (cat_org_id = ' . $gCurrentOrgId . ' OR cat_org_id IS NULL)) ORDER BY last_name.usd_value, first_name.usd_value;';
+            }
+            else {
+                $sql = 'SELECT usr_id, CONCAT(last_name.usd_value, \', \', first_name.usd_value, IFNULL(CONCAT(\', \', postcode.usd_value),\'\'), IFNULL(CONCAT(\' \', city.usd_value),\'\'), IFNULL(CONCAT(\', \', street.usd_value),\'\') ) as name
                 FROM ' . TBL_USERS . '
                 JOIN ' . TBL_USER_DATA . ' as last_name ON last_name.usd_usr_id = usr_id AND last_name.usd_usf_id = ' . $gProfileFields->getProperty('LAST_NAME', 'usf_id') . '
                 JOIN ' . TBL_USER_DATA . ' as first_name ON first_name.usd_usr_id = usr_id AND first_name.usd_usf_id = ' . $gProfileFields->getProperty('FIRST_NAME', 'usf_id') . '
@@ -118,6 +126,8 @@
                 LEFT JOIN ' . TBL_USER_DATA . ' as city ON city.usd_usr_id = usr_id AND city.usd_usf_id = ' . $gProfileFields->getProperty('CITY', 'usf_id') . '
                 LEFT JOIN ' . TBL_USER_DATA . ' as street ON street.usd_usr_id = usr_id AND street.usd_usf_id = ' . $gProfileFields->getProperty('ADDRESS', 'usf_id') . '
                 WHERE usr_valid = 1 AND EXISTS (SELECT 1 FROM ' . TBL_MEMBERS . ', ' . TBL_ROLES . ', ' . TBL_CATEGORIES . ' WHERE mem_usr_id = usr_id AND mem_rol_id = rol_id AND mem_begin <= \'' . DATE_NOW . '\' AND mem_end > \'' . DATE_NOW . '\' AND rol_valid = 1 AND rol_cat_id = cat_id AND (cat_org_id = ' . $gCurrentOrgId . ' OR cat_org_id IS NULL)) ORDER BY last_name.usd_value, first_name.usd_value;';
+            }
+
             $result = $gDb->queryPrepared($sql);
 
             while ($row = $result->fetch()) {
@@ -129,7 +139,15 @@
             }
         }
         elseif($imfNameIntern === 'LAST_RECEIVER') {
-            $sql = 'SELECT usr_id, CONCAT(last_name.usd_value, \', \', first_name.usd_value, IFNULL(CONCAT(\', \', postcode.usd_value),\'\'), IFNULL(CONCAT(\' \', city.usd_value),\'\'), IFNULL(CONCAT(\', \', street.usd_value),\'\') ) as name
+            if (substr_count($values[$imfNameIntern], ',') === 1) {
+                $sql = 'SELECT usr_id, CONCAT(last_name.usd_value, \', \', first_name.usd_value) as name
+                    FROM ' . TBL_USERS . '
+                    JOIN ' . TBL_USER_DATA . ' as last_name ON last_name.usd_usr_id = usr_id AND last_name.usd_usf_id = ' . $gProfileFields->getProperty('LAST_NAME', 'usf_id') . '
+                    JOIN ' . TBL_USER_DATA . ' as first_name ON first_name.usd_usr_id = usr_id AND first_name.usd_usf_id = ' . $gProfileFields->getProperty('FIRST_NAME', 'usf_id') . '
+                    WHERE usr_valid = 1 AND EXISTS (SELECT 1 FROM ' . TBL_MEMBERS . ', ' . TBL_ROLES . ', ' . TBL_CATEGORIES . ' WHERE mem_usr_id = usr_id AND mem_rol_id = rol_id AND mem_begin <= \'' . DATE_NOW . '\' AND mem_end > \'' . DATE_NOW . '\' AND rol_valid = 1 AND rol_cat_id = cat_id AND (cat_org_id = ' . $gCurrentOrgId . ' OR cat_org_id IS NULL)) ORDER BY last_name.usd_value, first_name.usd_value;';
+            }
+            else {
+                $sql = 'SELECT usr_id, CONCAT(last_name.usd_value, \', \', first_name.usd_value, IFNULL(CONCAT(\', \', postcode.usd_value),\'\'), IFNULL(CONCAT(\' \', city.usd_value),\'\'), IFNULL(CONCAT(\', \', street.usd_value),\'\') ) as name
                 FROM ' . TBL_USERS . '
                 JOIN ' . TBL_USER_DATA . ' as last_name ON last_name.usd_usr_id = usr_id AND last_name.usd_usf_id = ' . $gProfileFields->getProperty('LAST_NAME', 'usf_id') . '
                 JOIN ' . TBL_USER_DATA . ' as first_name ON first_name.usd_usr_id = usr_id AND first_name.usd_usf_id = ' . $gProfileFields->getProperty('FIRST_NAME', 'usf_id') . '
@@ -137,6 +155,8 @@
                 LEFT JOIN ' . TBL_USER_DATA . ' as city ON city.usd_usr_id = usr_id AND city.usd_usf_id = ' . $gProfileFields->getProperty('CITY', 'usf_id') . '
                 LEFT JOIN ' . TBL_USER_DATA . ' as street ON street.usd_usr_id = usr_id AND street.usd_usf_id = ' . $gProfileFields->getProperty('ADDRESS', 'usf_id') . '
                 WHERE usr_valid = 1 AND EXISTS (SELECT 1 FROM ' . TBL_MEMBERS . ', ' . TBL_ROLES . ', ' . TBL_CATEGORIES . ' WHERE mem_usr_id = usr_id AND mem_rol_id = rol_id AND mem_begin <= \'' . DATE_NOW . '\' AND mem_end > \'' . DATE_NOW . '\' AND rol_valid = 1 AND rol_cat_id = cat_id AND (cat_org_id = ' . $gCurrentOrgId . ' OR cat_org_id IS NULL)) ORDER BY last_name.usd_value, first_name.usd_value;';
+            }
+
             $result = $gDb->queryPrepared($sql);
 
             while ($row = $result->fetch()) {