diff --git a/snb-interactive-neo4j/src/main/java/net/ellitron/ldbcsnbimpls/interactive/neo4j/Neo4jDb.java b/snb-interactive-neo4j/src/main/java/net/ellitron/ldbcsnbimpls/interactive/neo4j/Neo4jDb.java
index 9ce559d..d0c045c 100644
--- a/snb-interactive-neo4j/src/main/java/net/ellitron/ldbcsnbimpls/interactive/neo4j/Neo4jDb.java
+++ b/snb-interactive-neo4j/src/main/java/net/ellitron/ldbcsnbimpls/interactive/neo4j/Neo4jDb.java
@@ -376,8 +376,8 @@ public void executeOperation(LdbcQuery2 operation,
       Driver driver = ((Neo4jDbConnectionState) dbConnectionState).getDriver();
 
       String statement =
-          "   MATCH (:Person {id:{1}})-[:KNOWS]-(friend:Person)<-[:HAS_CREATOR]-(message)"
-          + " WHERE message.creationDate <= {2} AND (message:Post OR message:Comment)"
+          "   MATCH (:Person {id:{1}})-[:KNOWS]-(friend:Person)<-[:HAS_CREATOR]-(message:Message)"
+          + " WHERE message.creationDate <= {2}"
           + " RETURN"
           + "   friend.id AS personId,"
           + "   friend.firstName AS personFirstName,"