Updates to the DataQuery module
Adding support for pages