added custom filters and pagination