Fix build, fix pagination when used filter or search