sorting and pagination fixes