added node-id support for more efficient querying