Added support for unlimited results to one of the queries