diff --git a/src/fst/test/dict-gt-yamls/for_liv_yaml_2023_08_17_dict-gt-norm.gen.yaml b/src/fst/test/dict-gt-yamls/for_liv_yaml_2023_08_17_dict-gt-norm.gen.yaml
index bf9647f2..a16706a9 100644
--- a/src/fst/test/dict-gt-yamls/for_liv_yaml_2023_08_17_dict-gt-norm.gen.yaml
+++ b/src/fst/test/dict-gt-yamls/for_liv_yaml_2023_08_17_dict-gt-norm.gen.yaml
@@ -677,104 +677,104 @@ Tests:
     mängõ+V+Der+Der/NomAct+N+Sg+Nom: mǟngami
     
 #"V_15":{"tips":"15","vards":"killõ","vcount":"1","bloks":"V","loc":{
-    killõ+V+Inf: killõ
-    killõ+V+Ger: killõs
-    killõ+V+Sup: kīlam
-    killõ+V+Deb: kīlamõst
-    killõ+V+Ind+Prs+Sg1: kīlab
-    killõ+V+Ind+Prs+Sg2: kīlad
-    killõ+V+Ind+Prs+Sg3: kīlab
-    killõ+V+Ind+Prs+Pl1: kīlam
-    killõ+V+Ind+Prs+Pl2: kīlat
-    killõ+V+Ind+Prs+Pl3: kīlabõd
-    killõ+V+Ind+Prt+Sg1: kīliz
-    killõ+V+Ind+Prt+Sg2: kīlizt
-    killõ+V+Ind+Prt+Sg3: kīliz
-    killõ+V+Ind+Prt+Pl1: kīlizmõ
-    killõ+V+Ind+Prt+Pl2: [kīlizt, kīliztõ]
-    killõ+V+Ind+Prt+Pl3: [kīlizt, kīliztõ]
-    killõ+V+Ind+ConNeg+Sg: kil
-    killõ+V+Ind+ConNeg+Pl1: kīlam
-    killõ+V+Ind+ConNeg+Pl2: kīlat
-    killõ+V+Ind+ConNeg+Pl3: kīlat
-    killõ+V+Cond+Sg1: kīlaks
-    killõ+V+Cond+Sg2: kīlakst
-    killõ+V+Cond+Sg3: kīlaks
-    killõ+V+Cond+Pl1: kīlaksmõ
-    killõ+V+Cond+Pl2: kīlakstõ
-    killõ+V+Cond+Pl3: kīlakstõ
-    killõ+V+Cond+ConNeg+Sg: kīlaks
-    killõ+V+Cond+ConNeg+Pl1: kīlaksmõ
-    killõ+V+Cond+ConNeg+Pl2: kīlakstõ
-    killõ+V+Cond+ConNeg+Pl3: kīlakstõ
-    killõ+V+Imprt+Sg2: kīla
-    killõ+V+Imprt+ConNeg+Sg2: killõ
-    killõ+V+Imprt+Pl2: kīlagid
-    killõ+V+Imprt+ConNeg+Pl2: kīlagid
-    killõ+V+Jus+Sg3: kīlag
-    killõ+V+Jus+ConNeg+Sg3: kīlag
-    killõ+V+Jus+Pl3: kīlagõd
-    killõ+V+Jus+ConNeg+Pl3: kīlagõd
-    killõ+V+Quo+Sg3: kīlaji
-    killõ+V+Quo+ConNeg+Sg3: kīlaji
-    killõ+V+Quo+Pl3: kīlajid
-    killõ+V+Quo+ConNeg+Pl3: kīlajid
-    killõ+V+Act+PrfPrc+Sg: killõn
-    killõ+V+Act+PrfPrc+Pl: killõnd
-    killõ+V+Pss+PrfPrc+Sg: kildõd
-    killõ+V+Pss+PrsPrc+Sg: kildõb
-    killõ+V+Der+Der/NomAg+N+Sg+Nom: kīlaji
-    killõ+V+Der+Der/NomAct+N+Sg+Nom: kīlami
+    killõ+Hom1+V+Inf: killõ
+    killõ+Hom1+V+Ger: killõs
+    killõ+Hom1+V+Sup: kīlam
+    killõ+Hom1+V+Deb: kīlamõst
+    killõ+Hom1+V+Ind+Prs+Sg1: kīlab
+    killõ+Hom1+V+Ind+Prs+Sg2: kīlad
+    killõ+Hom1+V+Ind+Prs+Sg3: kīlab
+    killõ+Hom1+V+Ind+Prs+Pl1: kīlam
+    killõ+Hom1+V+Ind+Prs+Pl2: kīlat
+    killõ+Hom1+V+Ind+Prs+Pl3: kīlabõd
+    killõ+Hom1+V+Ind+Prt+Sg1: kīliz
+    killõ+Hom1+V+Ind+Prt+Sg2: kīlizt
+    killõ+Hom1+V+Ind+Prt+Sg3: kīliz
+    killõ+Hom1+V+Ind+Prt+Pl1: kīlizmõ
+    killõ+Hom1+V+Ind+Prt+Pl2: [kīlizt, kīliztõ]
+    killõ+Hom1+V+Ind+Prt+Pl3: [kīlizt, kīliztõ]
+    killõ+Hom1+V+Ind+ConNeg+Sg: kil
+    killõ+Hom1+V+Ind+ConNeg+Pl1: kīlam
+    killõ+Hom1+V+Ind+ConNeg+Pl2: kīlat
+    killõ+Hom1+V+Ind+ConNeg+Pl3: kīlat
+    killõ+Hom1+V+Cond+Sg1: kīlaks
+    killõ+Hom1+V+Cond+Sg2: kīlakst
+    killõ+Hom1+V+Cond+Sg3: kīlaks
+    killõ+Hom1+V+Cond+Pl1: kīlaksmõ
+    killõ+Hom1+V+Cond+Pl2: kīlakstõ
+    killõ+Hom1+V+Cond+Pl3: kīlakstõ
+    killõ+Hom1+V+Cond+ConNeg+Sg: kīlaks
+    killõ+Hom1+V+Cond+ConNeg+Pl1: kīlaksmõ
+    killõ+Hom1+V+Cond+ConNeg+Pl2: kīlakstõ
+    killõ+Hom1+V+Cond+ConNeg+Pl3: kīlakstõ
+    killõ+Hom1+V+Imprt+Sg2: kīla
+    killõ+Hom1+V+Imprt+ConNeg+Sg2: killõ
+    killõ+Hom1+V+Imprt+Pl2: kīlagid
+    killõ+Hom1+V+Imprt+ConNeg+Pl2: kīlagid
+    killõ+Hom1+V+Jus+Sg3: kīlag
+    killõ+Hom1+V+Jus+ConNeg+Sg3: kīlag
+    killõ+Hom1+V+Jus+Pl3: kīlagõd
+    killõ+Hom1+V+Jus+ConNeg+Pl3: kīlagõd
+    killõ+Hom1+V+Quo+Sg3: kīlaji
+    killõ+Hom1+V+Quo+ConNeg+Sg3: kīlaji
+    killõ+Hom1+V+Quo+Pl3: kīlajid
+    killõ+Hom1+V+Quo+ConNeg+Pl3: kīlajid
+    killõ+Hom1+V+Act+PrfPrc+Sg: killõn
+    killõ+Hom1+V+Act+PrfPrc+Pl: killõnd
+    killõ+Hom1+V+Pss+PrfPrc+Sg: kildõd
+    killõ+Hom1+V+Pss+PrsPrc+Sg: kildõb
+    killõ+Hom1+V+Der+Der/NomAg+N+Sg+Nom: kīlaji
+    killõ+Hom1+V+Der+Der/NomAct+N+Sg+Nom: kīlami
     
 #"V_16":{"tips":"16","vards":"pallõ","vcount":"1","bloks":"V","loc":{
