diff --git a/src/main/java/lu/jpt/csparqlproject/rentacar/RentACarSimulation.java b/src/main/java/lu/jpt/csparqlproject/rentacar/RentACarSimulation.java
index 16a5e72..31909b4 100644
--- a/src/main/java/lu/jpt/csparqlproject/rentacar/RentACarSimulation.java
+++ b/src/main/java/lu/jpt/csparqlproject/rentacar/RentACarSimulation.java
@@ -211,14 +211,14 @@ public class RentACarSimulation implements Runnable {
 				+ "PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> "
 				+ "PREFIX car: <"+RentACarSimulation.BASE_ONTOLOGY_IRI+"> "
 				+ "CONSTRUCT { "
-				+ " [] rdf:type car:AverageSpeedEvent . "
-				+ " [] car:relatedCar ?car . "
-				+ " [] car:averageSpeed ?avgSpeed . "
+				+ " [] rdf:type car:AverageSpeedEvent "
+				+ " ; car:relatedCar ?car "
+				+ " ; car:averageSpeed ?avgSpeed . "
 				+ "} "
 				+ "FROM STREAM <"+RentACarSimulation.CAR_STREAM_IRI+"> [RANGE 5s STEP 1s] "
 				+ "WHERE { "
 				+ " { "
-				+ "  SELECT (AVG(?speed) AS ?avgSpeed) "
+				+ "  SELECT ?car (AVG(?speed) AS ?avgSpeed) "
 				+ "  WHERE { "
 				+ "   ?e rdf:type car:CarStatusEvent . "
 				+ "   ?e car:relatedCar ?car . "