diff --git a/backend/directus-config/collections/operations.json b/backend/directus-config/collections/operations.json
index d8720e95..678b130a 100644
--- a/backend/directus-config/collections/operations.json
+++ b/backend/directus-config/collections/operations.json
@@ -19,6 +19,57 @@
     "flow": "a78d01a4-13b3-46a4-8938-9606bf26e329",
     "_syncId": "b7241999-bfef-4086-bce1-b77d73323efb"
   },
+  {
+    "name": "Condition",
+    "key": "condition_d2q1f",
+    "type": "condition",
+    "position_x": 36,
+    "position_y": 1,
+    "options": {
+      "filter": {
+        "$trigger": {
+          "payload": {
+            "location": {
+              "_nempty": true
+            }
+          }
+        }
+      }
+    },
+    "resolve": "28aaa64f-7cab-4e64-a5ea-4ab7f825250a",
+    "reject": "aad65a35-dcb2-4e71-a27a-b7600fea06a8",
+    "flow": "8b79cca0-d346-4d05-8bb2-c4b3c45d0721",
+    "_syncId": "6325ec57-0cde-491b-b453-f69effb404e6"
+  },
+  {
+    "name": "Condition",
+    "key": "condition_ljedr",
+    "type": "condition",
+    "position_x": 74,
+    "position_y": 1,
+    "options": {
+      "filter": {
+        "item_read_i7dz7": {
+          "_and": [
+            {
+              "location": {
+                "_nempty": true
+              }
+            },
+            {
+              "location": {
+                "_nnull": true
+              }
+            }
+          ]
+        }
+      }
+    },
+    "resolve": "ef204e62-9a47-4560-a940-336bdf2f897b",
+    "reject": "e76cc608-589d-4758-98ee-b01346e5f22c",
+    "flow": "cb772a2c-150c-4cca-bc2c-1f8498a5cd92",
+    "_syncId": "7e647ad3-8a87-43c6-aee3-08600f0382e0"
+  },
   {
     "name": "Condition",
     "key": "condition_n9mpy",
@@ -72,7 +123,7 @@
         "$trigger": {
           "payload": {
             "layer": {
-              "_eq": "1c0a440f-bdf8-43a0-80bc-2d099d69b3ca"
+              "_eq": "bc55bd85-a357-47e0-8bb7-d49063548ac2"
             }
           }
         }
@@ -329,7 +380,7 @@
         "first_name": "{{$trigger.payload.first_name}} {{$trigger.payload.last_name}}"
       }
     },
-    "resolve": "28aaa64f-7cab-4e64-a5ea-4ab7f825250a",
+    "resolve": "6325ec57-0cde-491b-b453-f69effb404e6",
     "reject": null,
     "flow": "8b79cca0-d346-4d05-8bb2-c4b3c45d0721",
     "_syncId": "02499c24-46a9-4d77-8a2e-1b963cb3d62c"
@@ -357,27 +408,51 @@
     "name": "Create Nomads Home Item",
     "key": "item_create_oym38",
     "type": "item-create",
-    "position_x": 56,
+    "position_x": 70,
     "position_y": 1,
     "options": {
-      "permissions": "$full",
-      "emitEvents": false,
-      "collection": "items",
       "payload": {
         "name": "{{$trigger.payload.first_name}} {{$trigger.payload.last_name}}",
-        "position": "{{$last.data.features[0].geometry}}",
-        "image_external": "{{$trigger.payload.avatar_url}}",
+        "layer": "91bc3d4f-1851-4cd9-abd9-ab95a6a596a5",
         "extended": {
           "external_profile_id": "{{$trigger.payload.id}}"
         },
-        "layer": "a546f94b-8928-4d0b-b3ca-39bd109abd34"
-      }
+        "position": "{{$last.data.features[0].geometry}}",
+        "image_external": "{{$trigger.payload.avatar_url}}"
+      },
+      "collection": "items",
+      "emitEvents": false,
+      "permissions": "$full"
     },
     "resolve": "f12ba44c-69cc-40c0-a346-aafb851fe892",
     "reject": null,
     "flow": "8b79cca0-d346-4d05-8bb2-c4b3c45d0721",
     "_syncId": "3624ff50-c282-45db-aa01-9b8c4a75e45c"
   },
+  {
+    "name": "Create Nomads Home Item",
+    "key": "item_create_oym38_epxyf",
+    "type": "item-create",
+    "position_x": 53,
+    "position_y": 18,
+    "options": {
+      "permissions": "$full",
+      "emitEvents": false,
+      "payload": {
+        "name": "{{$trigger.payload.first_name}} {{$trigger.payload.last_name}}",
+        "layer": "91bc3d4f-1851-4cd9-abd9-ab95a6a596a5",
+        "extended": {
+          "external_profile_id": "{{$trigger.payload.id}}"
+        },
+        "image_external": "{{$trigger.payload.avatar_url}}"
+      },
+      "collection": "items"
+    },
+    "resolve": "fc07cebb-9577-41a2-9c1c-d2ee873b112d",
+    "reject": null,
+    "flow": "8b79cca0-d346-4d05-8bb2-c4b3c45d0721",
+    "_syncId": "aad65a35-dcb2-4e71-a27a-b7600fea06a8"
+  },
   {
     "name": "Create Data",
     "key": "item_create_tsz05",
@@ -385,17 +460,17 @@
     "position_x": 86,
     "position_y": 1,
     "options": {
-      "permissions": "$trigger",
-      "emitEvents": false,
       "payload": {
+        "end": "{{$trigger.payload.end}}",
         "name": "{{$trigger.payload.title}}",
         "text": "{{exec_p5p4r.text}}",
-        "position": "{{$last.data.features[0].geometry}}",
-        "layer": "5d12f356-349a-4463-a57c-5fc54eede6ba",
+        "layer": "7c40ddfa-bc7e-46cb-9580-c8cf6b867377",
         "start": "{{$trigger.payload.start}}",
-        "end": "{{$trigger.payload.end}}"
+        "position": "{{$last.data.features[0].geometry}}"
       },
-      "collection": "items"
+      "collection": "items",
+      "emitEvents": false,
+      "permissions": "$trigger"
     },
     "resolve": "906b8e62-bc1b-4e69-9502-51363e868cb8",
     "reject": null,
@@ -409,45 +484,22 @@
     "position_x": 69,
     "position_y": 24,
     "options": {
-      "permissions": "$trigger",
-      "emitEvents": false,
       "payload": {
+        "end": "{{$trigger.payload.end}}",
         "name": "{{$trigger.payload.title}}",
         "text": "{{exec_p5p4r.text}}",
-        "layer": "5d12f356-349a-4463-a57c-5fc54eede6ba",
-        "start": "{{$trigger.payload.start}}",
-        "end": "{{$trigger.payload.end}}"
+        "layer": "7c40ddfa-bc7e-46cb-9580-c8cf6b867377",
+        "start": "{{$trigger.payload.start}}"
       },
-      "collection": "items"
+      "collection": "items",
+      "emitEvents": false,
+      "permissions": "$trigger"
     },
     "resolve": "017875a5-3736-478a-9bcc-ed473117c74d",
     "reject": null,
     "flow": "7b978be2-605f-4061-b5b3-46f151b1b80a",
     "_syncId": "5eb2d090-716a-405e-be6c-ca496961b5d3"
   },
