Fix a missing query method
Add mapping for streams api endpoints
bug fixes in pull code