diff --git a/src/public/js/alert.js b/src/public/js/components/alert.js
similarity index 100%
rename from src/public/js/alert.js
rename to src/public/js/components/alert.js
diff --git a/src/server/app/View/catalog/index.php b/src/server/app/View/catalog/index.php
index 64e6686556b9c6474d730694472733c858ba41cf..b8c4989429147221b61c1d56c38b9ac73826513b 100644
--- a/src/server/app/View/catalog/index.php
+++ b/src/server/app/View/catalog/index.php
@@ -31,7 +31,7 @@ function pagination(int $currentPage, int $totalPage)
         <form action="/catalog">
             <div class="input">
                 <label>Category</label>
-                <?php selectCategory($category ?? ""); ?>
+                <?php selectCategory($model['data']['category'] ?? ""); ?>
             </div>
             <button class="btn-primary" type="submit">
                 Apply
diff --git a/src/server/app/View/components/header.php b/src/server/app/View/components/header.php
index bcdccd1acb62148c30f27c236c66ccd676d2f066..9ee02898b4c4fdfb4f1ba16a88d465c7ae236c5a 100644
--- a/src/server/app/View/components/header.php
+++ b/src/server/app/View/components/header.php
@@ -31,7 +31,7 @@
     <!-- JS -->
     <script type="text/javascript" src="/js/components/select.js" defer></script>
     <script type="text/javascript" src="/js/components/modal.js" defer></script>
-    <script type='text/javascript' src='/js/alert.js' defer></script>
+    <script type='text/javascript' src='/js/components/alert.js' defer></script>
 
     <?php foreach ($model['js'] ?? [] as $js): ?>
         <script type='text/javascript' src='<?= $js ?>' defer></script>