diff --git a/php/model/DatabaseArticleManager.php b/php/model/DatabaseArticleManager.php
index ad49ea4..c8fed6a 100644
--- a/php/model/DatabaseArticleManager.php
+++ b/php/model/DatabaseArticleManager.php
@@ -338,7 +338,8 @@ class DatabaseArticleManager implements ArticleManagerDAO {
             $sql = "SELECT id, title, content, author, category, tags, created 
                     FROM articles 
                     WHERE title LIKE :keyword 
-                       OR content LIKE :keyword;";
+                       OR content LIKE :keyword;
+                       OR tags LIKE :keyword";
 
             $command = $db->prepare($sql);
             if (!$command) {
diff --git a/php/model/LocalArticleManager.php b/php/model/LocalArticleManager.php
index aab081a..32c48a5 100644
--- a/php/model/LocalArticleManager.php
+++ b/php/model/LocalArticleManager.php
@@ -211,9 +211,11 @@ class LocalArticleManager implements ArticleManagerDAO {
         foreach ($articles as $article) {
             $title = isset($article['title']) ? strtolower((string)$article['title']) : '';
             $content = isset($article['content']) ? strtolower((string)$article['content']) : '';
+            $tags = isset($article['tags']) ? strtolower((string)$article['tags']) : '';
 
             if (($cleanKeyword !== '' && strpos($title, $cleanKeyword) !== false) ||
-                ($cleanKeyword !== '' && strpos($content, $cleanKeyword) !== false)) {
+                ($cleanKeyword !== '' && strpos($content, $cleanKeyword) !== false) ||
+                ($cleanKeyword !== '' && strpos($tags, $cleanKeyword) !== false)) {
 
                 $likes = isset($article['likes']) && is_array($article['likes']) ? $article['likes'] : [];
                 $filteredArticles[] = new Article(