chnged fetchByPageNumber and fetchNextPage and fetchPreviousPage impl in collection