Continueed fixes, pagination still broke.