-    pallõ+V+Inf: pallõ
-    pallõ+V+Ger: pallõs
-    pallõ+V+Sup: pǭlam
-    pallõ+V+Deb: pǭlamõst
-    pallõ+V+Ind+Prs+Sg1: pǭlab
-    pallõ+V+Ind+Prs+Sg2: pǭlad
-    pallõ+V+Ind+Prs+Sg3: pǭlab
-    pallõ+V+Ind+Prs+Pl1: pǭlam
-    pallõ+V+Ind+Prs+Pl2: pǭlat
-    pallõ+V+Ind+Prs+Pl3: pǭlabõd
-    pallõ+V+Ind+Prt+Sg1: pǭliz
-    pallõ+V+Ind+Prt+Sg2: pǭlizt
-    pallõ+V+Ind+Prt+Sg3: pǭliz
-    pallõ+V+Ind+Prt+Pl1: pǭlizmõ
-    pallõ+V+Ind+Prt+Pl2: [pǭlizt, pǭliztõ]
-    pallõ+V+Ind+Prt+Pl3: [pǭlizt, pǭliztõ]
-    pallõ+V+Ind+ConNeg+Sg: pal
-    pallõ+V+Ind+ConNeg+Pl1: pǭlam
-    pallõ+V+Ind+ConNeg+Pl2: pǭlat
-    pallõ+V+Ind+ConNeg+Pl3: pǭlat
-    pallõ+V+Cond+Sg1: pǭlaks
-    pallõ+V+Cond+Sg2: pǭlakst
-    pallõ+V+Cond+Sg3: pǭlaks
-    pallõ+V+Cond+Pl1: pǭlaksmõ
-    pallõ+V+Cond+Pl2: pǭlakstõ
-    pallõ+V+Cond+Pl3: pǭlakstõ
-    pallõ+V+Cond+ConNeg+Sg: pǭlaks
-    pallõ+V+Cond+ConNeg+Pl1: pǭlaksmõ
-    pallõ+V+Cond+ConNeg+Pl2: pǭlakstõ
-    pallõ+V+Cond+ConNeg+Pl3: pǭlakstõ
-    pallõ+V+Imprt+Sg2: pǭla
-    pallõ+V+Imprt+ConNeg+Sg2: pallõ
-    pallõ+V+Imprt+Pl2: pǭlagid
-    pallõ+V+Imprt+ConNeg+Pl2: pǭlagid
-    pallõ+V+Jus+Sg3: pǭlag
-    pallõ+V+Jus+ConNeg+Sg3: pǭlag
-    pallõ+V+Jus+Pl3: pǭlagõd
-    pallõ+V+Jus+ConNeg+Pl3: pǭlagõd
-    pallõ+V+Quo+Sg3: pǭlaji
-    pallõ+V+Quo+ConNeg+Sg3: pǭlaji
-    pallõ+V+Quo+Pl3: pǭlajid
-    pallõ+V+Quo+ConNeg+Pl3: pǭlajid
-    pallõ+V+Act+PrfPrc+Sg: pallõn
-    pallõ+V+Act+PrfPrc+Pl: pallõnd
-    pallõ+V+Pss+PrfPrc+Sg: paldõd
-    pallõ+V+Pss+PrsPrc+Sg: paldõb
-    pallõ+V+Der+Der/NomAg+N+Sg+Nom: pǭlaji
-    pallõ+V+Der+Der/NomAct+N+Sg+Nom: pǭlami
+    pallõ+Hom1+V+Inf: pallõ
+    pallõ+Hom1+V+Ger: pallõs
+    pallõ+Hom1+V+Sup: pǭlam
+    pallõ+Hom1+V+Deb: pǭlamõst
+    pallõ+Hom1+V+Ind+Prs+Sg1: pǭlab
+    pallõ+Hom1+V+Ind+Prs+Sg2: pǭlad
+    pallõ+Hom1+V+Ind+Prs+Sg3: pǭlab
+    pallõ+Hom1+V+Ind+Prs+Pl1: pǭlam
+    pallõ+Hom1+V+Ind+Prs+Pl2: pǭlat
+    pallõ+Hom1+V+Ind+Prs+Pl3: pǭlabõd
+    pallõ+Hom1+V+Ind+Prt+Sg1: pǭliz
+    pallõ+Hom1+V+Ind+Prt+Sg2: pǭlizt
+    pallõ+Hom1+V+Ind+Prt+Sg3: pǭliz
+    pallõ+Hom1+V+Ind+Prt+Pl1: pǭlizmõ
+    pallõ+Hom1+V+Ind+Prt+Pl2: [pǭlizt, pǭliztõ]
+    pallõ+Hom1+V+Ind+Prt+Pl3: [pǭlizt, pǭliztõ]
+    pallõ+Hom1+V+Ind+ConNeg+Sg: pal
+    pallõ+Hom1+V+Ind+ConNeg+Pl1: pǭlam
+    pallõ+Hom1+V+Ind+ConNeg+Pl2: pǭlat
+    pallõ+Hom1+V+Ind+ConNeg+Pl3: pǭlat
+    pallõ+Hom1+V+Cond+Sg1: pǭlaks
+    pallõ+Hom1+V+Cond+Sg2: pǭlakst
+    pallõ+Hom1+V+Cond+Sg3: pǭlaks
+    pallõ+Hom1+V+Cond+Pl1: pǭlaksmõ
+    pallõ+Hom1+V+Cond+Pl2: pǭlakstõ
+    pallõ+Hom1+V+Cond+Pl3: pǭlakstõ
+    pallõ+Hom1+V+Cond+ConNeg+Sg: pǭlaks
+    pallõ+Hom1+V+Cond+ConNeg+Pl1: pǭlaksmõ
+    pallõ+Hom1+V+Cond+ConNeg+Pl2: pǭlakstõ
+    pallõ+Hom1+V+Cond+ConNeg+Pl3: pǭlakstõ
+    pallõ+Hom1+V+Imprt+Sg2: pǭla
+    pallõ+Hom1+V+Imprt+ConNeg+Sg2: pallõ
+    pallõ+Hom1+V+Imprt+Pl2: pǭlagid
+    pallõ+Hom1+V+Imprt+ConNeg+Pl2: pǭlagid
+    pallõ+Hom1+V+Jus+Sg3: pǭlag
+    pallõ+Hom1+V+Jus+ConNeg+Sg3: pǭlag
+    pallõ+Hom1+V+Jus+Pl3: pǭlagõd
+    pallõ+Hom1+V+Jus+ConNeg+Pl3: pǭlagõd
+    pallõ+Hom1+V+Quo+Sg3: pǭlaji
+    pallõ+Hom1+V+Quo+ConNeg+Sg3: pǭlaji
+    pallõ+Hom1+V+Quo+Pl3: pǭlajid
+    pallõ+Hom1+V+Quo+ConNeg+Pl3: pǭlajid
+    pallõ+Hom1+V+Act+PrfPrc+Sg: pallõn
+    pallõ+Hom1+V+Act+PrfPrc+Pl: pallõnd
+    pallõ+Hom1+V+Pss+PrfPrc+Sg: paldõd
+    pallõ+Hom1+V+Pss+PrsPrc+Sg: paldõb
+    pallõ+Hom1+V+Der+Der/NomAg+N+Sg+Nom: pǭlaji
+    pallõ+Hom1+V+Der+Der/NomAct+N+Sg+Nom: pǭlami
     
 #"V_17":{"tips":"17","vards":"loulõ","vcount":"3","bloks":"V","loc":{
     loulõ+V+Inf: loulõ