diff --git a/ArticlesDatabase/Sources/ArticlesDatabase/ArticlesTable.swift b/ArticlesDatabase/Sources/ArticlesDatabase/ArticlesTable.swift
index 61c2845ef..c495f08aa 100644
--- a/ArticlesDatabase/Sources/ArticlesDatabase/ArticlesTable.swift
+++ b/ArticlesDatabase/Sources/ArticlesDatabase/ArticlesTable.swift
@@ -145,19 +145,36 @@ final class ArticlesTable: DatabaseTable {
 	}
 
 	// MARK: - Fetching Articles for Indexer
+	private func articleSearchInfosQuery(with placeholders: String) -> String {
+		return """
+        SELECT
+            art.articleID,
+            art.title,
+            art.contentHTML,
+            art.contentText,
+            art.summary,
+            art.searchRowID,
+            (SELECT GROUP_CONCAT(name, ' ')
+                FROM authorsLookup as autL
+                JOIN authors as aut ON autL.authorID = aut.authorID
+                WHERE art.articleID = autL.articleID
+                GROUP BY autl.articleID) as authors
+        FROM articles as art
+        WHERE articleID in \(placeholders);
+        """
+	}
 
 	func fetchArticleSearchInfos(_ articleIDs: Set<String>, in database: FMDatabase) -> Set<ArticleSearchInfo>? {
 		let parameters = articleIDs.map { $0 as AnyObject }
 		let placeholders = NSString.rs_SQLValueList(withPlaceholders: UInt(articleIDs.count))!
-		let sql = "select articleID, title, contentHTML, contentText, summary, searchRowID from articles where articleID in \(placeholders);";
-
-		if let resultSet = database.executeQuery(sql, withArgumentsIn: parameters) {
+		if let resultSet = database.executeQuery(self.articleSearchInfosQuery(with: placeholders), withArgumentsIn: parameters) {
 			return resultSet.mapToSet { (row) -> ArticleSearchInfo? in
 				let articleID = row.string(forColumn: DatabaseKey.articleID)!
 				let title = row.string(forColumn: DatabaseKey.title)
 				let contentHTML = row.string(forColumn: DatabaseKey.contentHTML)
 				let contentText = row.string(forColumn: DatabaseKey.contentText)
 				let summary = row.string(forColumn: DatabaseKey.summary)
+				let authorsNames = row.string(forColumn: DatabaseKey.authors)
 
 				let searchRowIDObject = row.object(forColumnName: DatabaseKey.searchRowID)
 				var searchRowID: Int? = nil
@@ -165,7 +182,7 @@ final class ArticlesTable: DatabaseTable {
 					searchRowID = Int(row.longLongInt(forColumn: DatabaseKey.searchRowID))
 				}
 
-				return ArticleSearchInfo(articleID: articleID, title: title, contentHTML: contentHTML, contentText: contentText, summary: summary, searchRowID: searchRowID)
+				return ArticleSearchInfo(articleID: articleID, title: title, contentHTML: contentHTML, contentText: contentText, summary: summary, authorsNames: authorsNames, searchRowID: searchRowID)
 			}
 		}
 		return nil
diff --git a/ArticlesDatabase/Sources/ArticlesDatabase/SearchTable.swift b/ArticlesDatabase/Sources/ArticlesDatabase/SearchTable.swift
index 15bcb0cdd..ed08439f4 100644
--- a/ArticlesDatabase/Sources/ArticlesDatabase/SearchTable.swift
+++ b/ArticlesDatabase/Sources/ArticlesDatabase/SearchTable.swift
@@ -20,6 +20,7 @@ final class ArticleSearchInfo: Hashable {
 	let contentHTML: String?
 	let contentText: String?
 	let summary: String?
+	let authorsNames: String?
 	let searchRowID: Int?
 	
 	var preferredText: String {
@@ -34,18 +35,19 @@ final class ArticleSearchInfo: Hashable {
 
 	lazy var bodyForIndex: String = {
 		let s = preferredText.rsparser_stringByDecodingHTMLEntities()
-        let sanitizedBody = s.strippingHTML().collapsingWhitespace
-        
-        if let authorsNames = authorsNames {
-            return sanitizedBody.appending(" \(authorsNames)")
-        } else {
-            return sanitizedBody
-        }
+		let sanitizedBody = s.strippingHTML().collapsingWhitespace
+
+		if let authorsNames = authorsNames {
+			return sanitizedBody.appending(" \(authorsNames)")
+		} else {
+			return sanitizedBody
+		}
 	}()
 
-	init(articleID: String, title: String?, contentHTML: String?, contentText: String?, summary: String?, searchRowID: Int?) {
+	init(articleID: String, title: String?, contentHTML: String?, contentText: String?, summary: String?, authorsNames: String?, searchRowID: Int?) {
 		self.articleID = articleID
 		self.title = title
+		self.authorsNames = authorsNames
 		self.contentHTML = contentHTML
 		self.contentText = contentText
 		self.summary = summary
@@ -53,8 +55,13 @@ final class ArticleSearchInfo: Hashable {
 	}
 
 	convenience init(article: Article) {
-    let authorsNames = article.authors?.map({ $0.name }).reduce("", { $0.appending("").appending($1 ?? "") }).collapsingWhitespace
-    self.init(articleID: article.articleID, title: article.title, authorsNames: authorsNames, contentHTML: article.contentHTML, contentText: article.contentText, summary: article.summary, searchRowID: nil)
+		let authorsNames: String?
+		if let authors = article.authors {
+			authorsNames = authors.compactMap({ $0.name }).joined(separator: " ")
+		} else {
+			authorsNames = nil
+		}
+		self.init(articleID: article.articleID, title: article.title, contentHTML: article.contentHTML, contentText: article.contentText, summary: article.summary, authorsNames: authorsNames, searchRowID: nil)
 	}
 
 	// MARK: Hashable
@@ -66,7 +73,7 @@ final class ArticleSearchInfo: Hashable {
 	// MARK: Equatable
 
 	static func == (lhs: ArticleSearchInfo, rhs: ArticleSearchInfo) -> Bool {
-		return lhs.articleID == rhs.articleID && lhs.title == rhs.title && lhs.contentHTML == rhs.contentHTML && lhs.contentText == rhs.contentText && lhs.summary == rhs.summary && lhs.searchRowID == rhs.searchRowID
+		return lhs.articleID == rhs.articleID && lhs.title == rhs.title && lhs.contentHTML == rhs.contentHTML && lhs.contentText == rhs.contentText && lhs.summary == rhs.summary && lhs.authorsNames == rhs.authorsNames && lhs.searchRowID == rhs.searchRowID
 	}
 }