Support for query more (added by Akhilesh)