changed queries to syntax that actually does node-by-id lookups and not full scans with filter on equality.