Add support for maxResults in queries
Add support for specifying query timeout