#51 fixed and tested pagination