Added limit:number and orderby:property and updated things to work with it