diff --git a/share/metkit/params-static.yaml b/share/metkit/params-static.yaml
index e823842f..d26d40ad 100644
--- a/share/metkit/params-static.yaml
+++ b/share/metkit/params-static.yaml
@@ -48,7 +48,9 @@
     levtype: ml
     stream: oper
     type: an
-  - - 135
+  - - 131
+    - 132
+    - 135
     - 152
     - 210181
     - 217009
@@ -67,30 +69,30 @@
     - 155
     - 210181
     - 217009
+- - class: od
+    levtype: sfc
+    stream: oper
+    type: fc
+  - - 3100
+- - class: od
+    levtype: sfc
+    stream: enfo
+    type: pf
+  - - 3100
 - - class: ai
     levtype: sfc
     stream: oper
     type: fc
-  - - 228143
-    - 228144
-    - 228164
-    - 228228
-    - 231002
-    - 3073
-    - 3074
-    - 3075
+  - - 140229
+    - 228141
+    - 228143
 - - class: ai
     levtype: sfc
     stream: enfo
-    type: [cf, pf]
-  - - 228143
-    - 228144
-    - 228164
-    - 228228
-    - 231002
-    - 3073
-    - 3074
-    - 3075
+    type: pf
+  - - 140229
+    - 228141
+    - 228143
 - - class: od
     levtype: ml
     stream: oper
diff --git a/tests/expand/MARSC-267 copy.expected b/tests/expand/MARSC-267 copy.expected
deleted file mode 100644
index 48ba21de..00000000
--- a/tests/expand/MARSC-267 copy.expected	
+++ /dev/null
@@ -1,19 +0,0 @@
-RETRIEVE,
-    CLASS      = S2,
-    TYPE       = PF,
-    STREAM     = ENFH,
-    EXPVER     = prod,
-    REPRES     = SH,
-    LEVTYPE    = PL,
-    LEVELIST   = 200/300/500/700/850/925/1000,
-    PARAM      = 130,
-    DATE       = 20240111,
-    HDATE      = 2004-01-11,
-    TIME       = 0000,
-    STEP       = 0/24/48/72/96/120/144/168/192/216/240/264/288/312/336/360/384/408/432/456/480/504/528/552/576/600/624/648/672/696/720/744/768/792/816/840/864/888/912/936/960/984/1008/1032/1056/1080/1104,
-    NUMBER     = 1,
-    ORIGIN     = ECMF,
-    TARGET     = target.out,
-    AREA       = 40/-180/-40/180,
-    PADDING    = 0,
-    PROCESS    = LOCAL
\ No newline at end of file
diff --git a/tests/expand/PGEN-569.expected b/tests/expand/PGEN-569.expected
new file mode 100644
index 00000000..77cc068a
--- /dev/null
+++ b/tests/expand/PGEN-569.expected
@@ -0,0 +1,12 @@
+disseminate,    
+  expver          =    0080,    
+  class           =    mc,    
+  stream          =    oper,    
+  time            =    0000/1200,    
+  type            =    an,    
+  step            =    0,    
+  levtype         =    ml,    
+  levelist        =    1,    
+  param           =    131/132,
+  date            =    20260420,
+  domain          =    g
\ No newline at end of file
diff --git a/tests/expand/PGEN-569.req b/tests/expand/PGEN-569.req
new file mode 100644
index 00000000..25211a95
--- /dev/null
+++ b/tests/expand/PGEN-569.req
@@ -0,0 +1,11 @@
+disseminate,    
+  expver          =    80,    
+  class           =    mc,    
+  stream          =    oper,    
+  time            =    0/12,    
+  type            =    an,    
+  step            =    0,    
+  levtype         =    ml,    
+  levelist        =    1,    
+  param           =    u/v,
+  date            =    20260420
\ No newline at end of file
diff --git a/tests/test_expand.cc b/tests/test_expand.cc
index 6c5a8f51..49cec94f 100644
--- a/tests/test_expand.cc
+++ b/tests/test_expand.cc
@@ -1242,6 +1242,17 @@ CASE("test_metkit_expand_coeffindex") {
     }
 }
 
+CASE("PGEN-566 class=ai") {
+    const char* text = "retrieve,date=20260506,class=ai,stream=oper,expver=0001,domain=g,type=fc,levtype=sfc,param=sd/swh,time=0000/0600/1200/1800,step=0";
+    const char* expected = "retrieve,date=20260506,class=ai,type=fc,stream=oper,levtype=sfc,time=0000/0600/1200/1800,step=0,expver=0001,domain=g,param=228141/140229";
+    expand(text, expected);
+}
+CASE("PGEN-566 od") {
+    const char* text = "retrieve,date=20260506,class=od,stream=oper,expver=0001,domain=g,type=fc,levtype=sfc,param=sd/swh,time=0000/0600/1200/1800,step=0";
+    const char* expected = "retrieve,date=20260506,class=od,type=fc,stream=oper,levtype=sfc,time=0000/0600/1200/1800,step=0,expver=0001,domain=g,param=141/3100";
+    expand(text, expected);
+}
+
 CASE("test_metkit_expand_A") {
     const char* text =
         "retrieve,accuracy=16,area=14.8/-19.6/-14.5/19.8,class=od,date=20230810,expver=1,grid=0.09/0.09,levelist=1/"