diff --git a/front/js/svelte/content/Index.svelte b/front/js/svelte/content/Index.svelte
index 77bfcc5..7cd2c3d 100644
--- a/front/js/svelte/content/Index.svelte
+++ b/front/js/svelte/content/Index.svelte
@@ -14,7 +14,8 @@
 
     // export let visibleFields;
     export let systemFields;
-    export let sort;
+    export let sortParam;
+    export let sortField;
     export let operators;
     export let filter;
     export let limit;
@@ -42,7 +43,8 @@
             .get(newUrl)
             .then((response) => {
                 records = response.data.records;
-                sort = response.data.sort;
+                sortParam = response.data.sortParam;
+                sortField = response.data.sortField;
                 operators = response.data.operators;
                 filter = response.data.filter;
                 skip = response.data.skip;
@@ -70,7 +72,8 @@
                     bind:schema
                     bind:records
                     {systemFields}
-                    {sort}
+                    {sortParam}
+                    {sortField}
                     {operators}
                     {filter}
                     {inModal}
@@ -85,7 +88,8 @@
                     {records}
                     {graph}
                     {schema}
-                    {sort}
+                    {sortParam}
+                    {sortField}
                     {systemFields}
                     {inModal}
                     {users}
diff --git a/front/js/svelte/content/RecordRow.svelte b/front/js/svelte/content/RecordRow.svelte
index 4caef73..7f2d7a6 100644
--- a/front/js/svelte/content/RecordRow.svelte
+++ b/front/js/svelte/content/RecordRow.svelte
@@ -9,7 +9,8 @@
     export let users;
     export let graph;
     export let record;
-    export let sort;
+    export let sortParam;
+    export let sortField;
     export let visibleColumns;
 
 </script>
@@ -17,7 +18,7 @@
 {#each visibleColumns as field, index}
     <td
         class="field-ui-{field.info.name}"
-        class:is-sort={"-" + field.name == sort || field.name == sort}
+        class:is-sort={field.name === sortField.name}
     >
         <RenderField {record} {schema} {graph} {field}/>
     </td>
@@ -25,7 +26,7 @@
 {#if schema.visible.includes("status")}
     <td
         class="text-center"
-        class:is-sort={"-status" == sort || "status" == sort}
+        class:is-sort={"-status" == sortParam || "status" == sortParam}
     >
         <Status status={record.status}/>
     </td>
@@ -33,7 +34,7 @@
 {#if schema.visible.includes("_sys.createdBy")}
     <td
         class="text-center"
-        class:is-sort={"-_sys.createdBy" == sort || "_sys.createdBy" == sort}
+        class:is-sort={"-_sys.createdBy" == sortParam || "_sys.createdBy" == sortParam}
     >
         <Avatar name={usernameById(users, record._sys.createdBy)} side={24}/>
     </td>
@@ -41,18 +42,18 @@
 {#if schema.visible.includes("_sys.updatedBy")}
     <td
         class="text-center"
-        class:is-sort={"-_sys.updatedBy" == sort || "_sys.updatedBy" == sort}
+        class:is-sort={"-_sys.updatedBy" == sortParam || "_sys.updatedBy" == sortParam}
     >
         <Avatar name={usernameById(users, record._sys.updatedBy)} side={24}/>
     </td>
 {/if}
 {#if schema.visible.includes("_sys.createdAt")}
-    <td class:is-sort={"-_sys.createdAt" == sort || "_sys.createdAt" == sort}>
+    <td class:is-sort={"-_sys.createdAt" == sortParam || "_sys.createdAt" == sortParam}>
         {friendlyDate(record._sys.createdAt)}
     </td>
 {/if}
 {#if schema.visible.includes("_sys.updatedAt")}
-    <td class:is-sort={"-_sys.updatedAt" == sort || "_sys.updatedAt" == sort}>
+    <td class:is-sort={"-_sys.updatedAt" == sortParam || "_sys.updatedAt" == sortParam}>
         {friendlyDate(record._sys.updatedAt)}
     </td>
 {/if}
diff --git a/front/js/svelte/content/Table.svelte b/front/js/svelte/content/Table.svelte
index 6e1f1f4..b2a88bd 100644
--- a/front/js/svelte/content/Table.svelte
+++ b/front/js/svelte/content/Table.svelte
@@ -12,7 +12,8 @@
     export let records;
     export let graph;
     export let systemFields;
-    export let sort;
+    export let sortParam;
+    export let sortField;
     export let inModal;
     export let isWritable;
     export let selected = [];
@@ -61,8 +62,7 @@
             {#each visibleColumns as field}
                 <th
                         class="field-ui-{field.ui}"
-                        class:is-sort={"-" + field.name == sort ||
-                            field.name == sort}
+                        class:is-sort={field.name === sortField.name}
                         scope="col"
                         title={field.help}
                         data-bs-toggle="tooltip"
@@ -125,8 +125,8 @@
                         {graph}
                         {schema}
                         {visibleColumns}
-                        {sort}
-                        {systemFields}
+                        {sortParam}
+                        {sortField}
                         {inModal}
                         {users}
                 />
diff --git a/front/js/svelte/content/tools/SortFields.svelte b/front/js/svelte/content/tools/SortFields.svelte
index b5d53f2..3585b44 100644
--- a/front/js/svelte/content/tools/SortFields.svelte
+++ b/front/js/svelte/content/tools/SortFields.svelte
@@ -4,24 +4,22 @@
 
     const dispatch = createEventDispatcher();
     export let schema;
-    export let sort;
+    export let sortParam;
+    export let sortField;
     export let inModal;
     export let modalUrl;
     export let systemFields = [];
 
-    $: activeField = [...schema.fields, ...systemFields].find(
-        (f) => f.name === sort || "-" + f.name === sort || "data." + f.name === sort || "-data." + f.name === sort
-    );
-
     $: sortableFields = schema.fields.filter(
-        (f) => !["reference", "file", "json", "id", "tab"].includes(f.ui)
+        (f) => !["reference", "file", "json", "id", "rich", "markdown", "block"].includes(f.info.name)
     );
     $: systemFieldsFiltered = systemFields;
     $: if (schema.type === "collection") {
         systemFieldsFiltered = systemFields.filter((f) => f.files === false);
     }
 
-    function sortField(fieldSort) {
+
+    function triggerSortField(fieldSort) {
         const url = new URL(modalUrl ?? window.location.href);
         url.searchParams.set("sort", fieldSort);
         if (inModal) {
@@ -33,14 +31,14 @@
 
     function sortAsc(e, field) {
         e.preventDefault();
-        let prefix = systemFields.includes(el => el.name === field.name) ? "" : "data.";
-        return sortField(prefix + field.name);
+        let prefix = systemFields.map((el) =>  el.name).includes(field.name) ? "" : "data.";
+        return triggerSortField(prefix + field.name);
     }
 
     function sortDesc(e, field) {
         e.preventDefault();
-        let prefix = systemFields.includes(el => el.name === field.name) ? "" : "data.";
-        return sortField("-" + prefix + field.name);
+        let prefix = systemFields.map((el) =>  el.name).includes(field.name) ? "" : "data.";
+        return triggerSortField("-" + prefix + field.name);
     }
 </script>
 
@@ -52,12 +50,12 @@
         data-bs-auto-close="outside"
         aria-expanded="false"
     >
-        {#if sort.startsWith("-")}
+        {#if sortParam.startsWith("-")}
             <Icon icon="arrow-down-wide-short"/>
         {:else}
             <Icon icon="arrow-up-short-wide"/>
         {/if}
-        <span class="ms-1">{activeField.label}</span>
+        <span class="ms-1">{sortField.label}</span>
     </button>
     <div class="dropdown-menu" style="width:auto;max-width:800px;">
         <div class="row">
@@ -67,7 +65,7 @@
                         <button
                             on:click={(e) => sortAsc(e, field)}
                             title="Sort Ascending"
-                            class="btn btn-sm {field.name == sort
+                            class="btn btn-sm {field.name == sortField.name   && !sortParam.startsWith("-")
                                 ? 'btn-primary'
                                 : 'btn-outline-primary'} "
                         >
@@ -76,7 +74,7 @@
                         <button
                             on:click={(e) => sortDesc(e, field)}
                             title="Sort Descending"
-                            class="btn btn-sm {'-' + field.name == sort
+                            class="btn btn-sm {field.name == sortField.name && sortParam.startsWith("-")
                                 ? 'btn-primary'
                                 : 'btn-outline-primary'} "
                         >
@@ -102,7 +100,7 @@
                         <button
                             on:click={(e) => sortAsc(e, field)}
                             title="Sort Ascending"
-                            class="btn btn-sm {field.name == sort
+                            class="btn btn-sm {field.name == sortParam
                                 ? 'btn-primary'
                                 : 'btn-outline-primary'} "
                         >
@@ -111,7 +109,7 @@
                         <button
                             on:click={(e) => sortDesc(e, field)}
                             title="Sort Descending"
-                            class="btn btn-sm {'-' + field.name == sort
+                            class="btn btn-sm {'-' + field.name == sortParam
                                 ? 'btn-primary'
                                 : 'btn-outline-primary'} "
                         >
diff --git a/front/js/svelte/content/tools/Tools.svelte b/front/js/svelte/content/tools/Tools.svelte
index 1dffb62..76a7d30 100644
--- a/front/js/svelte/content/tools/Tools.svelte
+++ b/front/js/svelte/content/tools/Tools.svelte
@@ -9,7 +9,8 @@
     const channel = getContext("channel");
 
     const dispatch = createEventDispatcher();
-    export let sort;
+    export let sortParam;
+    export let sortField;
     export let schema;
     export let operators;
     export let filter;
@@ -50,7 +51,8 @@
 
         <SortFields
                 {schema}
-                {sort}
+                {sortParam}
+                {sortField}
                 {systemFields}
                 {inModal}
                 {modalUrl}
diff --git a/src/Database/migrations/2023_10_23_152122_RecordsUpdatedIndex.php b/src/Database/migrations/2023_10_23_152122_RecordsUpdatedIndex.php
new file mode 100644
index 0000000..37e3af5
--- /dev/null
+++ b/src/Database/migrations/2023_10_23_152122_RecordsUpdatedIndex.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('records', function (Blueprint $table) {
+            $table->dropIndex(['schema', 'status']);
+            $table->index(['schema', '_sys->updatedAt','status']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('records', function (Blueprint $table) {
+
+            $table->dropIndex(['schema', '_sys->updatedAt','status']);
+            $table->index(['schema', 'status']);
+        });
+    }
+};
diff --git a/src/Http/Controller/RecordController.php b/src/Http/Controller/RecordController.php
index a07480d..aac1e79 100644
--- a/src/Http/Controller/RecordController.php
+++ b/src/Http/Controller/RecordController.php
@@ -13,6 +13,7 @@ use Lucent\Query\Query;
 use Lucent\Record\Manager;
 use Lucent\Record\QueryRecord;
 use Lucent\Record\RecordService;
+use Lucent\Schema\FieldInterface;
 use Lucent\Schema\System;
 use Lucent\Schema\Validator\ValidatorException;
 use Lucent\Svelte\Svelte;
@@ -37,7 +38,7 @@ class RecordController extends Controller
     {
         $schemaName = $request->route("schemaName");
 
-        if(!in_array($schemaName,$this->accountService->currentReadableSchemas())){
+        if (!in_array($schemaName, $this->accountService->currentReadableSchemas())) {
             return $this->svelte->render(
                 layout: "channel",
                 view: "recordNotFound",
@@ -48,7 +49,7 @@ class RecordController extends Controller
         $users = $this->accountService->all();
         $schema = $this->channelService->getSchema($schemaName)->get();
         $urlParams = $request->all();
-        $sort = data_get($urlParams, "sort") ?? "-_sys.updatedAt";
+        $sort = data_get($urlParams, "sort") ?? $schema->sortBy;
         $filter = data_get($urlParams, "filter") ?? [];
 
         $arguments = array_merge([
@@ -84,13 +85,14 @@ class RecordController extends Controller
             "graph" => toArray($graph),
             "systemFields" => array_values(System::list()),
             "operators" => array_values(Operator::list()),
-            "sort" => $sort,
+            "sortParam" => $sort,
+            "sortField" => $schema->fields->merge(array_values(System::list()))->firstWhere(fn($field) => $field->name === $sort || "-" . $field->name === $sort || "data." . $field->name === $sort || "-data." . $field->name === $sort),
             "limit" => $limit,
             "skip" => $skip,
             "total" => $graph->total ?? 0,
             "filter" => $request->input("filter") ?? [],
             "inModal" => true,
-            "isWritable" => in_array($schemaName,$this->accountService->currentWritableSchemas())
+            "isWritable" => in_array($schemaName, $this->accountService->currentWritableSchemas())
         ];
 
         if ($request->ajax()) {
@@ -151,7 +153,7 @@ class RecordController extends Controller
 
     public function new(Request $request)
     {
-        if(!in_array($request->input("schema"),$this->accountService->currentWritableSchemas())){
+        if (!in_array($request->input("schema"), $this->accountService->currentWritableSchemas())) {
             return $this->svelte->render(
                 layout: "channel",
                 view: "recordNotFound",
@@ -172,7 +174,7 @@ class RecordController extends Controller
                 "record" => $queryRecord,
                 "recordHistory" => $recordHistory,
                 "isCreateMode" => true,
-                "isWritable" => in_array($record->schema,$this->accountService->currentWritableSchemas())
+                "isWritable" => in_array($record->schema, $this->accountService->currentWritableSchemas())
             ]
         );
     }
@@ -180,7 +182,7 @@ class RecordController extends Controller
 
     public function newInline(Request $request)
     {
-        if(!in_array($request->input("schema"),$this->accountService->currentWritableSchemas())){
+        if (!in_array($request->input("schema"), $this->accountService->currentWritableSchemas())) {
             return $this->svelte->render(
                 layout: "channel",
                 view: "recordNotFound",
@@ -224,7 +226,7 @@ class RecordController extends Controller
 
         $record = $graph->records->first();
 
-        if(!in_array($record->schema,$this->accountService->currentReadableSchemas())){
+        if (!in_array($record->schema, $this->accountService->currentReadableSchemas())) {
             return $this->svelte->render(
                 layout: "channel",
                 view: "recordNotFound",
@@ -244,7 +246,7 @@ class RecordController extends Controller
                 "record" => toArray($record),
                 "users" => $this->accountService->all(),
                 "recordHistory" => $recordHistory,
-                "isWritable" => in_array($record->schema,$this->accountService->currentWritableSchemas())
+                "isWritable" => in_array($record->schema, $this->accountService->currentWritableSchemas())
             ]
         );
     }
diff --git a/src/Query/Query.php b/src/Query/Query.php
index 92f8a6f..eeccab5 100644
--- a/src/Query/Query.php
+++ b/src/Query/Query.php
@@ -148,6 +148,7 @@ final  class Query
         }
 
         $query = $this->orderByQuery($query);
+
         return $query->get()->map(function ($r) {
             $r->isRoot = true;
             return $r;
diff --git a/src/Schema/CollectionSchema.php b/src/Schema/CollectionSchema.php
index c8903e7..94c7d31 100644
--- a/src/Schema/CollectionSchema.php
+++ b/src/Schema/CollectionSchema.php
@@ -20,6 +20,7 @@ class CollectionSchema implements Schema
         public Collection $fields,
         public bool       $isEntry = false,
         public string     $color = "",
+        public string     $sortBy = "-_sys.updatedAt",
         public string     $titleTemplate = "",
         public int        $revisions = 0,
         public array      $read = [],
diff --git a/src/Schema/FilesSchema.php b/src/Schema/FilesSchema.php
index 67c9250..1f39516 100644
--- a/src/Schema/FilesSchema.php
+++ b/src/Schema/FilesSchema.php
@@ -20,6 +20,7 @@ class FilesSchema implements Schema
         public string     $path,
         public array      $groups,
         public bool       $isEntry = false,
+        public string     $sortBy = "-_sys.updatedAt",
         public string     $color = "",
         public string     $titleTemplate = "",
         public int        $revisions = 0,
diff --git a/src/Schema/SchemaService.php b/src/Schema/SchemaService.php
index 57a4495..f0a517d 100644
--- a/src/Schema/SchemaService.php
+++ b/src/Schema/SchemaService.php
@@ -24,6 +24,7 @@ class SchemaService
                 fields: (new Collection($schemaArr["fields"]))->map([$this, 'mapFields']),
                 isEntry: $schemaArr["isEntry"] ?? false,
                 color: $schemaArr["color"] ?? "",
+                sortBy: $schemaArr["sortBy"] ?? "-_sys.updatedAt",
                 titleTemplate: $schemaArr["titleTemplate"] ?? "",
                 revisions: $schemaArr["revisions"] ?? 0,
                 read: $schemaArr["read"] ?? [],
@@ -36,6 +37,7 @@ class SchemaService
                 path: $schemaArr["path"] ?? $schemaArr["name"],
                 groups: $schemaArr["groups"] ?? [],
                 isEntry: $schemaArr["isEntry"] ?? false,
+                sortBy: $schemaArr["sortBy"] ?? "-_sys.updatedAt",
                 color: $schemaArr["color"] ?? "",
                 titleTemplate: $schemaArr["titleTemplate"] ?? "",
                 revisions: $schemaArr["revisions"] ?? 0,