Updates, pagination fix, proper sorting