diff --git a/src/main/java/tech/ailef/dbadmin/external/controller/DataExportController.java b/src/main/java/tech/ailef/dbadmin/external/controller/DataExportController.java
index 3981b06..46e62d6 100644
--- a/src/main/java/tech/ailef/dbadmin/external/controller/DataExportController.java
+++ b/src/main/java/tech/ailef/dbadmin/external/controller/DataExportController.java
@@ -87,7 +87,7 @@ public class DataExportController {
 					.header(HttpHeaders.CONTENT_DISPOSITION,
 					"attachment; filename=\"export_" + schema.getJavaClass().getSimpleName() + ".xlsx\"")
 					.body(toXlsx(sheetName, results, fields, raw));
-		case JSON:
+		case JSONL:
 			throw new DbAdminException("JSON TODO");
 		default:
 			throw new DbAdminException("Unable to detect export format");
diff --git a/src/main/java/tech/ailef/dbadmin/external/dto/DataExportFormat.java b/src/main/java/tech/ailef/dbadmin/external/dto/DataExportFormat.java
index f199539..f4a7286 100644
--- a/src/main/java/tech/ailef/dbadmin/external/dto/DataExportFormat.java
+++ b/src/main/java/tech/ailef/dbadmin/external/dto/DataExportFormat.java
@@ -1,5 +1,5 @@
 package tech.ailef.dbadmin.external.dto;
 
 public enum DataExportFormat {
-	CSV, XLSX, JSON;
+	CSV, XLSX, JSONL;
 }
diff --git a/src/main/resources/templates/model/list.html b/src/main/resources/templates/model/list.html
index 9737389..3c104c2 100644
--- a/src/main/resources/templates/model/list.html
+++ b/src/main/resources/templates/model/list.html
@@ -54,8 +54,9 @@
 								</div>
 								<h5 class="fw-bold mt-3">Export format</h3>
 								<select name="format" class="form-select">
-									<option value="csv">CSV</option>
-									<option value="xlsx">XLSX</option>
+									<option th:each="format : ${T(tech.ailef.dbadmin.external.dto.DataExportFormat).values()}"
+										th:value="${format}" th:text="${format}">
+									</option>
 								</select>
 								<div class="form-check mt-3">
 									<input class="form-check-input" type="checkbox"