Add offset & limit options to query
Add fields options to query