Fix pagination issue in custom tabs