diff --git a/server/Flask/main.py b/server/Flask/main.py
index 87168c9..9fb35a1 100644
--- a/server/Flask/main.py
+++ b/server/Flask/main.py
@@ -1,7 +1,6 @@
 from flask import Flask, request, jsonify
 import mysql.connector
 from queries import *
-import ast
 app = Flask(__name__)
 
 @app.route('/getMeasurements')
@@ -50,10 +49,9 @@ def loginDB():
         )
         return mydb
 
-def getData(node, dataType, MAC, dateStart, dateEnd):
-        dataTypeTuple = ast.literal_eval(dataType)
+def getData(node, dataTypes, MAC, dateStart, dateEnd):
         mydb = loginDB()
-        query = get_query(node, dataTypeTuple, MAC, dateStart, dateEnd)
+        query = get_query(node, dataTypes, MAC, False, False, dateStart, dateEnd)
         cursor = mydb.cursor(dictionary=True)  # Enable dictionary output
         cursor.execute(query)
         result = cursor.fetchall()  # Fetch the results
@@ -64,7 +62,7 @@ def getData(node, dataType, MAC, dateStart, dateEnd):
 
 def getNodeInfo(macAdress):
         mydb = loginDB()
-        query = get_query(False, False, macAdress, False, False)
+        query = get_query(False, False, macAdress, False, False, False, False)
         cursor = mydb.cursor(dictionary=True)  # Enable dictionary output
         cursor.execute(query)
         result = cursor.fetchall()  # Fetch the results