diff --git a/mod/photos.php b/mod/photos.php
index a8a62e8964..95f95048b4 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1039,7 +1039,7 @@ function photos_content(App $a)
 			$pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
 			$params = ['order' => ['id'], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
-			$items = Post::toArray(Post::selectForUser($link_item['uid'], Item::ITEM_FIELDLIST, $condition, $params));
+			$items = Post::toArray(Post::selectForUser($link_item['uid'], array_merge(Item::ITEM_FIELDLIST, ['author-alias']), $condition, $params));
 
 			if (DI::userSession()->getLocalUserId() == $link_item['uid']) {
 				Item::update(['unseen' => false], ['parent' => $link_item['parent']]);
diff --git a/src/Model/Post/Counts.php b/src/Model/Post/Counts.php
index 1b04636447..66d6bddad3 100644
--- a/src/Model/Post/Counts.php
+++ b/src/Model/Post/Counts.php
@@ -43,7 +43,7 @@ class Counts
 			Activity::EMOJIREACT, Activity::ANNOUNCE, Activity::VIEW, Activity::READ])) {
 			return true;
 		}
-	
+
 		$condition = ['thr-parent-id' => $uri_id, 'vid' => $vid, 'deleted' => false];
 
 		if ($body == $verb) {
@@ -52,7 +52,7 @@ class Counts
 		} elseif ($verb == Activity::POST) {
 			$condition['gravity'] = Item::GRAVITY_COMMENT;
 			$body                 = '';
-		} elseif (($verb != Activity::POST) && (mb_strlen($body) == 1) && Smilies::isEmojiPost($body)) {
+		} elseif ($body && mb_strlen($body) == 1 && Smilies::isEmojiPost($body)) {
 			$condition['body'] = $body;
 		} else {
 			$body = '';