Fix for pagination with existing params