diff --git a/api/challenge/challenge.php b/api/challenge/challenge.php
index 911599bb49ff7c12a98afddbf451760767f936fc..0dd3601e710579a847fd10a8a6b0d153c82a2a5e 100644
--- a/api/challenge/challenge.php
+++ b/api/challenge/challenge.php
@@ -31,7 +31,7 @@ $sql1 .= " LIMIT $start, $limit";
 $sql2 = "SELECT COUNT(id) AS id FROM quest";
 
 if ($search !== '') {
-    $sql2 .= " AND name LIKE '%$search%'";
+    $sql2 .= " WHERE $searchAttr LIKE '%$search%'";
 }
 
 $result = $conn->query($sql1);
diff --git a/app/views/challenge/index.php b/app/views/challenge/index.php
index e4c881ba1a986ff51bd2f7a29917af471df45b6c..464fcc9824fd6fb1c7375f341c578fbba4b10247 100644
--- a/app/views/challenge/index.php
+++ b/app/views/challenge/index.php
@@ -31,6 +31,7 @@ if (!isset($_SESSION['username'])) {
                     <option value="id">ID</option>
                     <option value="name">Name</option>
                     <option value="description">Description</option>
+                    <option value="threshold">Threshold</option>
                 </select>
             </div>
             <div class="filter-sort-container">
diff --git a/public/js/challenge.js b/public/js/challenge.js
index 46c9015b1e1e75b4cd76bcb79a26dbbdd1bcdae2..bf9a5e8a4da15f5311f27e582a73e80ff9ef8cc5 100644
--- a/public/js/challenge.js
+++ b/public/js/challenge.js
@@ -8,23 +8,23 @@ document.addEventListener('DOMContentLoaded', function () {
 
     var page = urlParams.get("page");
     
-    var achievementLimitCookie = document.cookie.split('; ').find(cookie => cookie.startsWith('collection-limit='));
+    var achievementLimitCookie = document.cookie.split('; ').find(cookie => cookie.startsWith('challenge-limit='));
     var limit = achievementLimitCookie ? achievementLimitCookie.split('=')[1] : 5;
     document.getElementById('page-limit').value = limit;
 
-    var achievementSearchCookie = document.cookie.split('; ').find(cookie => cookie.startsWith('collection-search='));
+    var achievementSearchCookie = document.cookie.split('; ').find(cookie => cookie.startsWith('challenge-search='));
     var search = achievementSearchCookie ? achievementSearchCookie.split('=')[1] : "";
     document.getElementById('searchInput').value = search;
 
-    var achievementSearchAttributeCookie = document.cookie.split('; ').find(cookie => cookie.startsWith('collection-search-type='));
+    var achievementSearchAttributeCookie = document.cookie.split('; ').find(cookie => cookie.startsWith('challenge-search-type='));
     var searchType = achievementSearchAttributeCookie ? achievementSearchAttributeCookie.split('=')[1] : "name";
     document.getElementById('search-attribute').value = searchType;
 
-    var achievementSortCookie = document.cookie.split('; ').find(cookie => cookie.startsWith('collection-sort='));
+    var achievementSortCookie = document.cookie.split('; ').find(cookie => cookie.startsWith('challenge-sort='));
     var sort = achievementSortCookie ? achievementSortCookie.split('=')[1] : "default";
     document.getElementById('sort-by').value = sort;
 
-    var achievementOrderCookie = document.cookie.split('; ').find(cookie => cookie.startsWith('collection-order='));
+    var achievementOrderCookie = document.cookie.split('; ').find(cookie => cookie.startsWith('challenge-order='));
     var order = achievementOrderCookie ? achievementOrderCookie.split('=')[1] : "asc";
     document.getElementById('sort-type').value = order;
 
@@ -57,7 +57,7 @@ document.addEventListener('DOMContentLoaded', function () {
         if (!limit || limit === "null" || limit === "undefined") {
             limit = 5;
         }
-        document.cookie = `collection-limit=${limit}; path=/`
+        document.cookie = `challenge-limit=${limit}; path=/`
         loadAchievementPage(1);
     });
 
@@ -70,7 +70,7 @@ document.addEventListener('DOMContentLoaded', function () {
         }
 
         timeout = setTimeout(function () {
-            document.cookie = `collection-search=${search}; path=/`
+            document.cookie = `challenge-search=${search}; path=/`
             loadAchievementPage(1);
         }, 500);
     });
@@ -80,7 +80,7 @@ document.addEventListener('DOMContentLoaded', function () {
         if (!searchType || searchType === "null" || searchType === "undefined") {
             searchType = "a.name";
         }
-        document.cookie = `collection-search-type=${searchType}; path=/`
+        document.cookie = `challenge-search-type=${searchType}; path=/`
         loadAchievementPage(1);
     });
 
@@ -89,7 +89,7 @@ document.addEventListener('DOMContentLoaded', function () {
         if (!sort || sort === "null" || sort === "undefined" || sort === "default") {
             sort = "default";
         }
-        document.cookie = `collection-sort=${sort}; path=/`
+        document.cookie = `challenge-sort=${sort}; path=/`
         loadAchievementPage(1);
     });
 
@@ -98,7 +98,7 @@ document.addEventListener('DOMContentLoaded', function () {
         if (!order || order === "null" || order === "undefined" || order === "default") {
             order = "default";
         }
-        document.cookie = `collection-order=${order}; path=/`
+        document.cookie = `challenge-order=${order}; path=/`
         loadAchievementPage(1);
     });