diff --git a/.dev-js/package.json b/.dev-js/package.json
index 99b0989e1dde9b0f71fdc229bac3aef501c06398..e3f89a123e2374a92c69575908c676a78cda095c 100644
--- a/.dev-js/package.json
+++ b/.dev-js/package.json
@@ -2,10 +2,12 @@
   "name": "aleksis-builddeps",
   "version": "1.0.0",
   "dependencies": {
-    "@intlify/eslint-plugin-vue-i18n": "^2.0.0",
+    "@graphql-eslint/eslint-plugin": "^4.3.0",
+    "@intlify/eslint-plugin-vue-i18n": "^3.0.0",
     "eslint": "^8.26.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-vue": "^9.7.0",
+    "graphql": "^16.10.0",
     "prettier": "^3.4.0",
     "stylelint": "^15.0.0",
     "stylelint-config-prettier": "^9.0.3",
diff --git a/aleksis/apps/alsijil/frontend/components/coursebook/personal_notes/personal_notes.graphql b/aleksis/apps/alsijil/frontend/components/coursebook/personal_notes/personal_notes.graphql
index 014178c1326960f02dee24cf92f8eb5c679298f5..8676c02f6ad56ef3c1514c394820cbffe4586490 100644
--- a/aleksis/apps/alsijil/frontend/components/coursebook/personal_notes/personal_notes.graphql
+++ b/aleksis/apps/alsijil/frontend/components/coursebook/personal_notes/personal_notes.graphql
@@ -1,15 +1,3 @@
-query personalNotes($orderBy: [String], $filters: JSONString) {
-  items: personalNotes(orderBy: $orderBy, filters: $filters) {
-    id
-    note
-    extraMark {
-      id
-    }
-    canEdit
-    canDelete
-  }
-}
-
 mutation createPersonalNotes($input: [BatchCreatePersonalNoteInput]!) {
   createPersonalNotes(input: $input) {
     items: personalNotes {
diff --git a/aleksis/apps/alsijil/frontend/components/coursebook/statistics/StatisticsForPersonPage.vue b/aleksis/apps/alsijil/frontend/components/coursebook/statistics/StatisticsForPersonPage.vue
index eb54b829fd2a04690465a25c0ad66366e30a36ee..dc8ae7867c6438a8a497496321545e46072f9d8f 100644
--- a/aleksis/apps/alsijil/frontend/components/coursebook/statistics/StatisticsForPersonPage.vue
+++ b/aleksis/apps/alsijil/frontend/components/coursebook/statistics/StatisticsForPersonPage.vue
@@ -1,6 +1,7 @@
 <template>
-  <fullscreen-dialog-page     :fallback-url="{ name: 'core.personById', props: { id: personId } }"
->
+  <fullscreen-dialog-page
+    :fallback-url="{ name: 'core.personById', props: { id: personId } }"
+  >
     <template #title>
       {{
         $t("alsijil.coursebook.statistics.person_page.title", {
diff --git a/aleksis/apps/alsijil/frontend/components/extra_marks/ExtraMarks.vue b/aleksis/apps/alsijil/frontend/components/extra_marks/ExtraMarks.vue
index 9468ac1dba5d291abd251659586d24aa95fe0278..4d586e852225ee9592a5634807386012b2c57405 100644
--- a/aleksis/apps/alsijil/frontend/components/extra_marks/ExtraMarks.vue
+++ b/aleksis/apps/alsijil/frontend/components/extra_marks/ExtraMarks.vue
@@ -87,7 +87,7 @@ import InlineCRUDList from "aleksis.core/components/generic/InlineCRUDList.vue";
 <script>
 import formRulesMixin from "aleksis.core/mixins/formRulesMixin.js";
 import {
-  extraMarks,
+  extraMarksList,
   createExtraMarks,
   deleteExtraMarks,
   updateExtraMarks,
@@ -121,7 +121,7 @@ export default {
         },
       ],
       i18nKey: "alsijil.extra_marks",
-      gqlQuery: extraMarks,
+      gqlQuery: extraMarksList,
       gqlCreateMutation: createExtraMarks,
       gqlPatchMutation: updateExtraMarks,
       gqlDeleteMutation: deleteExtraMarks,
diff --git a/aleksis/apps/alsijil/frontend/components/extra_marks/extra_marks.graphql b/aleksis/apps/alsijil/frontend/components/extra_marks/extra_marks.graphql
index 73e8ba4121c215dc4c3968b3ed2021b71b5ecfc1..19e763f3b83639661b375ceddca9da2d73c34ad8 100644
--- a/aleksis/apps/alsijil/frontend/components/extra_marks/extra_marks.graphql
+++ b/aleksis/apps/alsijil/frontend/components/extra_marks/extra_marks.graphql
@@ -1,4 +1,4 @@
-query extraMarks($orderBy: [String], $filters: JSONString) {
+query extraMarksList($orderBy: [String], $filters: JSONString) {
   items: extraMarks(orderBy: $orderBy, filters: $filters) {
     id
     shortName
diff --git a/pyproject.toml b/pyproject.toml
index 213cef02d306616d8a7c911059215dbe0edcaa07..50737901a7a3578cb3960c9a46b0b0500253ceea 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -48,7 +48,7 @@ url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple"
 priority = "supplemental"
 [tool.poetry.dependencies]
 python = "^3.10"
-aleksis-core = "^4.0.0.dev11"
+aleksis-core = "^4.0.0.dev16"
 aleksis-app-chronos = "^4.0.0.dev7"
 aleksis-app-kolego = "^0.1.0.dev3"