diff --git a/check_mini_beieli_nodes/main.go b/check_mini_beieli_nodes/main.go
index 4f648e9..f219a03 100644
--- a/check_mini_beieli_nodes/main.go
+++ b/check_mini_beieli_nodes/main.go
@@ -272,7 +272,7 @@ func getLastMetrics(deveui string) OneMetric {
                                  |> range(start:-5d) 
                                  |> filter(fn: (r) => r._measurement == "measurement" and r.deveui == "%s")
                                  |> filter(fn: (r) => r._field == "vp") 
-                                 |> last() |> yield(name: "last")`, deveui))
+                                 |> last(column: "_time") |> yield(name: "last")`, deveui))
 
 	req, err := http.NewRequest("POST", url, bytes.NewBuffer(data))
 	if err != nil {
diff --git a/metrics.go b/metrics.go
index afa4ac8..40d711f 100644
--- a/metrics.go
+++ b/metrics.go
@@ -32,13 +32,13 @@ type OneMetric struct {
 // metrics handler
 
 func validProperty(prop string) bool {
-    valid_properties := [...]string{"w", "t", "h", "p", "vp" }
-    for _, p := range valid_properties {
-        if p == prop {
-            return true
-        }
-    }
-    return false
+	valid_properties := [...]string{"w", "t", "h", "p", "vp"}
+	for _, p := range valid_properties {
+		if p == prop {
+			return true
+		}
+	}
+	return false
 }
 
 func metricsHandler(response http.ResponseWriter, request *http.Request) {
@@ -52,13 +52,12 @@ func metricsHandler(response http.ResponseWriter, request *http.Request) {
 			return
 		}
 
-		if (!validProperty(property[0])) {
+		if !validProperty(property[0]) {
 			log.Println("Url Param 'property' is invalid")
 			fmt.Fprintf(response, "{ \"msg\": \"error: invalid property\" }")
 			return
 		}
 
-
 		deveui, ok := request.URL.Query()["deveui"]
 
 		if !ok || len(deveui[0]) < 1 {
@@ -300,14 +299,15 @@ func getLastMetrics(deveui string) OneMetric {
                                  |> range(start:-365d) 
                                  |> filter(fn: (r) => r._measurement == "measurement" and r.deveui == "%s")
                                  |> filter(fn: (r) => r._field == "t" or r._field == "h" or r._field == "w" or r._field == "p" or r._field == "vp") 
-                                 |> last() |> yield(name: "last")`, deveui))
+                                 |> last(column: "_time")
+                                 |> yield(name: "last")`, deveui))
 
 	req, err := http.NewRequest("POST", url, bytes.NewBuffer(data))
 	if err != nil {
 		log.Fatal("Error reading request. ", err)
 	}
 
-	// Set headers 
+	// Set headers
 	req.Header.Set("Authorization", "Token nKYCoz3TA-LItYXG988DjdiStMhrfKmFXQqzxrjzJJ7Ek_iUttzFSE9lfe3s6q99EMdcrjuGlDAjp4Y0VnNRXw==")
 	req.Header.Set("accept", "application/csv")
 	req.Header.Set("content-type", "application/vnd.flux")
diff --git a/persistence.go b/persistence.go
index 33c802b..1b82b80 100644
--- a/persistence.go
+++ b/persistence.go
@@ -118,7 +118,7 @@ func checkUserAvailable(username string) bool {
 	conn := globalPool.Get()
 	defer conn.Close()
 
-        _, err := conn.Do("HGETALL", userPrefix+username)
+	_, err := conn.Do("HGETALL", userPrefix+username)
 	if err == redis.ErrNil {
 		logit("User does not exist and is therefore available:" + username)
 		return true
diff --git a/snippets/graph.html b/snippets/graph.html
index 3cc2fb8..3167c87 100644
--- a/snippets/graph.html
+++ b/snippets/graph.html
@@ -53,7 +53,7 @@
   </section>
 </div>
 
-    <script src="https://cdn.jsdelivr.net/npm/apexcharts"></script>
+    <script src="https://cdn.jsdelivr.net/npm/apexcharts@3.22.1"></script>
 
 <script src="static/js/chart.js"></script>
 
diff --git a/static/js/3.22.1.zip b/static/js/3.22.1.zip
new file mode 100644
index 0000000..5d3c939
Binary files /dev/null and b/static/js/3.22.1.zip differ