Support for query limit
Merged with origin