add pagination and custom filters