diff --git a/api/rest-api.go b/api/rest-api.go
index 1e58243..8d68066 100644
--- a/api/rest-api.go
+++ b/api/rest-api.go
@@ -66,8 +66,6 @@ func (api *weatherRestApi) getData(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	fmt.Println(query)
-
 	data, err := api.weaterStorage.GetData(query)
 	if err != nil {
 		http.Error(w, "", http.StatusBadRequest)
diff --git a/storage/influxdb-storage.go b/storage/influxdb-storage.go
index 43f8e42..fca5c1c 100644
--- a/storage/influxdb-storage.go
+++ b/storage/influxdb-storage.go
@@ -80,8 +80,7 @@ func (storage *influxStorage) GetData(query *WeatherQuery) ([]*WeatherData, erro
 
 	fields = fmt.Sprintf(" and ( %v )", fields)
 
-	fluxQuery := fmt.Sprintf("from(bucket:\"%v\")|> range(start: %v, stop: %v) |> filter(fn: (r) => r._measurement == \"%v\" %v)", storage.bucket, query.Start.Format(time.RFC3339), query.End.Format(time.RFC3339), storage.measurement, fields)
-	fmt.Println(fluxQuery)
+	fluxQuery := fmt.Sprintf("from(bucket:\"%v\")|> range(start: %v, stop: %v) |> filter(fn: (r) => r._measurement == \"%v\" and r.sensorId == \"%v\" %v)", storage.bucket, query.Start.Format(time.RFC3339), query.End.Format(time.RFC3339), storage.measurement, query.SensorId, fields)
 
 	res, err := storage.executeFluxQuery(fluxQuery)
 	return res, err