diff --git a/src/components/specific/models/models-table/ModelsTable.vue b/src/components/specific/models/models-table/ModelsTable.vue
index 8ffa59722..051075d54 100644
--- a/src/components/specific/models/models-table/ModelsTable.vue
+++ b/src/components/specific/models/models-table/ModelsTable.vue
@@ -27,6 +27,12 @@
       </div>
     </template>
 
+    <template #column-filter-empty>
+      <span class="color-granite" style="font-weight: 400">
+        {{ $t("Tag.emptyTag") }}
+      </span>
+    </template>
+
     <template #cell-name="{ row: model }">
       <ModelNameCell
         :project="project"
@@ -35,9 +41,6 @@
         @close="nameEditMode[model.id] = false"
       />
     </template>
-    <template #column-filter-empty>
-      <span class="color-granite" style="font-weight: 400">{{ $t("Tag.emptyTag") }}</span>
-    </template>
     <template #cell-tags="{ row: model }">
       <ModelTagsCell :model="model" :parent="modelsTable" />
     </template>
@@ -181,22 +184,22 @@ export default {
     const getFilesInFolder = (folder) => collectDescendants(folder, (child) => !isFolder(child));
 
     const allFolders = computed(() =>
-      projectFileStructure.value.children.flatMap((file) => {
+      projectFileStructure.value.children?.flatMap((file) => {
         if (isFolder(file)) {
           return [file, ...getFoldersInFolder(file)];
         } else {
           return [];
         }
-      }),
+      }) ?? []
     );
     const allFiles = computed(() =>
-      projectFileStructure.value.children.flatMap((file) => {
+      projectFileStructure.value.children?.flatMap((file) => {
         if (isFolder(file)) {
           return getFilesInFolder(file);
         } else {
           return file;
         }
-      }),
+      }) ?? []
     );
 
     const tagsByModelId = computed(() => {
diff --git a/src/components/specific/models/models-table/columns.js b/src/components/specific/models/models-table/columns.js
index f5e8d8286..7482a45dc 100644
--- a/src/components/specific/models/models-table/columns.js
+++ b/src/components/specific/models/models-table/columns.js
@@ -27,12 +27,16 @@ export default [
   {
     id: "creator",
     text: "t.createdBy",
+    filter: true,
+    filterFunction: data => `${data.firstname} ${data.lastname}`,
     width: "160px",
     align: "center",
   },
   {
     id: "lastupdate",
     text: "t.modifiedOn",
+    sortable: true,
+    sortFunction: (a, b) => b.updated_at - a.updated_at,
     width: "140px",
     align: "center",
   },