diff --git a/gateway/src/RequestInflux.go b/gateway/src/RequestInflux.go
index 77cd242..4df854d 100644
--- a/gateway/src/RequestInflux.go
+++ b/gateway/src/RequestInflux.go
@@ -68,18 +68,28 @@ func (gh *Gateway) requestInflux(c *gin.Context) error {
 				|> filter(fn: (r) => r["user"] == %q)
 				|> filter(fn: (r) => r["room"] == %q)
 				|> filter(fn: (r) => r["device"] == %q)
-				//|> aggregateWindow(every: 1000d, fn: mean, createEmpty: false)
 				`, INFLUXDB_BUCKET, MEASUREMENT_NAME, user, room, device)
 	results, err := queryAPI.Query(context.Background(), query)
 	if err != nil {
 		log.Fatal(err)
 	}
-	values := make(map[string]interface{})
+
+	type measurement = map[string]interface{}
+	var values []measurement
+
 	for results.Next() {
+		m := measurement{}
 		record := results.Record()
 		field := record.Field()
 		value := record.Value()
-		values[field] = value
+		m["time"] = record.Time()
+		if field == "temperature" {
+			m["temperature"] = value.(float64)
+		}
+		if field == "humidity" {
+			m["humidity"] = value.(float64)
+		}
+		values = append(values, m)
 		fmt.Println(results.Record())
 	}
 	if err := results.Err(); err != nil {