diff --git a/datapoint.go b/datapoint.go
index e5687c2..0690bbd 100644
--- a/datapoint.go
+++ b/datapoint.go
@@ -242,11 +242,11 @@ func DatapointRetrieve(id int, name string) (dp Datapoint, err error) { // {{{
 	var query string
 	var param any
 	if id > 0 {
-		query = `SELECT *, true AS found FROM datapoint WHERE id = $1`
+		query = `SELECT id, "group", name, "datatype", comment, last_value, nodata_problem_seconds, nodata_is_problem, true AS found FROM public.datapoint WHERE id = $1`
 		param = id
 		dp.ID = id
 	} else {
-		query = `SELECT *, true AS found FROM datapoint WHERE name = $1`
+		query = `SELECT id, "group", name, "datatype", comment, last_value, nodata_problem_seconds, nodata_is_problem, true AS found FROM public.datapoint WHERE name = $1`
 		param = name
 	}
 
diff --git a/main.go b/main.go
index 6eb559a..bb900a6 100644
--- a/main.go
+++ b/main.go
@@ -29,7 +29,7 @@ import (
 	"time"
 )
 
-const VERSION = "v38"
+const VERSION = "v39"
 
 var (
 	logger              *slog.Logger