added paging and filtering