-  {
-    "name": "Update Data",
-    "key": "item_create_u15xk",
-    "type": "item-update",
-    "position_x": 74,
-    "position_y": 32,
-    "options": {
-      "permissions": "$trigger",
-      "emitEvents": false,
-      "payload": {
-        "name": "{{$last[0].first_name}} {{$last[0].last_name}}",
-        "image_external": "{{$last[0].avatar_url}}"
-      },
-      "collection": "items",
-      "key": [
-        "{{$trigger.payload.id}}"
-      ]
-    },
-    "resolve": null,
-    "reject": null,
-    "flow": "77f1fc79-d0fd-4f5d-a168-50fa3948a945",
-    "_syncId": "f691e6cb-4305-413a-9bc9-7022dc6e5f08"
-  },
   {
     "name": "Create Data",
     "key": "item_create_x8h5h",
@@ -469,29 +521,6 @@
     "flow": "cc80ec73-ecf5-4789-bee5-1127fb1a6ed4",
     "_syncId": "37fd6139-7518-44d3-bae5-b38c5aa132b9"
   },
-  {
-    "name": "Create Data",
-    "key": "item_create_xb5fa",
-    "type": "item-create",
-    "position_x": 92,
-    "position_y": 24,
-    "options": {
-      "permissions": "$trigger",
-      "emitEvents": false,
-      "collection": "items",
-      "payload": {
-        "name": "{{item_read_gejrb[0].first_name}} {{item_read_gejrb[0].last_name}}",
-        "image_external": "{{item_read_gejrb[0].avatar_url}}",
-        "layer": "{{$trigger.payload.layer}}",
-        "position": "{{$trigger.payload.position}}",
-        "": "{{$trigger.payload.id}}"
-      }
-    },
-    "resolve": null,
-    "reject": null,
-    "flow": "77f1fc79-d0fd-4f5d-a168-50fa3948a945",
-    "_syncId": "6614b39f-c51a-45ee-b841-cf9df914ee5c"
-  },
   {
     "name": "Delete Data",
     "key": "item_delete_pl9gj",
@@ -522,15 +551,12 @@
     "position_x": 55,
     "position_y": 1,
     "options": {
-      "permissions": "$full",
-      "emitEvents": false,
-      "collection": "items",
       "query": {
         "filter": {
           "_and": [
             {
               "layer": {
-                "_eq": "a546f94b-8928-4d0b-b3ca-39bd109abd34"
+                "_eq": "91bc3d4f-1851-4cd9-abd9-ab95a6a596a5"
               }
             },
             {
@@ -540,7 +566,10 @@
             }
           ]
         }
-      }
+      },
+      "collection": "items",
+      "emitEvents": false,
+      "permissions": "$full"
     },
     "resolve": "dc438e50-a3a1-4d38-8b7a-7c1dd1f22166",
     "reject": null,
@@ -556,23 +585,23 @@
     "options": {
       "permissions": "$full",
       "emitEvents": false,
-      "collection": "items",
       "query": {
         "filter": {
           "_and": [
             {
               "layer": {
-                "_eq": "1c0a440f-bdf8-43a0-80bc-2d099d69b3ca"
+                "_eq": "bc55bd85-a357-47e0-8bb7-d49063548ac2"
               }
             },
             {
               "user_created": {
-                "_eq": "{{$last[0].id}}"
+                "_eq": "{{item_read_m7xes[0].id}}"
               }
             }
           ]
         }
-      }
+      },
+      "collection": "items"
     },
     "resolve": "d6eb9087-481b-407c-af0d-bc37527d0fc4",
     "reject": null,
@@ -837,15 +866,12 @@
     "position_x": 56,
     "position_y": 1,
     "options": {
-      "permissions": "$trigger",
-      "emitEvents": false,
-      "collection": "items",
       "query": {
         "filter": {
           "_and": [
             {
               "layer": {
-                "_eq": "a546f94b-8928-4d0b-b3ca-39bd109abd34"
+                "_eq": "91bc3d4f-1851-4cd9-abd9-ab95a6a596a5"
               }
             },
             {
@@ -855,9 +881,12 @@
             }
           ]
         }
-      }
+      },
+      "collection": "items",
+      "emitEvents": false,
+      "permissions": "$trigger"
     },
-    "resolve": "ef204e62-9a47-4560-a940-336bdf2f897b",
+    "resolve": "7e647ad3-8a87-43c6-aee3-08600f0382e0",
     "reject": null,
     "flow": "cb772a2c-150c-4cca-bc2c-1f8498a5cd92",
     "_syncId": "31bdf2e1-23f2-41e5-b40b-8e9076065119"
@@ -890,7 +919,7 @@
     "name": "Set Item Ownership to Nomads User",
     "key": "item_update_1vgft",
     "type": "item-update",
