diff --git a/lib/database/books.go b/lib/database/books.go
index 60194e5..7ca6fa9 100644
--- a/lib/database/books.go
+++ b/lib/database/books.go
@@ -186,7 +186,7 @@ func buildQuery(query string) (string, []columnq) {
 				columnQuerys = append(columnQuerys, columnq{"array_to_string(tags, ' ')", expr})
 			case "tag":
 				expr = strings.ToLower(expr)
-				columnQuerys = append(columnQuerys, columnq{"array_to_string(tag, ' ')", expr})
+				columnQuerys = append(columnQuerys, columnq{"array_to_string(tags, ' ')", expr})
 			case "isbn":
 				columnQuerys = append(columnQuerys, columnq{"isbn", expr})
 			case "description":
diff --git a/lib/database/stats.go b/lib/database/stats.go
index c16962f..8a26d3b 100644
--- a/lib/database/stats.go
+++ b/lib/database/stats.go
@@ -28,15 +28,18 @@ func (db *pgDB) GetTags() ([]string, error) {
 }
 
 func (db *pgDB) updateTags() {
+	var tags []string
 	err := db.sql.Model(&Book{}).
 		ColumnExpr("unnest(tags) as tag").
 		Where("active = true").
 		Group("tag").
 		Order("count(*) DESC").
 		Limit(tagsDisplay).
-		Select(&db.tags)
+		Select(&tags)
 	if err != nil {
 		log.Error("Error updating tags: ", err)
+	} else {
+		db.tags = tags
 	}
 }