fixes #717 Extend the query by id hack to find any simple _id query in a
query object and match off of the rest of the fields, if any.