diff --git a/src/de/cses/client/ornamentic/OrnamenticFilter.java b/src/de/cses/client/ornamentic/OrnamenticFilter.java
index e7f64a99..20edb17c 100644
--- a/src/de/cses/client/ornamentic/OrnamenticFilter.java
+++ b/src/de/cses/client/ornamentic/OrnamenticFilter.java
@@ -894,7 +894,7 @@ public SafeHtml render(OrnamentClassEntry item) {
 		ContentPanel remarksPanel = new ContentPanel();
 		remarksPanel.setHeaderVisible(true);
 		remarksPanel.setToolTip(Util.createToolTip("Search for ornament remarks."));
-		remarksPanel.setHeading("Ornament Refmarks");
+		remarksPanel.setHeading("Ornament Remarks");
 		remarksPanel.add(ornamentRemarksSearchTF);
 		ornamenticFilterVLC.add(remarksPanel);
 
diff --git a/src/de/cses/server/mysql/MysqlConnector.java b/src/de/cses/server/mysql/MysqlConnector.java
index 6ddbf3b3..197e2b20 100644
--- a/src/de/cses/server/mysql/MysqlConnector.java
+++ b/src/de/cses/server/mysql/MysqlConnector.java
@@ -1852,11 +1852,11 @@ public ArrayList<AnnotatedBibliographyEntry> searchAnnotatedBibliography(Annotat
 			String editorTerm = "";
 			for (String name : searchEntry.getAuthorSearch().split("\\s+")) {
 				authorTerm += authorTerm.isEmpty() 
-						? "SELECT BibID FROM AuthorBibliographyRelation WHERE (AuthorID IN (SELECT DISTINCT AuthorID FROM Authors WHERE (FirstName LIKE ?) OR (LastName LIKE ?) OR (Institution LIKE ?)))"
-						: " INTERSECT SELECT BibID FROM AuthorBibliographyRelation WHERE (AuthorID IN (SELECT DISTINCT AuthorID FROM Authors WHERE (FirstName LIKE ?) OR (LastName LIKE ?) OR (Institution LIKE ?)))";
+						? "SELECT BibID FROM AuthorBibliographyRelation WHERE (AuthorID IN (SELECT DISTINCT AuthorID FROM Authors WHERE (FirstName LIKE ?) OR (LastName LIKE ?) OR (Institution LIKE ?) OR (Alias LIKE ?)))"
+						: " INTERSECT SELECT BibID FROM AuthorBibliographyRelation WHERE (AuthorID IN (SELECT DISTINCT AuthorID FROM Authors WHERE (FirstName LIKE ?) OR (LastName LIKE ?) OR (Institution LIKE ?) OR (Alias LIKE ?)))";
 				editorTerm += editorTerm.isEmpty() 
-						? "SELECT BibID FROM EditorBibliographyRelation WHERE (AuthorID IN (SELECT DISTINCT AuthorID FROM Authors WHERE (FirstName LIKE ?) OR (LastName LIKE ?) OR (Institution LIKE ?)))"
-						: " INTERSECT SELECT BibID FROM EditorBibliographyRelation WHERE (AuthorID IN (SELECT DISTINCT AuthorID FROM Authors WHERE (FirstName LIKE ?) OR (LastName LIKE ?) OR (Institution LIKE ?)))";
+						? "SELECT BibID FROM EditorBibliographyRelation WHERE (AuthorID IN (SELECT DISTINCT AuthorID FROM Authors WHERE (FirstName LIKE ?) OR (LastName LIKE ?) OR (Institution LIKE ?) OR (Alias LIKE ?)))"
+						: " INTERSECT SELECT BibID FROM EditorBibliographyRelation WHERE (AuthorID IN (SELECT DISTINCT AuthorID FROM Authors WHERE (FirstName LIKE ?) OR (LastName LIKE ?) OR (Institution LIKE ?) OR (Alias LIKE ?)))";
 			}
 			where = "BibID IN (" + authorTerm + ") OR BibID IN (" + editorTerm + ")";
 		}
@@ -1901,11 +1901,13 @@ public ArrayList<AnnotatedBibliographyEntry> searchAnnotatedBibliography(Annotat
 					pstmt.setString(i++, "%" + name + "%");
 					pstmt.setString(i++, "%" + name + "%");
 					pstmt.setString(i++, "%" + name + "%");
+					pstmt.setString(i++, "%" + name + "%");
 				}
 				for (String name : searchEntry.getAuthorSearch().split("\\s+")) {
 					pstmt.setString(i++, "%" + name + "%");
 					pstmt.setString(i++, "%" + name + "%");
 					pstmt.setString(i++, "%" + name + "%");
+					pstmt.setString(i++, "%" + name + "%");
 				}
 			}
 			if (searchEntry.getPublisherSearch() != null && !searchEntry.getPublisherSearch().isEmpty()) {