Added code to enfore that when filtering regular queries that the entity...

... in each extraction should not have a nodeID that is different from the query entity nodeID