server/AyaNova/Controllers/TagListController.cs

@@ -46,7 +46,7 @@ namespace AyaNova.Api.Controllers
         /// Required roles: Any
         /// </summary>
         /// <param name="query">The query to filter the returned list by</param>
-        /// <returns>List</returns>
+        /// <returns>Filtered list (maximum 25 items are returned for any query)</returns>
         [HttpGet("picklist")]
         public ActionResult GetPickList([FromQuery]string query)
         {

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).Take(3).ToList();
+                return ct.Tag.Where(x => x.Name.Contains(q)).OrderBy(x => x.Name).Select(x => x.Name).Take(25).ToList();
             }
         }