refactored to accommodate the BIG nif service queries that deprecate includeSubclasses=true, and use subclassQuery and subclassFilter whenever closure is needed