-    "position_x": 74,
+    "position_x": 87,
     "position_y": 1,
     "options": {
       "permissions": "$full",
@@ -909,25 +938,41 @@
     "_syncId": "f12ba44c-69cc-40c0-a346-aafb851fe892"
   },
   {
-    "name": "Update Nomads Current Location",
-    "key": "item_update_5eu19",
+    "name": "Set Item Ownership to Nomads User",
+    "key": "item_update_1vgft_dwftb",
     "type": "item-update",
-    "position_x": 131,
-    "position_y": 1,
+    "position_x": 70,
+    "position_y": 18,
     "options": {
       "permissions": "$full",
       "emitEvents": false,
+      "collection": "items",
       "payload": {
-        "name": "{{item_read_i7dz7.first_name}} {{item_read_i7dz7.last_name}}",
-        "image_external": "{{item_read_i7dz7.avatar_url}}"
+        "user_created": "{{item_create_dj57t[0]}}"
       },
+      "key": [
+        "{{$last[0]}}"
+      ]
+    },
+    "resolve": null,
+    "reject": null,
+    "flow": "8b79cca0-d346-4d05-8bb2-c4b3c45d0721",
+    "_syncId": "fc07cebb-9577-41a2-9c1c-d2ee873b112d"
+  },
+  {
+    "name": "Update Nomads Current Location",
+    "key": "item_update_5eu19",
+    "type": "item-update",
+    "position_x": 146,
+    "position_y": 1,
+    "options": {
       "key": [],
       "query": {
         "filter": {
           "_and": [
             {
               "layer": {
-                "_eq": "1c0a440f-bdf8-43a0-80bc-2d099d69b3ca"
+                "_eq": "bc55bd85-a357-47e0-8bb7-d49063548ac2"
               }
             },
             {
@@ -938,13 +983,56 @@
           ]
         }
       },
-      "collection": "items"
+      "payload": {
+        "name": "{{item_read_i7dz7.first_name}} {{item_read_i7dz7.last_name}}",
+        "image_external": "{{item_read_i7dz7.avatar_url}}"
+      },
+      "collection": "items",
+      "emitEvents": false,
+      "permissions": "$full"
     },
     "resolve": null,
     "reject": null,
     "flow": "cb772a2c-150c-4cca-bc2c-1f8498a5cd92",
     "_syncId": "3bb1c8b0-fae7-42b0-af07-562e4a4bf20e"
   },
+  {
+    "name": "Update Nomads Current Location",
+    "key": "item_update_5eu19_prdze",
+    "type": "item-update",
+    "position_x": 139,
+    "position_y": 18,
+    "options": {
+      "key": [],
+      "query": {
+        "filter": {
+          "_and": [
+            {
+              "layer": {
+                "_eq": "bc55bd85-a357-47e0-8bb7-d49063548ac2"
+              }
+            },
+            {
+              "user_created": {
+                "_eq": "{{$last}}"
+              }
+            }
+          ]
+        }
+      },
+      "payload": {
+        "name": "{{item_read_i7dz7.first_name}} {{item_read_i7dz7.last_name}}",
+        "image_external": "{{item_read_i7dz7.avatar_url}}"
+      },
+      "collection": "items",
+      "emitEvents": false,
+      "permissions": "$full"
+    },
+    "resolve": null,
+    "reject": null,
+    "flow": "cb772a2c-150c-4cca-bc2c-1f8498a5cd92",
+    "_syncId": "4dc368cc-6fc1-411e-b0f0-b39490c3efe0"
+  },
   {
     "name": "Update Data",
     "key": "item_update_8nzfw",
@@ -1017,7 +1105,7 @@
     "name": "Update Nomads User",
     "key": "item_update_e3pl5",
     "type": "item-update",
-    "position_x": 111,
+    "position_x": 127,
     "position_y": 1,
     "options": {
       "permissions": "$full",
@@ -1027,8 +1115,8 @@
         "{{item_read_ym92c[0].id}}"
       ],
       "payload": {
-        "first_name": "{{$trigger.payload.first_name}} {{$trigger.payload.last_name}}",
-        "email": "{{$trigger.payload.email}}"
+        "first_name": "{{item_read_i7dz7.first_name}} {{item_read_i7dz7.last_name}}",
+        "email": "{{item_read_i7dz7.email}}"
       }
     },
     "resolve": "3bb1c8b0-fae7-42b0-af07-562e4a4bf20e",
@@ -1036,11 +1124,34 @@
     "flow": "cb772a2c-150c-4cca-bc2c-1f8498a5cd92",
     "_syncId": "e7b3b7b8-c34a-4024-8aa4-d7d4687d6752"
   },
