Neo4j changes for count and index