Adds support for data filters and sorting and fixes minor issues