Adjustments to prepare for server side pagination and sorting