diff --git a/client/src/pages/filaments/edit.tsx b/client/src/pages/filaments/edit.tsx
index 4d69fb5..3e7e27c 100644
--- a/client/src/pages/filaments/edit.tsx
+++ b/client/src/pages/filaments/edit.tsx
@@ -31,7 +31,7 @@ export const FilamentEdit: React.FC<IResourceComponentsProps> = () => {
   const [colorType, setColorType] = useState<"single" | "multi">("single");
 
   // Get all filament IDs for prev/next navigation
-  const { data: allFilaments } = useList<IFilament>({
+  const { result: allFilaments } = useList<IFilament>({
     resource: "filament",
     pagination: { mode: "off" },
     sorters: [{ field: "id", order: "asc" }],
@@ -49,13 +49,13 @@ export const FilamentEdit: React.FC<IResourceComponentsProps> = () => {
   // Calculate prev/next IDs for navigation
   const { prevId, nextId } = useMemo(() => {
     if (!allFilaments?.data || !id) return { prevId: null, nextId: null };
-    const ids = allFilaments.data.map((f) => f.id);
+    const ids = allFilaments.data.map((f: IFilament) => f.id);
     const currentIndex = ids.indexOf(Number(id));
     return {
       prevId: currentIndex > 0 ? ids[currentIndex - 1] : null,
       nextId: currentIndex < ids.length - 1 ? ids[currentIndex + 1] : null,
     };
-  }, [allFilaments?.data, id]);
+  }, [allFilaments, id]);
 
   // Get vendor selection options
   const { selectProps } = useSelect<IVendor>({
diff --git a/client/src/pages/spools/edit.tsx b/client/src/pages/spools/edit.tsx
index 68d9747..b8526df 100644
--- a/client/src/pages/spools/edit.tsx
+++ b/client/src/pages/spools/edit.tsx
@@ -39,7 +39,7 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
   const navigate = useNavigate();
 
   // Get all spool IDs for prev/next navigation
-  const { data: allSpools } = useList<ISpool>({
+  const { result: allSpools } = useList<ISpool>({
     resource: "spool",
     pagination: { mode: "off" },
     sorters: [{ field: "id", order: "asc" }],
@@ -71,13 +71,13 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
   // Calculate prev/next IDs for navigation
   const { prevId, nextId } = useMemo(() => {
     if (!allSpools?.data || !id) return { prevId: null, nextId: null };
-    const ids = allSpools.data.map((s) => s.id);
+    const ids = allSpools.data.map((s: ISpool) => s.id);
     const currentIndex = ids.indexOf(Number(id));
     return {
       prevId: currentIndex > 0 ? ids[currentIndex - 1] : null,
       nextId: currentIndex < ids.length - 1 ? ids[currentIndex + 1] : null,
     };
-  }, [allSpools?.data, id]);
+  }, [allSpools, id]);
 
   // Add the filament_id field to the form
   if (formProps.initialValues) {
diff --git a/client/src/pages/vendors/edit.tsx b/client/src/pages/vendors/edit.tsx
index b870505..f48908f 100644
--- a/client/src/pages/vendors/edit.tsx
+++ b/client/src/pages/vendors/edit.tsx
@@ -25,7 +25,7 @@ export const VendorEdit: React.FC<IResourceComponentsProps> = () => {
   const extraFields = useGetFields(EntityType.vendor);
 
   // Get all vendor IDs for prev/next navigation
-  const { data: allVendors } = useList<IVendor>({
+  const { result: allVendors } = useList<IVendor>({
     resource: "vendor",
     pagination: { mode: "off" },
     sorters: [{ field: "id", order: "asc" }],
@@ -43,13 +43,13 @@ export const VendorEdit: React.FC<IResourceComponentsProps> = () => {
   // Calculate prev/next IDs for navigation
   const { prevId, nextId } = useMemo(() => {
     if (!allVendors?.data || !id) return { prevId: null, nextId: null };
-    const ids = allVendors.data.map((v) => v.id);
+    const ids = allVendors.data.map((v: IVendor) => v.id);
     const currentIndex = ids.indexOf(Number(id));
     return {
       prevId: currentIndex > 0 ? ids[currentIndex - 1] : null,
       nextId: currentIndex < ids.length - 1 ? ids[currentIndex + 1] : null,
     };
-  }, [allVendors?.data, id]);
+  }, [allVendors, id]);
 
   // Parse the extra fields from string values into real types
   if (formProps.initialValues) {