Added limit field for simple queries