Changed cypher query mapping following recommendation from neo4j-core