diff --git a/src/Model/Item.php b/src/Model/Item.php
index d099247211..0d53049bc1 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1945,7 +1945,7 @@ class Item
 
 		$owner = User::getOwnerDataById($uid);
 		if (!DBA::isResult($owner)) {
-			Logger::warning('User not found, quitting.', ['uid' => $uid]);
+			Logger::warning('User not found, quitting here.', ['uid' => $uid]);
 			return false;
 		}
 
@@ -1954,48 +1954,45 @@ class Item
 			return false;
 		}
 
-		$item = Post::selectFirst(self::ITEM_FIELDLIST, ['id' => $item_id]);
+		$item = Post::selectFirst(self::ITEM_FIELDLIST, ['id' => $item_id, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], 'origin' => false]);
 		if (!DBA::isResult($item)) {
-			Logger::warning('Post not found, quitting.', ['id' => $item_id]);
+			Logger::debug('Post is an activity or origin or not found at all, quitting here.', ['id' => $item_id]);
 			return false;
 		}
 
-		if ($item['wall'] || $item['origin'] || ($item['gravity'] != GRAVITY_PARENT)) {
-			Logger::debug('Wall item, origin item or no parent post, quitting here.', ['wall' => $item['wall'], 'origin' => $item['origin'], 'gravity' => $item['gravity'], 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
-			return false;
-		}
-
-		$tags = Tag::getByURIId($item['uri-id'], [Tag::MENTION, Tag::EXCLUSIVE_MENTION]);
-		foreach ($tags as $tag) {
-			if (Strings::compareLink($owner['url'], $tag['url'])) {
-				$mention = true;
-				Logger::info('Mention found in tag.', ['url' => $tag['url'], 'uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
-			}
-		}
-
-		// This check can most likely be removed since we always are having the tags
-		if (!$mention) {
-			$cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER);
-			if ($cnt) {
-				foreach ($matches as $mtch) {
-					if (Strings::compareLink($owner['url'], $mtch[1])) {
-						$mention = true;
-						Logger::notice('Mention found in body.', ['mention' => $mtch[2], 'uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
-					}
+		if ($item['gravity'] == GRAVITY_PARENT) {
+			$tags = Tag::getByURIId($item['uri-id'], [Tag::MENTION, Tag::EXCLUSIVE_MENTION]);
+			foreach ($tags as $tag) {
+				if (Strings::compareLink($owner['url'], $tag['url'])) {
+					$mention = true;
+					Logger::info('Mention found in tag.', ['url' => $tag['url'], 'uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
 				}
 			}
+
+			if (!$mention) {
+				Logger::info('Top-level post without mention is deleted.', ['uri' => $item['uri'], $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
+				Post\User::delete(['uri-id' => $item['uri-id'], 'uid' => $item['uid']]);
+				return true;
+			}
+
+			$arr = ['item' => $item, 'user' => $owner];
+
+			Hook::callAll('tagged', $arr);
+		} else {
+			$tags = Tag::getByURIId($item['parent-uri-id'], [Tag::MENTION, Tag::EXCLUSIVE_MENTION]);
+			foreach ($tags as $tag) {
+				if (Strings::compareLink($owner['url'], $tag['url'])) {
+					$mention = true;
+					Logger::info('Mention found in parent tag.', ['url' => $tag['url'], 'uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
+				}
+			}
+
+			if (!$mention) {
+				Logger::debug('No mentions found in parent, quitting here.', ['id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
+				return false;
+			}
 		}
 
-		if (!$mention) {
-			Logger::info('Top-level post without mention is deleted.', ['uri' => $item['uri'], $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
-			Post\User::delete(['uri-id' => $item['uri-id'], 'uid' => $item['uid']]);
-			return true;
-		}
-
-		$arr = ['item' => $item, 'user' => $owner];
-
-		Hook::callAll('tagged', $arr);
-
 		Logger::info('Community post will be distributed', ['uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
 
 		if ($owner['page-flags'] == User::PAGE_FLAGS_PRVGROUP) {
diff --git a/src/Model/Post/UserNotification.php b/src/Model/Post/UserNotification.php
index 79499897dd..604e8efe55 100644
--- a/src/Model/Post/UserNotification.php
+++ b/src/Model/Post/UserNotification.php
@@ -182,6 +182,11 @@ class UserNotification
 			return;
 		}
 
+		$author = Contact::getById($item['author-id'], ['contact-type']);
+		if (empty($author)) {
+			return;
+		}
+
 		$notification_type = self::TYPE_NONE;
 
 		if (self::checkShared($item, $uid)) {
@@ -232,7 +237,7 @@ class UserNotification
 			}
 		}
 
-		if (self::checkDirectCommentedThread($item, $contacts)) {
+		if (($contact['contact-type'] != Contact::TYPE_COMMUNITY) && self::checkDirectCommentedThread($item, $contacts)) {
 			$notification_type = $notification_type | self::TYPE_DIRECT_THREAD_COMMENT;
 			if (!$notified) {
 				self::insertNotificationByItem(self::TYPE_DIRECT_THREAD_COMMENT, $uid, $item);
diff --git a/src/Navigation/Notifications/Factory/Notification.php b/src/Navigation/Notifications/Factory/Notification.php
index 6578238343..7cc17f8fe3 100644
--- a/src/Navigation/Notifications/Factory/Notification.php
+++ b/src/Navigation/Notifications/Factory/Notification.php
@@ -82,7 +82,7 @@ class Notification extends BaseFactory implements ICanCreateFromTableRow
 	{
 		$message = [];
 
-		$causer = $author = Contact::getById($Notification->actorId, ['id', 'name', 'url', 'pending']);
+		$causer = $author = Contact::getById($Notification->actorId, ['id', 'name', 'url', 'contact-type', 'pending']);
 		if (empty($causer)) {
 			$this->logger->info('Causer not found', ['contact' => $Notification->actorId]);
 			return $message;
@@ -124,7 +124,7 @@ class Notification extends BaseFactory implements ICanCreateFromTableRow
 			}
 
 			if (in_array($Notification->type, [Post\UserNotification::TYPE_COMMENT_PARTICIPATION, Post\UserNotification::TYPE_ACTIVITY_PARTICIPATION, Post\UserNotification::TYPE_SHARED])) {
-				$author = Contact::getById($item['author-id'], ['id', 'name', 'url']);
+				$author = Contact::getById($item['author-id'], ['id', 'name', 'url', 'contact-type']);
 				if (empty($author)) {
 					$this->logger->info('Author not found', ['author' => $item['author-id']]);
 					return $message;