diff --git a/api/s5_pipes.py b/api/s5_pipes.py
index b7b20c6..471a7ee 100644
--- a/api/s5_pipes.py
+++ b/api/s5_pipes.py
@@ -47,12 +47,12 @@ def delete_pipe(name: str, id: str) -> ChangeSet:
 
 def get_pipe_node1(name: str, id: str) -> str | None:
     row = _get_pipe(name, id)
-    return float(row['node1']) if row != None else None
+    return row['node1'] if row != None else None
 
 
 def get_pipe_node2(name: str, id: str) -> str | None:
     row = _get_pipe(name, id)
-    return float(row['node2']) if row != None else None
+    return row['node2'] if row != None else None
 
 
 def get_pipe_length(name: str, id: str) -> float | None:
@@ -77,7 +77,7 @@ def get_pipe_minor_loss(name: str, id: str) -> float | None:
 
 def get_pipe_status(name: str, id: str) -> str | None:
     row = _get_pipe(name, id)
-    return float(row['status']) if row != None else None
+    return row['status'] if row != None else None
 
 
 def _set_pipe(name: str, id: str, key: str, key_type: str, value: str, optional: bool = False) -> ChangeSet:
diff --git a/api/s6_pumps.py b/api/s6_pumps.py
index 39eeb9e..7fa40ab 100644
--- a/api/s6_pumps.py
+++ b/api/s6_pumps.py
@@ -39,12 +39,12 @@ def delete_pump(name: str, id: str) -> ChangeSet:
 
 def get_pump_node1(name: str, id: str) -> str | None:
     row = _get_pump(name, id)
-    return float(row['node1']) if row != None else None
+    return row['node1'] if row != None else None
 
 
 def get_pump_node2(name: str, id: str) -> str | None:
     row = _get_pump(name, id)
-    return float(row['node2']) if row != None else None
+    return row['node2'] if row != None else None
 
 
 def get_pump_power(name: str, id: str) -> str | None: pass
diff --git a/api/s7_valves.py b/api/s7_valves.py
index f1f9a7c..3a8bace 100644
--- a/api/s7_valves.py
+++ b/api/s7_valves.py
@@ -47,12 +47,12 @@ def delete_valve(name: str, id: str) -> ChangeSet:
 
 def get_valve_node1(name: str, id: str) -> str | None:
     row = _get_valve(name, id)
-    return float(row['node1']) if row != None else None
+    return row['node1'] if row != None else None
 
 
 def get_valve_node2(name: str, id: str) -> str | None:
     row = _get_valve(name, id)
-    return float(row['node2']) if row != None else None
+    return row['node2'] if row != None else None
 
 
 def get_valve_diameter(name: str, id: str) -> float | None:
@@ -62,7 +62,7 @@ def get_valve_diameter(name: str, id: str) -> float | None:
 
 def get_valve_type(name: str, id: str) -> str | None:
     row = _get_valve(name, id)
-    return float(row['type']) if row != None else None
+    return row['type'] if row != None else None
 
 
 def get_valve_setting(name: str, id: str) -> float | None: