LPS-35091 Fix DL pagination issues