diff --git a/src/main/java/telraam/database/daos/DetectionDAO.java b/src/main/java/telraam/database/daos/DetectionDAO.java
index fba506f..4e45e3c 100644
--- a/src/main/java/telraam/database/daos/DetectionDAO.java
+++ b/src/main/java/telraam/database/daos/DetectionDAO.java
@@ -35,10 +35,11 @@ INSERT INTO detection (station_id, baton_id, timestamp, rssi, battery, remote_id
 
     @SqlBatch("""
             INSERT INTO detection (station_id, baton_id, timestamp, rssi, battery, remote_id, uptime_ms, timestamp_ingestion) \
-            VALUES (:stationId, (SELECT id FROM baton WHERE :batonMac), :timestamp, :rssi, :battery, :remoteId, :uptimeMs, :timestampIngestion)
+            VALUES (:stationId, (SELECT id FROM baton WHERE mac = :batonMac), :timestamp, :rssi, :battery, :remoteId, :uptimeMs, :timestampIngestion)
             """)
-    @GetGeneratedKeys({"id"})
-    int insertAllWithoutBaton(@BindBean List<Detection> detection, @Bind("batonMac") List<String> batonMac);
+    @GetGeneratedKeys({"id", "baton_id"})
+    @RegisterBeanMapper(Detection.class)
+    List<Detection> insertAllWithoutBaton(@BindBean List<Detection> detection, @Bind("batonMac") List<String> batonMac);
 
     @SqlQuery("SELECT * FROM detection WHERE id = :id")
     @RegisterBeanMapper(Detection.class)
diff --git a/src/main/java/telraam/database/models/Detection.java b/src/main/java/telraam/database/models/Detection.java
index 23a4067..5cd050b 100644
--- a/src/main/java/telraam/database/models/Detection.java
+++ b/src/main/java/telraam/database/models/Detection.java
@@ -6,7 +6,9 @@
 
 import java.sql.Timestamp;
 
-@Setter @Getter @NoArgsConstructor
+@Setter
+@Getter
+@NoArgsConstructor
 public class Detection {
     private Integer id;
     private Integer batonId;
diff --git a/src/main/java/telraam/database/models/Team.java b/src/main/java/telraam/database/models/Team.java
index 94db208..91aa9eb 100644
--- a/src/main/java/telraam/database/models/Team.java
+++ b/src/main/java/telraam/database/models/Team.java
@@ -4,7 +4,11 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-@Getter @Setter @NoArgsConstructor
+import java.util.Objects;
+
+@Getter
+@Setter
+@NoArgsConstructor
 public class Team {
     private Integer id;
     private String name;
@@ -18,4 +22,8 @@ public Team(String name, int batonId) {
         this.name = name;
         this.batonId = batonId;
     }
+
+    public boolean equals(Team obj) {
+        return Objects.equals(id, obj.getId());
+    }
 }
diff --git a/src/main/java/telraam/logic/positioner/simple/SimplePositioner.java b/src/main/java/telraam/logic/positioner/simple/SimplePositioner.java
index f8a9022..90d0ec9 100644
--- a/src/main/java/telraam/logic/positioner/simple/SimplePositioner.java
+++ b/src/main/java/telraam/logic/positioner/simple/SimplePositioner.java
@@ -20,6 +20,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 public class SimplePositioner implements Positioner {
@@ -31,9 +32,9 @@ public class SimplePositioner implements Positioner {
     private static final Logger logger = Logger.getLogger(SimplePositioner.class.getName());
     private final PositionSender positionSender;
     private final Map<Integer, Team> batonIdToTeam;
-    private final Map<Team, CircularQueue<Detection>> teamDetections;
+    private final Map<Integer, CircularQueue<Detection>> teamDetections;
     private final List<Integer> stations;
-    private final Map<Team, Position> teamPositions;
+    private final Map<Integer, Position> teamPositions;
 
     public SimplePositioner(Jdbi jdbi) {
         this.debounceScheduled = false;
@@ -46,8 +47,8 @@ public SimplePositioner(Jdbi jdbi) {
         TeamDAO teamDAO = jdbi.onDemand(TeamDAO.class);
         List<Team> teams = teamDAO.getAll();
         for (Team team: teams) {
-            teamDetections.put(team, new CircularQueue<>(QUEUE_SIZE));
-            teamPositions.put(team, new Position(team.getId()));
+            teamDetections.put(team.getId(), new CircularQueue<>(QUEUE_SIZE));
+            teamPositions.put(team.getId(), new Position(team.getId()));
         }
         List<BatonSwitchover> switchovers = jdbi.onDemand(BatonSwitchoverDAO.class).getAll();
         switchovers.sort(Comparator.comparing(BatonSwitchover::getTimestamp));
@@ -63,7 +64,7 @@ public SimplePositioner(Jdbi jdbi) {
 
     public void calculatePositions() {
         logger.info("SimplePositioner: Calculating positions...");
-        for (Map.Entry<Team, CircularQueue<Detection>> entry: teamDetections.entrySet()) {
+        for (Map.Entry<Integer, CircularQueue<Detection>> entry: teamDetections.entrySet()) {
             List<Detection> detections = teamDetections.get(entry.getKey());
             detections.sort(Comparator.comparing(Detection::getTimestamp));
 
@@ -86,7 +87,7 @@ public void calculatePositions() {
 
     public void handle(Detection detection) {
         Team team = batonIdToTeam.get(detection.getBatonId());
-        teamDetections.get(team).add(detection);
+        teamDetections.get(team.getId()).add(detection);
 
         if (! debounceScheduled) {
             debounceScheduled = true;
@@ -94,7 +95,7 @@ public void handle(Detection detection) {
                 try {
                     calculatePositions();
                 } catch (Exception e) {
-                    logger.severe(e.getMessage());
+                    logger.log(Level.SEVERE, e.getMessage(), e);
                 }
                 debounceScheduled = false;
             }, DEBOUNCE_TIMEOUT, TimeUnit.SECONDS);
diff --git a/src/main/java/telraam/station/websocket/WebsocketFetcher.java b/src/main/java/telraam/station/websocket/WebsocketFetcher.java
index 76a4428..f0b910b 100644
--- a/src/main/java/telraam/station/websocket/WebsocketFetcher.java
+++ b/src/main/java/telraam/station/websocket/WebsocketFetcher.java
@@ -124,11 +124,17 @@ public void fetch() {
                     detection_mac_addresses.add(detection.mac);
                 }
                 if (!new_detections.isEmpty()) {
-                    detectionDAO.insertAllWithoutBaton(new_detections, detection_mac_addresses);
-                    new_detections.forEach((detection) -> {
+                    List<Detection> db_detections = detectionDAO.insertAllWithoutBaton(new_detections, detection_mac_addresses);
+                    for(int i = 0; i < new_detections.size(); i++) {
+                        Detection detection = new_detections.get(i);
+                        Detection db_detection = db_detections.get(i);
+
+                        detection.setBatonId(db_detection.getBatonId());
+                        detection.setId(db_detection.getId());
+
                         lappers.forEach((lapper) -> lapper.handle(detection));
                         positioners.forEach(positioner -> positioner.handle(detection));
-                    });
+                    }
                 }
 
                 logger.finer("Fetched " + detections.size() + " detections from " + station.getName() + ", Saved " + new_detections.size());