diff --git a/arches_lingo/src/arches_lingo/components/generic/LabelEditor.vue b/arches_lingo/src/arches_lingo/components/generic/LabelEditor.vue
index b7c459af..6932d083 100644
--- a/arches_lingo/src/arches_lingo/components/generic/LabelEditor.vue
+++ b/arches_lingo/src/arches_lingo/components/generic/LabelEditor.vue
@@ -114,7 +114,7 @@ async function save() {
         } else {
             await updateSchemeLabel(
                 route.params.id as string,
-                formValue.value.tileid as string,
+                formValue.value.tileid,
                 formValue.value,
             );
         }
diff --git a/arches_lingo/src/arches_lingo/components/scheme/editor/SchemeEditor.vue b/arches_lingo/src/arches_lingo/components/scheme/editor/SchemeEditor.vue
index 8beadd54..b07b4196 100644
--- a/arches_lingo/src/arches_lingo/components/scheme/editor/SchemeEditor.vue
+++ b/arches_lingo/src/arches_lingo/components/scheme/editor/SchemeEditor.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onBeforeUpdate, ref, watch } from "vue";
+import { onBeforeUpdate, ref, shallowRef, watch } from "vue";
 import { useGettext } from "vue3-gettext";
 import Button from "primevue/button";
 import SchemeNamespace from "@/arches_lingo/components/scheme/report/SchemeNamespace.vue";
@@ -23,7 +23,7 @@ type SchemeComponent = {
 };
 
 const childRefs = ref<Array<SectionTypes>>([]);
-const currentEditor = ref<SchemeComponent>();
+const currentEditor = shallowRef<SchemeComponent>();
 const schemeComponents = [
     {
         component: SchemeLabel,
diff --git a/arches_lingo/utils/query_expressions.py b/arches_lingo/utils/query_expressions.py
index f8749a2e..2b6878f9 100644
--- a/arches_lingo/utils/query_expressions.py
+++ b/arches_lingo/utils/query_expressions.py
@@ -5,6 +5,7 @@ class JsonbArrayElements(Func):
     """https://forum.djangoproject.com/t/django-4-2-behavior-change-when-using-arrayagg-on-unnested-arrayfield-postgresql-specific/21547/5"""
 
     arity = 1
+    # TODO: Django 5.2/Arches 8.0: use set_returning = True
     contains_subquery = True
     function = "JSONB_ARRAY_ELEMENTS"