Tweaked club filtering on paginated views