Updated Snapshot Query to support need-props and Data collector filters