diff --git a/server/AyaNova/Startup.cs b/server/AyaNova/Startup.cs
index f3becdc7..87d62559 100644
--- a/server/AyaNova/Startup.cs
+++ b/server/AyaNova/Startup.cs
@@ -98,7 +98,7 @@ namespace AyaNova
             bool LOG_SENSITIVE_DATA = false;
 
 #if (DEBUG)
-            //LOG_SENSITIVE_DATA = true;
+          // LOG_SENSITIVE_DATA = true;
 
 #endif
 
diff --git a/server/AyaNova/biz/TagUtil.cs b/server/AyaNova/biz/TagUtil.cs
index 9eff059c..dd334352 100644
--- a/server/AyaNova/biz/TagUtil.cs
+++ b/server/AyaNova/biz/TagUtil.cs
@@ -167,7 +167,7 @@ namespace AyaNova.Biz
             else
             {
                 q = NormalizeTag(q);
-                return ct.Tag.Where(x => x.Name.Contains(q)).OrderBy(x => x.Name).Select(x => x.Name).ToList();
+                return ct.Tag.Where(x => x.Name.Contains(q)).OrderBy(x => x.Name).Select(x => x.Name).Take(3).ToList();
             }
         }