further neo4j improvement