Added filter, pagination is correctly implemented now