added scoped_bson_t and query modifier support