Added Pagination that is compatible with filter