diff --git a/homework/add/index.php b/homework/add/index.php
index 7c7b043..e7aecaa 100644
--- a/homework/add/index.php
+++ b/homework/add/index.php
@@ -20,8 +20,8 @@
 
 // Get all subjects
 $subjectlist = array();
-if ($stmt = $con->prepare("SELECT name, color, id, last_used, average FROM " . $config["db"]["tables"]["subjects"] . " WHERE user_id = ?")) {
-    $stmt->bind_param("s", $_SESSION["user_id"]);
+if ($stmt = $con->prepare("SELECT name, color, id, last_used, average FROM " . $config["db"]["tables"]["subjects"] . " WHERE user_id = ? AND year = ?")) {
+    $stmt->bind_param("ss", $_SESSION["user_id"], $_SESSION["setting_years"]);
     $stmt->execute();
     $stmt->bind_result($subject_name, $subject_color, $subject_id, $subject_last_used, $subject_grade_average);
     while ($stmt->fetch()) {
diff --git a/homework/edit/edit-class.js b/homework/edit/edit-homework.js
similarity index 100%
rename from homework/edit/edit-class.js
rename to homework/edit/edit-homework.js
diff --git a/homework/edit/index.php b/homework/edit/index.php
index 81c8463..c43655d 100644
--- a/homework/edit/index.php
+++ b/homework/edit/index.php
@@ -165,7 +165,7 @@
     <script src="https://assets.noten-app.de/js/jquery/jquery-3.6.1.min.js"></script>
     <script src="https://assets.noten-app.de/js/themes/themes.js"></script>
     <script src="./type-switch.js"></script>
-    <script src="./edit-subject.js"></script>
+    <script src="./edit-homework.js"></script>
     <?php if ($config["tracking"]["matomo"]["on"]) echo ($config["tracking"]["matomo"]["code"]); ?>
 </body>