ISPN-3034 Query should also filter out nulls when retrieving results thr...

...ough CacheQuery.iterator()