diff --git a/wmo/queryList.go b/wmo/queryList.go
index f9233b9..df79545 100644
--- a/wmo/queryList.go
+++ b/wmo/queryList.go
@@ -21,19 +21,7 @@ func (c *Coll[TData]) List(ctx context.Context, filter ct.Filter, pageSize *int,
 
 	if filter != nil {
 		pipeline = filter.FilterQuery()
-		fpf1, fpd1, fpf2, fpd2 := filter.Pagination()
-		if fpf1 != "" {
-			pf1 = fpf1
-		}
-		if fpd1 != "" {
-			pd1 = fpd1
-		}
-		if fpf2 != "" {
-			pf2 = fpf2
-		}
-		if fpd2 != "" {
-			pd2 = fpd2
-		}
+		pf1, pd1, pf2, pd2 = filter.Pagination()
 	}
 
 	sortPrimary := pf1