keep the query and filter around for the hits array
Merge branch 'master' into OCLIncrementalStore