fix - better pagination