diff --git a/include/notifier.php b/include/notifier.php
index b94c21e715..24e54373aa 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -162,6 +162,12 @@
 	}
 	else {
 
+		require_once('include/items.php');
+
+		$verb = construct_verb($item);
+		$actobj = construct_activity($item);
+
+
 		if($followup) {
 			foreach($items as $item) {
 				if($item['id'] == $item_id) {
@@ -175,6 +181,10 @@
 							$item['created'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
 						'$updated' => xmlify(datetime_convert('UTC', 'UTC', 
 							$item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
+						'$location' => xmlify($item['location']),
+						'$type' => 'text',
+						'$verb' => xmlify($verb),
+						'$actobj' => $actobj,
 						'$content' => xmlify($item['body']),
 						'$parent_id' => xmlify($item['parent-uri']),
 						'$comment_allow' => 0
@@ -209,6 +219,9 @@
 									'$updated' => xmlify(datetime_convert('UTC', 'UTC', 
 										$item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
 									'$location' => xmlify($item['location']),
+									'$type' => 'text',
+									'$verb' => xmlify($verb),
+									'$actobj' => $actobj,
 									'$content' =>xmlify($item['body']),
 									'$comment_allow' => (($item['last-child'] && strlen($contact['dfrn-id'])) ? 1 : 0)
 								));
@@ -225,6 +238,10 @@
 									'$updated' => xmlify(datetime_convert('UTC', 'UTC', 
 										$item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
 									'$content' =>xmlify($item['body']),
+									'$location' =>xmlify($item['location']),
+									'$type' => 'text',
+									'$verb' => xmlify($verb),
+									'$actobj' => $actobj,
 									'$parent_id' => xmlify($item['parent-uri']),
 									'$comment_allow' => (($item['last-child']) ? 1 : 0)
 								));
diff --git a/include/poller.php b/include/poller.php
index 1e0d61337c..62bfdf8e30 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -1,5 +1,6 @@
 <?php
 
+	$debugging = true;
 
 	require_once('boot.php');
 
@@ -71,6 +72,8 @@
 
 		$importer = $r[0];
 
+echo "IMPORTER: {$importer['name']}";
+
 		$last_update = (($contact['last-update'] == '0000-00-00 00:00:00') 
 			? datetime_convert('UTC','UTC','now - 30 days','Y-m-d\TH:i:s\Z')
 			: datetime_convert('UTC','UTC',$contact['last-update'],'Y-m-d\TH:i:s\Z'));
@@ -212,10 +215,11 @@ echo "Length:" . strlen($xml) . "\r\n";
 					if($item['uri'] == $item['parent-uri']) {
 						$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
 							`body` = '', `title` = ''
-							WHERE `parent-uri` = '%s'",
+							WHERE `parent-uri` = '%s' AND `uid` = %d",
 							dbesc($when),
 							dbesc(datetime_convert()),
-							dbesc($item['uri'])
+							dbesc($item['uri']),
+							intval($importer['uid'])
 						);
 					}
 					else {
@@ -235,9 +239,10 @@ echo "Length:" . strlen($xml) . "\r\n";
 								intval($item['uid'])
 							);
 							// who is the last child now? 
-							$r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 
+							$r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `uid` = %d 
 								ORDER BY `edited` DESC LIMIT 1",
-									dbesc($item['parent-uri'])
+									dbesc($item['parent-uri']),
+									intval($importer['uid'])
 							);
 							if(count($r)) {
 								q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",
@@ -274,9 +279,10 @@ echo "Length:" . strlen($xml) . "\r\n";
 				if(count($r)) {
 					$allow = $item->get_item_tags( NAMESPACE_DFRN, 'comment-allow');
 					if($allow && $allow[0]['data'] != $r[0]['last-child']) {
-						$r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s'",
+						$r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
 							dbesc(datetime_convert()),
-							dbesc($parent_uri)
+							dbesc($parent_uri),
+							intval($importer['uid'])
 						);
 						$r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s'  WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 							intval($allow[0]['data']),
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 433f69d112..1164bafe39 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -129,10 +129,11 @@ function dfrn_notify_post(&$a) {
 				$item = $r[0];
 				if($item['uri'] == $item['parent-uri']) {
 					$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s'
-						WHERE `parent-uri` = '%s'",
+						WHERE `parent-uri` = '%s' AND `uid` = %d",
 						dbesc($when),
 						dbesc(datetime_convert()),
-						dbesc($item['uri'])
+						dbesc($item['uri']),
+						intval($importer['importer_uid'])
 					);
 				}
 				else {
@@ -151,9 +152,10 @@ function dfrn_notify_post(&$a) {
 							intval($item['uid'])
 						);
 						// who is the last child now? 
-						$r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 
+						$r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `uid` = %d
 							ORDER BY `edited` DESC LIMIT 1",
-								dbesc($item['parent-uri'])
+								dbesc($item['parent-uri']),
+								intval($importer['importer_uid'])
 						);
 						if(count($r)) {
 							q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",
@@ -261,8 +263,9 @@ function dfrn_notify_post(&$a) {
 			
 				if($importer['notify-flags'] & NOTIFY_COMMENT) {
 
-					$myconv = q("SELECT `author-link` FROM `item` WHERE `parent-uri` = '%s'",
-						dbesc($parent_uri)
+					$myconv = q("SELECT `author-link` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d",
+						dbesc($parent_uri),
+						intval($importer['importer_uid'])
 					);
 					if(count($myconv)) {
 						foreach($myconv as $conv) {
diff --git a/mod/item.php b/mod/item.php
index 08f65dca16..20a2488c51 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -287,8 +287,9 @@ function item_content(&$a) {
 					intval($item['uid'])
 				);
 				// who is the last child now? 
-				$r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 ORDER BY `edited` DESC LIMIT 1",
-					dbesc($item['parent-uri'])
+				$r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `uid` = %d ORDER BY `edited` DESC LIMIT 1",
+					dbesc($item['parent-uri']),
+					intval($item['uid'])
 				);
 				if(count($r)) {
 					q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",