diff --git a/include/diaspora.php b/include/diaspora.php
index 94c6ccfb8d..3b4832e74f 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -2290,7 +2290,7 @@ class diaspora {
 				$body = "[img]".unxmlify($photo->remote_photo_path).
 					unxmlify($photo->remote_photo_name)."[/img]\n".$body;
 
-			$datarray["object-type"] = ACTIVITY_OBJ_PHOTO;
+			$datarray["object-type"] = ACTIVITY_OBJ_IMAGE;
 		} else {
 			$datarray["object-type"] = ACTIVITY_OBJ_NOTE;
 
diff --git a/include/like.php b/include/like.php
index 8223cf3626..b04b9b4e09 100644
--- a/include/like.php
+++ b/include/like.php
@@ -164,7 +164,7 @@ function do_like($item_id, $verb) {
 	$post_type = (($item['resource-id']) ? t('photo') : t('status'));
 	if($item['object-type'] === ACTIVITY_OBJ_EVENT)
 		$post_type = t('event');
-	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE );
+	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
 	$link = xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
 	$body = $item['body'];
 
diff --git a/include/notifier.php b/include/notifier.php
index 9e1450ba2b..d78db4055d 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -576,7 +576,7 @@ function notifier_run(&$argv, &$argc){
 			$r0 = array();
 
 		$r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s'
-			AND `uid` = %d AND `rel` != %d group by `batch` ORDER BY rand() ",
+			AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch` ORDER BY rand()",
 			dbesc(NETWORK_DIASPORA),
 			intval($owner['uid']),
 			intval(CONTACT_IS_SHARING)
diff --git a/mod/photos.php b/mod/photos.php
index 8d97a30051..317d7272b4 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -681,7 +681,7 @@ function photos_post(App &$a) {
 					$arr['visible']       = 1;
 					$arr['verb']          = ACTIVITY_TAG;
 					$arr['object-type']   = ACTIVITY_OBJ_PERSON;
-					$arr['target-type']   = ACTIVITY_OBJ_PHOTO;
+					$arr['target-type']   = ACTIVITY_OBJ_IMAGE;
 					$arr['tag']           = $tagged[4];
 					$arr['inform']        = $tagged[2];
 					$arr['origin']        = 1;
@@ -694,7 +694,7 @@ function photos_post(App &$a) {
 						$arr['object'] .= xmlify('<link rel="photo" type="'.$p[0]['type'].'" href="' . $tagged[3]['photo'] . '" />' . "\n");
 					$arr['object'] .= '</link></object>' . "\n";
 
-					$arr['target'] = '<target><type>' . ACTIVITY_OBJ_PHOTO . '</type><title>' . $p[0]['desc'] . '</title><id>'
+					$arr['target'] = '<target><type>' . ACTIVITY_OBJ_IMAGE . '</type><title>' . $p[0]['desc'] . '</title><id>'
 						. App::get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '</id>';
 					$arr['target'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '" />' . "\n" . '<link rel="preview" type="'.$p[0]['type'].'" href="' . App::get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '" />') . '</link></target>';
 
diff --git a/mod/subthread.php b/mod/subthread.php
index 3d16f8ca9c..958f4ba03b 100644
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -86,7 +86,7 @@ function subthread_content(App &$a) {
 	$uri = item_new_uri($a->get_hostname(),$owner_uid);
 
 	$post_type = (($item['resource-id']) ? t('photo') : t('status'));
-	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE );
+	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
 	$link = xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
 	$body = $item['body'];
 
diff --git a/mod/tagger.php b/mod/tagger.php
index 4d93047e26..b1f91d1bc4 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -60,7 +60,7 @@ function tagger_content(App &$a) {
 	$uri = item_new_uri($a->get_hostname(),$owner_uid);
 	$xterm = xmlify($term);
 	$post_type = (($item['resource-id']) ? t('photo') : t('status'));
-	$targettype = (($item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE );
+	$targettype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
 
 	$link = xmlify('<link rel="alternate" type="text/html" href="'
 		. App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;