Merge pull request #1778 from setowns1/bug

Support query of JSON/BSON recorded data.
Updated case query for query on live data.