diff --git a/package.json b/package.json
index c03e8a323..fc7bbc39e 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
   ],
   "scripts": {
     "start:api": "yarn workspace dbgate-api start | pino-pretty",
+    "start:api:watch": "nodemon --watch 'src/**' --ext 'ts,json,js' --exec yarn start:api",
     "start:api:json": "yarn workspace dbgate-api start",
     "start:app": "cd app && yarn start | pino-pretty",
     "start:app:singledb": "CONNECTIONS=con1 SERVER_con1=localhost ENGINE_con1=mysql@dbgate-plugin-mysql USER_con1=root PASSWORD_con1=Pwd2020Db SINGLE_CONNECTION=con1 SINGLE_DATABASE=Chinook yarn start:app",
diff --git a/plugins/dbgate-plugin-duckdb/src/backend/helpers.js b/plugins/dbgate-plugin-duckdb/src/backend/helpers.js
index 987c537f4..133326b0c 100644
--- a/plugins/dbgate-plugin-duckdb/src/backend/helpers.js
+++ b/plugins/dbgate-plugin-duckdb/src/backend/helpers.js
@@ -51,17 +51,15 @@ function _normalizeValue(value) {
   }
 
   if (value instanceof DuckDBDateValue) {
-    const year = value.year;
-    const month = String(value.month).padStart(2, '0');
-    const day = String(value.day).padStart(2, '0');
-    return `${year}-${month}-${day}`;
+    return value.toString();
   }
 
   if (value instanceof DuckDBTimeValue) {
-    const hour = String(value.hour).padStart(2, '0');
-    const minute = String(value.min).padStart(2, '0');
-    const second = String(value.sec).padStart(2, '0');
-    const micros = String(value.micros).padStart(6, '0').substring(0, 3);
+    const parts = value.toParts();
+    const hour = String(parts.hour).padStart(2, '0');
+    const minute = String(parts.min).padStart(2, '0');
+    const second = String(parts.sec).padStart(2, '0');
+    const micros = String(parts.micros).padStart(6, '0').substring(0, 3);
     return `${hour}:${minute}:${second}.${micros}`;
   }