diff --git a/src/domain/bags.rs b/src/domain/bags.rs
index 8b035c4..0de5bca 100644
--- a/src/domain/bags.rs
+++ b/src/domain/bags.rs
@@ -91,7 +91,7 @@ pub enum BagSortKey {
 
 impl SortKey for BagSortKey {
     fn default() -> Self {
-        BagSortKey::RoastDate
+        BagSortKey::CreatedAt
     }
 
     fn from_query(value: &str) -> Option<Self> {
diff --git a/src/domain/gear.rs b/src/domain/gear.rs
index 0eccb68..3fefe53 100644
--- a/src/domain/gear.rs
+++ b/src/domain/gear.rs
@@ -96,7 +96,7 @@ pub enum GearSortKey {
 
 impl SortKey for GearSortKey {
     fn default() -> Self {
-        GearSortKey::Make
+        GearSortKey::CreatedAt
     }
 
     fn from_query(value: &str) -> Option<Self> {
diff --git a/templates/pages/add.html b/templates/pages/add.html
index 87c1c5a..12a7534 100644
--- a/templates/pages/add.html
+++ b/templates/pages/add.html
@@ -30,7 +30,7 @@
   <!-- Input: photo or text -->
   <div data-show="!$_scanExtracted" class="rounded-lg border bg-surface p-5">
     <form id="scan-extract-form"
-      data-on:submit="$_extracting = true; $_extractError = ''; $_roasterName = ''; $_roasterCountry = ''; $_roasterCity = ''; $_roasterHomepage = ''; $_roastName = ''; $_origin = ''; $_region = ''; $_producer = ''; $_process = ''; $_tastingNotes = ''; @post('/api/v1/extract-bag-scan', {contentType: 'form'})"
+      data-on:submit="$_extracting = true; $_extractError = ''; @post('/api/v1/extract-bag-scan', {contentType: 'form'})"
       data-on:datastar-fetch="if (!$_extracting) return; if (evt.detail.type === 'finished') { $_extracting = false; $_scanExtracted = true; document.getElementById('scan-extract-form').reset() } else if (evt.detail.type === 'error') { $_extracting = false; $_extractError = 'Extraction failed. Please try again.' }"
     >
       {% call scan::scan_input("scan-extract-form", "scan-image", "$_extracting", "$_extractError", "Describe the coffee bag…", "Waiting for response…") %}
diff --git a/templates/pages/home.html b/templates/pages/home.html
index 10ba103..2e42a46 100644
--- a/templates/pages/home.html
+++ b/templates/pages/home.html
@@ -52,7 +52,7 @@
   <!-- Input: photo or text (shown when not yet extracted) -->
   <div data-show="!$_scanExtracted" class="rounded-lg border bg-surface p-5">
     <form id="scan-extract-form"
-      data-on:submit="$_extracting = true; $_extractError = ''; $_roasterName = ''; $_roasterCountry = ''; $_roasterCity = ''; $_roasterHomepage = ''; $_roastName = ''; $_origin = ''; $_region = ''; $_producer = ''; $_process = ''; $_tastingNotes = ''; @post('/api/v1/extract-bag-scan', {contentType: 'form'})"
+      data-on:submit="$_extracting = true; $_extractError = ''; @post('/api/v1/extract-bag-scan', {contentType: 'form'})"
       data-on:datastar-fetch="if (!$_extracting) return; if (evt.detail.type === 'finished') { $_extracting = false; $_scanExtracted = true; document.getElementById('scan-extract-form').reset() } else if (evt.detail.type === 'error') { $_extracting = false; $_extractError = 'Extraction failed. Please try again.' }"
     >
       {% call scan::scan_input("scan-extract-form", "scan-image", "$_extracting", "$_extractError", "Describe the coffee bag…", "Waiting for response…") %}
@@ -64,7 +64,7 @@
     <form
       class="rounded-lg border bg-surface p-5 flex flex-col gap-6"
       data-on:submit="$_scanSubmitting = true; $_scanError = ''; @post('/api/v1/scan', {contentType: 'form'})"
-      data-on:datastar-fetch="if (!$_scanSubmitting) return; if (evt.detail.type === 'finished') { $_scanSubmitting = false; $_scanExtracted = false; $_roasterName = ''; $_roasterCountry = ''; $_roasterCity = ''; $_roasterHomepage = ''; $_roastName = ''; $_origin = ''; $_region = ''; $_producer = ''; $_process = ''; $_tastingNotes = ''; $_openBag = true; $_bagAmount = 250; window.location.reload() } else if (evt.detail.type === 'error') { $_scanSubmitting = false; $_scanError = 'Save failed. Please try again.' }"
+      data-on:datastar-fetch="if (!$_scanSubmitting) return; if (evt.detail.type === 'finished') { window.location.reload() } else if (evt.detail.type === 'error') { $_scanSubmitting = false; $_scanError = 'Save failed. Please try again.' }"
     >
       {% include "partials/forms/scan_result_form.html" %}
     </form>