diff --git a/addressbook/inc/class.contacts_shared.inc.php b/addressbook/inc/class.contacts_shared.inc.php
index 63bf3cf5c6..e80637d32f 100644
--- a/addressbook/inc/class.contacts_shared.inc.php
+++ b/addressbook/inc/class.contacts_shared.inc.php
@@ -25,12 +25,6 @@
 
 	class contacts extends contacts_
 	{
-		var $db;
-		var $account_id;
-		var $stock_contact_fields;     // This is an array of all the fields in the addressbook
-		var $email_types;              // VCard email type array
-		var $total_records;            // This will contain numrows for data retrieved
-
 		function check_perms($has, $needed)
 		{
 			return (!!($has & $needed) == True);
diff --git a/addressbook/inc/class.contacts_sql.inc.php b/addressbook/inc/class.contacts_sql.inc.php
index a8ab829169..33ed2eb86d 100644
--- a/addressbook/inc/class.contacts_sql.inc.php
+++ b/addressbook/inc/class.contacts_sql.inc.php
@@ -40,9 +40,10 @@
 
 		var $account_id;
 		var $stock_contact_fields;	// This is an array of almost the fields in the phpgw_addressbook table, except id,owner,lid,tid,access,cat_id
-		var $email_types;				// VCard email type array
-		var $total_records;			// This will contain numrows for data retrieved
-		var $grants;					// This holds all of the users that have granted access to there entrys
+		var $non_contact_fields;    // Here are the rest
+		var $email_types;           // VCard email type array
+		var $total_records;         // This will contain numrows for data retrieved
+		var $grants;                // This holds all of the users that have granted access to there entrys
 
 		function contacts_()
 		{
@@ -106,6 +107,15 @@
 				"email_home_type"        => "email_home_type" //'INTERNET','CompuServe',etc...
 			);
 
+			$this->non_contact_fields = array(
+				"id"     => "id",
+				"lid"    => "lid",
+				"tid"    => "tid",
+				"cat_id" => "cat_id",
+				"access" => "access",
+				"owner"  => "owner"
+			);
+
 			/* Used to flag an address as being:
 			   domestic OR  international(default)
 			   parcel(default)