+  {
+    "name": "Update Nomads User",
+    "key": "item_update_e3pl5_wansj",
+    "type": "item-update",
+    "position_x": 119,
+    "position_y": 18,
+    "options": {
+      "permissions": "$full",
+      "emitEvents": false,
+      "collection": "directus_users",
+      "key": [
+        "{{item_read_ym92c[0].id}}"
+      ],
+      "payload": {
+        "first_name": "{{item_read_i7dz7.first_name}} {{item_read_i7dz7.last_name}}",
+        "email": "{{item_read_i7dz7.email}}"
+      }
+    },
+    "resolve": "4dc368cc-6fc1-411e-b0f0-b39490c3efe0",
+    "reject": null,
+    "flow": "cb772a2c-150c-4cca-bc2c-1f8498a5cd92",
+    "_syncId": "b22755ba-4ec5-4e04-a3fe-a390a9bc75ab"
+  },
   {
     "name": "Update Nomads Home",
     "key": "item_update_o6cn8",
     "type": "item-update",
-    "position_x": 92,
+    "position_x": 109,
     "position_y": 1,
     "options": {
       "permissions": "$full",
@@ -1060,6 +1171,30 @@
     "flow": "cb772a2c-150c-4cca-bc2c-1f8498a5cd92",
     "_syncId": "4535f776-40c7-4e6d-8873-843822996dd5"
   },
+  {
+    "name": "Update Nomads Home",
+    "key": "item_update_o6cn8_nitpl",
+    "type": "item-update",
+    "position_x": 99,
+    "position_y": 18,
+    "options": {
+      "permissions": "$full",
+      "emitEvents": false,
+      "collection": "items",
+      "key": [
+        "{{item_read_soekq[0].id}}"
+      ],
+      "payload": {
+        "name": "{{item_read_i7dz7.first_name}} {{item_read_i7dz7.last_name}}",
+        "image_external": "{{item_read_i7dz7.avatar_url}}",
+        "position": null
+      }
+    },
+    "resolve": "b22755ba-4ec5-4e04-a3fe-a390a9bc75ab",
+    "reject": null,
+    "flow": "cb772a2c-150c-4cca-bc2c-1f8498a5cd92",
+    "_syncId": "e76cc608-589d-4758-98ee-b01346e5f22c"
+  },
   {
     "name": "Update Data",
     "key": "item_update_pv6i8",
@@ -1272,7 +1407,7 @@
     "name": "Webhook / Request URL",
     "key": "request_hfzgd",
     "type": "request",
-    "position_x": 74,
+    "position_x": 92,
     "position_y": 1,
     "options": {
       "method": "GET",
@@ -1331,7 +1466,7 @@
     "name": "Request Coordinates from Geocoder",
     "key": "request_sxzym",
     "type": "request",
-    "position_x": 37,
+    "position_x": 53,
     "position_y": 1,
     "options": {
       "method": "GET",
@@ -1426,23 +1561,6 @@
     "flow": "77f1fc79-d0fd-4f5d-a168-50fa3948a945",
     "_syncId": "91e39643-b58e-4629-8875-06559cfacf64"
   },
-  {
-    "name": "Transform Payload",
-    "key": "transform_mobig",
-    "type": "transform",
-    "position_x": 73,
-    "position_y": 16,
-    "options": {
-      "json": {
-        "name": "{{$last[0].first_name}} {{$last[0].last_name}}",
-        "image_external": "{{$last[0].avatar_url}}"
-      }
-    },
-    "resolve": null,
-    "reject": null,
-    "flow": "77f1fc79-d0fd-4f5d-a168-50fa3948a945",
-    "_syncId": "e51d3e1d-372d-4f43-82ed-f7fe8464507f"
-  },
   {
     "name": "Trigger Send Email",
     "key": "trigger_4tvps",
diff --git a/backend/directus-config/specs/item.graphql b/backend/directus-config/specs/item.graphql
index aa925e55..cc6a25d6 100644
--- a/backend/directus-config/specs/item.graphql
+++ b/backend/directus-config/specs/item.graphql
@@ -15,10 +15,6 @@ type Query {
   oceannomads_profiles_by_id(id: ID!, version: String): oceannomads_profiles
   oceannomads_profiles_aggregated(groupBy: [String], filter: oceannomads_profiles_filter, limit: Int, offset: Int, page: Int, search: String, sort: [String]): [oceannomads_profiles_aggregated!]!
   oceannomads_profiles_by_version(version: String!, id: ID!): version_oceannomads_profiles
-  layers(filter: layers_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String): [layers!]!
-  layers_by_id(id: ID!, version: String): layers
-  layers_aggregated(groupBy: [String], filter: layers_filter, limit: Int, offset: Int, page: Int, search: String, sort: [String]): [layers_aggregated!]!
-  layers_by_version(version: String!, id: ID!): version_layers
   attestations(filter: attestations_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String): [attestations!]!
   attestations_by_id(id: ID!, version: String): attestations
   attestations_aggregated(groupBy: [String], filter: attestations_filter, limit: Int, offset: Int, page: Int, search: String, sort: [String]): [attestations_aggregated!]!
@@ -71,6 +67,10 @@ type Query {
   itemSecrets_by_id(id: ID!, version: String): itemSecrets
   itemSecrets_aggregated(groupBy: [String], filter: itemSecrets_filter, limit: Int, offset: Int, page: Int, search: String, sort: [String]): [itemSecrets_aggregated!]!
   itemSecrets_by_version(version: String!, id: ID!): version_itemSecrets
+  layers(filter: layers_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String): [layers!]!
+  layers_by_id(id: ID!, version: String): layers
+  layers_aggregated(groupBy: [String], filter: layers_filter, limit: Int, offset: Int, page: Int, search: String, sort: [String]): [layers_aggregated!]!
+  layers_by_version(version: String!, id: ID!): version_layers
   items_files(filter: items_files_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String): [items_files!]!
   items_files_by_id(id: ID!, version: String): items_files
   items_files_aggregated(groupBy: [String], filter: items_files_filter, limit: Int, offset: Int, page: Int, search: String, sort: [String]): [items_files_aggregated!]!
@@ -150,8 +150,6 @@ type Mutation {
   create_oceannomads_events_item(data: create_oceannomads_events_input!): oceannomads_events
   create_oceannomads_profiles_items(filter: oceannomads_profiles_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String, data: [create_oceannomads_profiles_input!]): [oceannomads_profiles!]!
   create_oceannomads_profiles_item(data: create_oceannomads_profiles_input!): oceannomads_profiles
-  create_layers_items(filter: layers_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String, data: [create_layers_input!]): [layers!]!
-  create_layers_item(data: create_layers_input!): layers
   create_attestations_items(filter: attestations_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String, data: [create_attestations_input!]): [attestations!]!
   create_attestations_item(data: create_attestations_input!): attestations
   create_attestations_directus_users_items(filter: attestations_directus_users_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String, data: [create_attestations_directus_users_input!]): [attestations_directus_users!]!
@@ -178,6 +176,8 @@ type Mutation {
   create_items_item(data: create_items_input!): items
   create_itemSecrets_items(filter: itemSecrets_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String, data: [create_itemSecrets_input!]): [itemSecrets!]!
   create_itemSecrets_item(data: create_itemSecrets_input!): itemSecrets
+  create_layers_items(filter: layers_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String, data: [create_layers_input!]): [layers!]!
+  create_layers_item(data: create_layers_input!): layers
   create_items_files_items(filter: items_files_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String, data: [create_items_files_input!]): [items_files!]!
   create_items_files_item(data: create_items_files_input!): items_files
   create_items_items_items(filter: items_items_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String, data: [create_items_items_input!]): [items_items!]!
@@ -224,9 +224,6 @@ type Mutation {
   update_oceannomads_profiles_items(filter: oceannomads_profiles_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String, ids: [ID]!, data: update_oceannomads_profiles_input!): [oceannomads_profiles!]!
   update_oceannomads_profiles_batch(filter: oceannomads_profiles_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String, data: [update_oceannomads_profiles_input!]): [oceannomads_profiles!]!
   update_oceannomads_profiles_item(id: ID!, data: update_oceannomads_profiles_input!): oceannomads_profiles
-  update_layers_items(filter: layers_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String, ids: [ID]!, data: update_layers_input!): [layers!]!
-  update_layers_batch(filter: layers_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String, data: [update_layers_input!]): [layers!]!
-  update_layers_item(id: ID!, data: update_layers_input!): layers
   update_attestations_items(filter: attestations_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String, ids: [ID]!, data: update_attestations_input!): [attestations!]!
   update_attestations_batch(filter: attestations_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String, data: [update_attestations_input!]): [attestations!]!
   update_attestations_item(id: ID!, data: update_attestations_input!): attestations
@@ -266,6 +263,9 @@ type Mutation {
   update_itemSecrets_items(filter: itemSecrets_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String, ids: [ID]!, data: update_itemSecrets_input!): [itemSecrets!]!
   update_itemSecrets_batch(filter: itemSecrets_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String, data: [update_itemSecrets_input!]): [itemSecrets!]!
   update_itemSecrets_item(id: ID!, data: update_itemSecrets_input!): itemSecrets
+  update_layers_items(filter: layers_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String, ids: [ID]!, data: update_layers_input!): [layers!]!
+  update_layers_batch(filter: layers_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String, data: [update_layers_input!]): [layers!]!
+  update_layers_item(id: ID!, data: update_layers_input!): layers
   update_items_files_items(filter: items_files_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String, ids: [ID]!, data: update_items_files_input!): [items_files!]!
   update_items_files_batch(filter: items_files_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String, data: [update_items_files_input!]): [items_files!]!
   update_items_files_item(id: ID!, data: update_items_files_input!): items_files
@@ -325,8 +325,6 @@ type Mutation {
   delete_oceannomads_events_item(id: ID!): delete_one
   delete_oceannomads_profiles_items(ids: [ID]!): delete_many
   delete_oceannomads_profiles_item(id: ID!): delete_one
-  delete_layers_items(ids: [ID]!): delete_many
-  delete_layers_item(id: ID!): delete_one
   delete_attestations_items(ids: [ID]!): delete_many
   delete_attestations_item(id: ID!): delete_one
   delete_attestations_directus_users_items(ids: [ID]!): delete_many
@@ -353,6 +351,8 @@ type Mutation {
   delete_items_item(id: ID!): delete_one
   delete_itemSecrets_items(ids: [ID]!): delete_many
   delete_itemSecrets_item(id: ID!): delete_one
+  delete_layers_items(ids: [ID]!): delete_many
+  delete_layers_item(id: ID!): delete_one
   delete_items_files_items(ids: [ID]!): delete_many
   delete_items_files_item(id: ID!): delete_one
   delete_items_items_items(ids: [ID]!): delete_many
@@ -415,7 +415,6 @@ type Subscription {
   relations_mutated(event: EventEnum): relations_mutated
   oceannomads_events_mutated(event: EventEnum): oceannomads_events_mutated
   oceannomads_profiles_mutated(event: EventEnum): oceannomads_profiles_mutated
-  layers_mutated(event: EventEnum): layers_mutated
   attestations_mutated(event: EventEnum): attestations_mutated
   attestations_directus_users_mutated(event: EventEnum): attestations_directus_users_mutated
   contactInfos_mutated(event: EventEnum): contactInfos_mutated
@@ -429,6 +428,7 @@ type Subscription {
   inviteLinks_mutated(event: EventEnum): inviteLinks_mutated
   items_mutated(event: EventEnum): items_mutated
   itemSecrets_mutated(event: EventEnum): itemSecrets_mutated
+  layers_mutated(event: EventEnum): layers_mutated
   items_files_mutated(event: EventEnum): items_files_mutated
   items_items_mutated(event: EventEnum): items_items_mutated
   items_tags_mutated(event: EventEnum): items_tags_mutated
@@ -1797,8 +1797,8 @@ type layers {
   name: String
   onlyOnePerOwner: Boolean
   public_edit_items: Boolean
-  userProfileLayer: Boolean
   sort: Int
+  userProfileLayer: Boolean
   maps(filter: layers_maps_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String): [layers_maps]
   maps_func: count_functions
   notifications(filter: layers_directus_users_1_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String): [layers_directus_users_1]
@@ -1834,8 +1834,8 @@ type layers_aggregated_count {
   name: Int
   onlyOnePerOwner: Int
   public_edit_items: Int
-  userProfileLayer: Int
   sort: Int
+  userProfileLayer: Int
   maps: Int
   notifications: Int
 }
@@ -2705,8 +2705,8 @@ type version_layers {
   name: String
   onlyOnePerOwner: Boolean
   public_edit_items: Boolean
-  userProfileLayer: Boolean
   sort: Int
+  userProfileLayer: Boolean
   maps: JSON
   notifications: JSON
 }
@@ -3292,8 +3292,8 @@ input create_layers_input {
   name: String
   onlyOnePerOwner: Boolean
   public_edit_items: Boolean
-  userProfileLayer: Boolean
   sort: Int
+  userProfileLayer: Boolean
   maps: [create_layers_maps_input]
   notifications: [create_layers_directus_users_1_input]
 }
@@ -4282,8 +4282,8 @@ input layers_filter {
   name: string_filter_operators
   onlyOnePerOwner: boolean_filter_operators
   public_edit_items: boolean_filter_operators
-  userProfileLayer: boolean_filter_operators
   sort: number_filter_operators
+  userProfileLayer: boolean_filter_operators
   maps: layers_maps_quantifier_filter
   maps_func: count_function_filter_operators
   notifications: layers_directus_users_1_quantifier_filter
@@ -4886,8 +4886,8 @@ input update_layers_input {
   name: String
   onlyOnePerOwner: Boolean
   public_edit_items: Boolean
-  userProfileLayer: Boolean
   sort: Int
+  userProfileLayer: Boolean
   maps: [update_layers_maps_input]
   notifications: [update_layers_directus_users_1_input]
 }
diff --git a/backend/directus-config/specs/openapi.json b/backend/directus-config/specs/openapi.json
index 7508211b..854fe89d 100644
--- a/backend/directus-config/specs/openapi.json
+++ b/backend/directus-config/specs/openapi.json
@@ -9067,395 +9067,6 @@
         ]
       }
     },
-    "/items/layers": {
-      "post": {
-        "summary": "Create an Item",
-        "description": "Create a new layers item.",
-        "tags": [
-          "Items",
-          "ItemsLayers"
-        ],
-        "operationId": "createItemsLayers",
-        "parameters": [
-          {
-            "$ref": "#/components/parameters/Meta"
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "oneOf": [
-                  {
-                    "type": "array",
-                    "items": {
-                      "$ref": "#/components/schemas/ItemsLayers"
-                    }
-                  },
-                  {
-                    "$ref": "#/components/schemas/ItemsLayers"
-                  }
-                ]
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "Successful request",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {
-                    "data": {
-                      "type": "array",
-                      "items": {
-                        "$ref": "#/components/schemas/ItemsLayers"
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "401": {
-            "$ref": "#/components/responses/UnauthorizedError"
-          }
-        }
-      },
-      "get": {
-        "summary": "List Items",
-        "description": "List the layers items.",
-        "tags": [
-          "Items",
-          "ItemsLayers"
-        ],
-        "operationId": "readItemsLayers",
-        "security": [
-          {
-            "Auth": []
-          }
-        ],
-        "parameters": [
-          {
-            "$ref": "#/components/parameters/Fields"
-          },
-          {
-            "$ref": "#/components/parameters/Limit"
-          },
-          {
-            "$ref": "#/components/parameters/Meta"
-          },
-          {
-            "$ref": "#/components/parameters/Offset"
-          },
-          {
-            "$ref": "#/components/parameters/Sort"
-          },
-          {
-            "$ref": "#/components/parameters/Filter"
-          },
-          {
-            "$ref": "#/components/parameters/Search"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Successful request",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {
-                    "data": {
-                      "type": "array",
-                      "items": {
-                        "type": "object",
-                        "$ref": "#/components/schemas/ItemsLayers"
-                      }
-                    },
-                    "meta": {
-                      "$ref": "#/components/schemas/x-metadata"
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "401": {
-            "$ref": "#/components/responses/UnauthorizedError"
-          }
-        }
-      },
-      "patch": {
-        "summary": "Update Multiple Items",
-        "description": "Update multiple layers items at the same time.",
-        "tags": [
-          "Items",
-          "ItemsLayers"
-        ],
-        "operationId": "updateItemsLayers",
-        "parameters": [
-          {
-            "$ref": "#/components/parameters/Fields"
-          },
-          {
-            "$ref": "#/components/parameters/Limit"
-          },
-          {
-            "$ref": "#/components/parameters/Meta"
-          },
-          {
-            "$ref": "#/components/parameters/Offset"
-          },
-          {
-            "$ref": "#/components/parameters/Sort"
-          },
-          {
-            "$ref": "#/components/parameters/Filter"
-          },
-          {
-            "$ref": "#/components/parameters/Search"
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "oneOf": [
-                  {
-                    "type": "array",
-                    "items": {
-                      "$ref": "#/components/schemas/ItemsLayers"
-                    }
-                  },
-                  {
-                    "$ref": "#/components/schemas/ItemsLayers"
-                  }
-                ]
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "Successful request",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "properties": {
-                    "data": {
-                      "type": "array",
-                      "items": {
-                        "$ref": "#/components/schemas/ItemsLayers"
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "delete": {
-        "summary": "Delete Multiple Items",
-        "description": "Delete multiple existing layers items.",
-        "tags": [
-          "Items",
-          "ItemsLayers"
-        ],
-        "operationId": "deleteItemsLayers",
-        "responses": {
-          "200": {
-            "description": "Successful request"
-          },
-          "401": {
-            "$ref": "#/components/responses/UnauthorizedError"
-          }
-        },
-        "parameters": []
-      }
-    },
-    "/items/layers/{id}": {
-      "get": {
-        "summary": "Retrieve an Item",
-        "description": "Retrieve a single layers item by unique identifier.",
-        "tags": [
-          "Items",
-          "ItemsLayers"
-        ],
-        "operationId": "readSingleItemsLayers",
-        "parameters": [
-          {
-            "$ref": "#/components/parameters/Fields"
-          },
-          {
-            "$ref": "#/components/parameters/Meta"
-          },
-          {
-            "$ref": "#/components/parameters/Version"
-          },
-          {
-            "name": "id",
-            "description": "Index of the item.",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "oneOf": [
-                {
-                  "type": "integer",
-                  "description": "Incremental index of the item.",
-                  "example": 1
-                },
-                {
-                  "type": "string",
-                  "description": "Unique identifier of the item.",
-                  "example": "8cbb43fe-4cdf-4991-8352-c461779cec02"
-                }
-              ]
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Successful request",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {
-                    "data": {
-                      "type": "object",
-                      "$ref": "#/components/schemas/ItemsLayers"
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "401": {
-            "$ref": "#/components/responses/UnauthorizedError"
-          },
-          "404": {
-            "$ref": "#/components/responses/NotFoundError"
-          }
-        }
-      },
-      "patch": {
-        "summary": "Update an Item",
-        "description": "Update an existing layers item.",
-        "tags": [
-          "Items",
-          "ItemsLayers"
-        ],
-        "operationId": "updateSingleItemsLayers",
-        "parameters": [
-          {
-            "$ref": "#/components/parameters/Fields"
-          },
-          {
-            "$ref": "#/components/parameters/Meta"
-          },
-          {
-            "name": "id",
-            "description": "Index of the item.",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "oneOf": [
-                {
-                  "type": "integer",
-                  "description": "Incremental index of the item.",
-                  "example": 1
-                },
-                {
-                  "type": "string",
-                  "description": "Unique identifier of the item.",
-                  "example": "8cbb43fe-4cdf-4991-8352-c461779cec02"
-                }
-              ]
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "$ref": "#/components/schemas/ItemsLayers"
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "Successful request",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {
-                    "data": {
-                      "type": "object",
-                      "$ref": "#/components/schemas/ItemsLayers"
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "401": {
-            "$ref": "#/components/responses/UnauthorizedError"
-          },
-          "404": {
-            "$ref": "#/components/responses/NotFoundError"
-          }
-        }
-      },
-      "delete": {
-        "summary": "Delete an Item",
-        "description": "Delete an existing layers item.",
-        "tags": [
-          "Items",
-          "ItemsLayers"
-        ],
-        "operationId": "deleteSingleItemsLayers",
-        "responses": {
-          "200": {
-            "description": "Successful request"
-          },
-          "401": {
-            "$ref": "#/components/responses/UnauthorizedError"
-          },
-          "404": {
-            "$ref": "#/components/responses/NotFoundError"
-          }
-        },
-        "parameters": [
-          {
-            "name": "id",
-            "description": "Index of the item.",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "oneOf": [
-                {
-                  "type": "integer",
-                  "description": "Incremental index of the item.",
-                  "example": 1
-                },
-                {
-                  "type": "string",
-                  "description": "Unique identifier of the item.",
-                  "example": "8cbb43fe-4cdf-4991-8352-c461779cec02"
-                }
-              ]
-            }
-          }
-        ]
-      }
-    },
     "/items/attestations": {
       "post": {
         "summary": "Create an Item",
@@ -14513,6 +14124,395 @@
         ]
       }
     },
+    "/items/layers": {
+      "post": {
+        "summary": "Create an Item",
+        "description": "Create a new layers item.",
+        "tags": [
+          "Items",
+          "ItemsLayers"
+        ],
+        "operationId": "createItemsLayers",
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/Meta"
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "oneOf": [
+                  {
+                    "type": "array",
+                    "items": {
+                      "$ref": "#/components/schemas/ItemsLayers"
+                    }
+                  },
+                  {
+                    "$ref": "#/components/schemas/ItemsLayers"
+                  }
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Successful request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/ItemsLayers"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "401": {
+            "$ref": "#/components/responses/UnauthorizedError"
+          }
+        }
+      },
+      "get": {
+        "summary": "List Items",
+        "description": "List the layers items.",
+        "tags": [
+          "Items",
+          "ItemsLayers"
+        ],
+        "operationId": "readItemsLayers",
+        "security": [
+          {
+            "Auth": []
+          }
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/Fields"
+          },
+          {
+            "$ref": "#/components/parameters/Limit"
+          },
+          {
+            "$ref": "#/components/parameters/Meta"
+          },
+          {
+            "$ref": "#/components/parameters/Offset"
+          },
+          {
+            "$ref": "#/components/parameters/Sort"
+          },
+          {
+            "$ref": "#/components/parameters/Filter"
+          },
+          {
+            "$ref": "#/components/parameters/Search"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successful request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "$ref": "#/components/schemas/ItemsLayers"
+                      }
+                    },
+                    "meta": {
+                      "$ref": "#/components/schemas/x-metadata"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "401": {
+            "$ref": "#/components/responses/UnauthorizedError"
+          }
+        }
+      },
+      "patch": {
+        "summary": "Update Multiple Items",
+        "description": "Update multiple layers items at the same time.",
+        "tags": [
+          "Items",
+          "ItemsLayers"
+        ],
+        "operationId": "updateItemsLayers",
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/Fields"
+          },
+          {
+            "$ref": "#/components/parameters/Limit"
+          },
+          {
+            "$ref": "#/components/parameters/Meta"
+          },
+          {
+            "$ref": "#/components/parameters/Offset"
+          },
+          {
+            "$ref": "#/components/parameters/Sort"
+          },
+          {
+            "$ref": "#/components/parameters/Filter"
+          },
+          {
+            "$ref": "#/components/parameters/Search"
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "oneOf": [
+                  {
+                    "type": "array",
+                    "items": {
+                      "$ref": "#/components/schemas/ItemsLayers"
+                    }
+                  },
+                  {
+                    "$ref": "#/components/schemas/ItemsLayers"
+                  }
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Successful request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "properties": {
+                    "data": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/ItemsLayers"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "summary": "Delete Multiple Items",
+        "description": "Delete multiple existing layers items.",
+        "tags": [
+          "Items",
+          "ItemsLayers"
+        ],
+        "operationId": "deleteItemsLayers",
+        "responses": {
+          "200": {
+            "description": "Successful request"
+          },
+          "401": {
+            "$ref": "#/components/responses/UnauthorizedError"
+          }
+        },
+        "parameters": []
+      }
+    },
+    "/items/layers/{id}": {
+      "get": {
+        "summary": "Retrieve an Item",
+        "description": "Retrieve a single layers item by unique identifier.",
+        "tags": [
+          "Items",
+          "ItemsLayers"
+        ],
+        "operationId": "readSingleItemsLayers",
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/Fields"
+          },
+          {
+            "$ref": "#/components/parameters/Meta"
+          },
+          {
+            "$ref": "#/components/parameters/Version"
+          },
+          {
+            "name": "id",
+            "description": "Index of the item.",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "oneOf": [
+                {
+                  "type": "integer",
+                  "description": "Incremental index of the item.",
+                  "example": 1
+                },
+                {
+                  "type": "string",
+                  "description": "Unique identifier of the item.",
+                  "example": "8cbb43fe-4cdf-4991-8352-c461779cec02"
+                }
+              ]
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successful request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "type": "object",
+                      "$ref": "#/components/schemas/ItemsLayers"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "401": {
+            "$ref": "#/components/responses/UnauthorizedError"
+          },
+          "404": {
+            "$ref": "#/components/responses/NotFoundError"
+          }
+        }
+      },
+      "patch": {
+        "summary": "Update an Item",
+        "description": "Update an existing layers item.",
+        "tags": [
+          "Items",
+          "ItemsLayers"
+        ],
+        "operationId": "updateSingleItemsLayers",
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/Fields"
+          },
+          {
+            "$ref": "#/components/parameters/Meta"
+          },
+          {
+            "name": "id",
+            "description": "Index of the item.",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "oneOf": [
+                {
+                  "type": "integer",
+                  "description": "Incremental index of the item.",
+                  "example": 1
+                },
+                {
+                  "type": "string",
+                  "description": "Unique identifier of the item.",
+                  "example": "8cbb43fe-4cdf-4991-8352-c461779cec02"
+                }
+              ]
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "$ref": "#/components/schemas/ItemsLayers"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Successful request",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "data": {
+                      "type": "object",
+                      "$ref": "#/components/schemas/ItemsLayers"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "401": {
+            "$ref": "#/components/responses/UnauthorizedError"
+          },
+          "404": {
+            "$ref": "#/components/responses/NotFoundError"
+          }
+        }
+      },
+      "delete": {
+        "summary": "Delete an Item",
+        "description": "Delete an existing layers item.",
+        "tags": [
+          "Items",
+          "ItemsLayers"
+        ],
+        "operationId": "deleteSingleItemsLayers",
+        "responses": {
+          "200": {
+            "description": "Successful request"
+          },
+          "401": {
+            "$ref": "#/components/responses/UnauthorizedError"
+          },
+          "404": {
+            "$ref": "#/components/responses/NotFoundError"
+          }
+        },
+        "parameters": [
+          {
+            "name": "id",
+            "description": "Index of the item.",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "oneOf": [
+                {
+                  "type": "integer",
+                  "description": "Incremental index of the item.",
+                  "example": 1
+                },
+                {
+                  "type": "string",
+                  "description": "Unique identifier of the item.",
+                  "example": "8cbb43fe-4cdf-4991-8352-c461779cec02"
+                }
+              ]
+            }
+          }
+        ]
+      }
+    },
     "/items/items_files": {
       "post": {
         "summary": "Create an Item",
@@ -21266,10 +21266,6 @@
       "name": "ItemsOceannomadsProfiles",
       "x-collection": "oceannomads_profiles"
     },
-    {
-      "name": "ItemsLayers",
-      "x-collection": "layers"
-    },
     {
       "name": "ItemsAttestations",
       "x-collection": "attestations"
@@ -21322,6 +21318,10 @@
       "name": "ItemsItemSecrets",
       "x-collection": "itemSecrets"
     },
+    {
+      "name": "ItemsLayers",
+      "x-collection": "layers"
+    },
     {
       "name": "ItemsItemsFiles",
       "x-collection": "items_files"
@@ -23439,142 +23439,6 @@
           "id"
         ]
       },
-      "ItemsLayers": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "nullable": false,
-            "type": "string",
-            "format": "uuid"
-          },
-          "indexIcon": {
-            "nullable": true,
-            "oneOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "$ref": "#/components/schemas/Files"
-              }
-            ]
-          },
-          "index_plus_button": {
-            "nullable": true,
-            "type": "boolean"
-          },
-          "itemType": {
-            "nullable": true,
-            "oneOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "$ref": "#/components/schemas/ItemsTypes"
-              }
-            ]
-          },
-          "item_presets": {
-            "nullable": true
-          },
-          "listed": {
-            "nullable": true,
-            "type": "boolean"
-          },
-          "markerDefaultColor2": {
-            "nullable": true,
-            "type": "string"
-          },
-          "markerIcon": {
-            "nullable": true,
-            "oneOf": [
-              {
-                "type": "string"
-              },
-              {
-                "$ref": "#/components/schemas/ItemsMarkerIcons"
-              }
-            ]
-          },
-          "markerShape": {
-            "nullable": true,
-            "type": "string"
-          },
-          "menuColor": {
-            "nullable": true,
-            "type": "string"
-          },
-          "menuIcon": {
-            "nullable": true,
-            "oneOf": [
-              {
-                "type": "string",
-                "format": "uuid"
-              },
-              {
-                "$ref": "#/components/schemas/Files"
-              }
-            ]
-          },
-          "menuText": {
-            "nullable": true,
-            "type": "string"
-          },
-          "name": {
-            "nullable": true,
-            "type": "string"
-          },
-          "onlyOnePerOwner": {
-            "nullable": true,
-            "type": "boolean"
-          },
-          "public_edit_items": {
-            "nullable": true,
-            "type": "boolean"
-          },
-          "userProfileLayer": {
-            "nullable": true,
-            "type": "boolean"
-          },
-          "sort": {
-            "nullable": true,
-            "type": "integer"
-          },
-          "maps": {
-            "nullable": true,
-            "type": "array",
-            "items": {
-              "oneOf": [
-                {
-                  "type": "integer"
-                },
-                {
-                  "$ref": "#/components/schemas/ItemsLayersMaps"
-                }
-              ]
-            }
-          },
-          "notifications": {
-            "nullable": true,
-            "type": "array",
-            "items": {
-              "oneOf": [
-                {
-                  "type": "integer"
-                },
-                {
-                  "$ref": "#/components/schemas/ItemsLayersDirectusUsers1"
-                }
-              ]
-            }
-          }
-        },
-        "x-collection": "layers",
-        "required": [
-          "id"
-        ]
-      },
       "ItemsAttestations": {
         "type": "object",
         "properties": {
@@ -24413,6 +24277,142 @@
           "secret"
         ]
       },
+      "ItemsLayers": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "nullable": false,
+            "type": "string",
+            "format": "uuid"
+          },
+          "indexIcon": {
+            "nullable": true,
+            "oneOf": [
+              {
+                "type": "string",
+                "format": "uuid"
+              },
+              {
+                "$ref": "#/components/schemas/Files"
+              }
+            ]
+          },
+          "index_plus_button": {
+            "nullable": true,
+            "type": "boolean"
+          },
+          "itemType": {
+            "nullable": true,
+            "oneOf": [
+              {
+                "type": "string",
+                "format": "uuid"
+              },
+              {
+                "$ref": "#/components/schemas/ItemsTypes"
+              }
+            ]
+          },
+          "item_presets": {
+            "nullable": true
+          },
+          "listed": {
+            "nullable": true,
+            "type": "boolean"
+          },
+          "markerDefaultColor2": {
+            "nullable": true,
+            "type": "string"
+          },
+          "markerIcon": {
+            "nullable": true,
+            "oneOf": [
+              {
+                "type": "string"
+              },
+              {
+                "$ref": "#/components/schemas/ItemsMarkerIcons"
+              }
+            ]
+          },
+          "markerShape": {
+            "nullable": true,
+            "type": "string"
+          },
+          "menuColor": {
+            "nullable": true,
+            "type": "string"
+          },
+          "menuIcon": {
+            "nullable": true,
+            "oneOf": [
+              {
+                "type": "string",
+                "format": "uuid"
+              },
+              {
+                "$ref": "#/components/schemas/Files"
+              }
+            ]
+          },
+          "menuText": {
+            "nullable": true,
+            "type": "string"
+          },
+          "name": {
+            "nullable": true,
+            "type": "string"
+          },
+          "onlyOnePerOwner": {
+            "nullable": true,
+            "type": "boolean"
+          },
+          "public_edit_items": {
+            "nullable": true,
+            "type": "boolean"
+          },
+          "sort": {
+            "nullable": true,
+            "type": "integer"
+          },
+          "userProfileLayer": {
+            "nullable": true,
+            "type": "boolean"
+          },
+          "maps": {
+            "nullable": true,
+            "type": "array",
+            "items": {
+              "oneOf": [
+                {
+                  "type": "integer"
+                },
+                {
+                  "$ref": "#/components/schemas/ItemsLayersMaps"
+                }
+              ]
+            }
+          },
+          "notifications": {
+            "nullable": true,
+            "type": "array",
+            "items": {
+              "oneOf": [
+                {
+                  "type": "integer"
+                },
+                {
+                  "$ref": "#/components/schemas/ItemsLayersDirectusUsers1"
+                }
+              ]
+            }
+          }
+        },
+        "x-collection": "layers",
+        "required": [
+          "id"
+        ]
+      },
       "ItemsItemsFiles": {
         "type": "object",
         "properties": {
diff --git a/backend/directus-config/specs/system.graphql b/backend/directus-config/specs/system.graphql
index c4fa5aa1..622c6c4d 100644
--- a/backend/directus-config/specs/system.graphql
+++ b/backend/directus-config/specs/system.graphql
@@ -266,7 +266,6 @@ type Subscription {
   relations_mutated(event: EventEnum): relations_mutated
   oceannomads_events_mutated(event: EventEnum): oceannomads_events_mutated
   oceannomads_profiles_mutated(event: EventEnum): oceannomads_profiles_mutated
-  layers_mutated(event: EventEnum): layers_mutated
   attestations_mutated(event: EventEnum): attestations_mutated
   attestations_directus_users_mutated(event: EventEnum): attestations_directus_users_mutated
   contactInfos_mutated(event: EventEnum): contactInfos_mutated
@@ -280,6 +279,7 @@ type Subscription {
   inviteLinks_mutated(event: EventEnum): inviteLinks_mutated
   items_mutated(event: EventEnum): items_mutated
   itemSecrets_mutated(event: EventEnum): itemSecrets_mutated
+  layers_mutated(event: EventEnum): layers_mutated
   items_files_mutated(event: EventEnum): items_files_mutated
   items_items_mutated(event: EventEnum): items_items_mutated
   items_tags_mutated(event: EventEnum): items_tags_mutated
@@ -1966,8 +1966,8 @@ type layers {
   name: String
   onlyOnePerOwner: Boolean
   public_edit_items: Boolean
-  userProfileLayer: Boolean
   sort: Int
+  userProfileLayer: Boolean
   maps(filter: layers_maps_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String): [layers_maps]
   maps_func: count_functions
   notifications(filter: layers_directus_users_1_filter, sort: [String], limit: Int, offset: Int, page: Int, search: String): [layers_directus_users_1]
@@ -2779,8 +2779,8 @@ input create_layers_input {
   name: String
   onlyOnePerOwner: Boolean
   public_edit_items: Boolean
-  userProfileLayer: Boolean
   sort: Int
+  userProfileLayer: Boolean
   maps: [create_layers_maps_input]
   notifications: [create_layers_directus_users_1_input]
 }
@@ -3741,8 +3741,8 @@ input layers_filter {
   name: string_filter_operators
   onlyOnePerOwner: boolean_filter_operators
   public_edit_items: boolean_filter_operators
-  userProfileLayer: boolean_filter_operators
   sort: number_filter_operators
+  userProfileLayer: boolean_filter_operators
   maps: layers_maps_quantifier_filter
   maps_func: count_function_filter_operators
   notifications: layers_directus_users_1_quantifier_filter
@@ -4319,8 +4319,8 @@ input update_layers_input {
   name: String
   onlyOnePerOwner: Boolean
   public_edit_items: Boolean
-  userProfileLayer: Boolean
   sort: Int
+  userProfileLayer: Boolean
   maps: [update_layers_maps_input]
   notifications: [update_layers_directus_users_1_input]
 }