Support today
Add error handling
Fix rewriting bug
Improve client for test
Add closeQuery()