Working sorting and pagination
More adjustments