diff --git a/src/fst/morphology/affixes/nouns.lexc b/src/fst/morphology/affixes/nouns.lexc
index df54d9b6..4dc63967 100644
--- a/src/fst/morphology/affixes/nouns.lexc
+++ b/src/fst/morphology/affixes/nouns.lexc
@@ -131,8 +131,8 @@ LEXICON N_PARA !!= @CODE@
 
 !LEXICON N_PARA-SG !!= @CODE@
 !: NMN_PARA-SG ;
-LEXICON N_PARA-PL !!= @CODE@
-: NMN_PARA-PL ;
+!LEXICON N_PARA-PL !!= @CODE@
+!: NMN_PARA-PL ;
 
 LEXICON N_PANGA !!= @CODE@
 !!панга:панг%{АОØ%}
diff --git a/src/fst/morphology/affixes/propernouns.lexc b/src/fst/morphology/affixes/propernouns.lexc
index 98a2eb4b..4d7be990 100644
--- a/src/fst/morphology/affixes/propernouns.lexc
+++ b/src/fst/morphology/affixes/propernouns.lexc
@@ -28,9 +28,6 @@ LEXICON PROP_KIAL1
 !LEXICON PROP_VELE_PLC
 ! N_TISHE	;
 
-LEXICON PROP_OSH_PLC
-: N_OSH ;
-
 LEXICON PROP_OSH
 : N_OSH	;
 
@@ -113,8 +110,8 @@ LEXICON Deriv-RUS-IN_SURMAL
 LEXICON PROP_KAL_SURMAL
 +Sem/Mal-Sur: NMN_KAL ;
 
-LEXICON PROP_KUDO_SURFEM
-+Sem/Fem-Sur: NMN_AVA ;
+!LEXICON PROP_KUDO_SURFEM
+!+Sem/Fem-Sur: NMN_AVA ;
 
 LEXICON CYRL-CONS_SUR
  PROP_KAL_SUR ;
@@ -174,12 +171,19 @@ LEXICON PROP_KUDO_MAL
 LEXICON PROP_AVA_MAL
 +Sem/Mal: NMN_AVA ;
 
+LEXICON PROP_AVA_FEM
++Sem/Fem: NMN_AVA ;
+LEXICON PROP_AVA_PATRFEM
++Sem/Fem: NMN_AVA ;
+LEXICON PROP_AVA_SURFEM
++Sem/Fem: NMN_AVA ;
+
 
 LEXICON PROP_OSH_PATRMAL
 +Sem/Mal-Patr: NMN_OSH ;
 
-LEXICON PROP_KUDO_PATRFEM
-+Sem/Fem-Patr: NMN_AVA ;
+!LEXICON PROP_KUDO_PATRFEM
+!+Sem/Fem-Patr: NMN_AVA ;
 
 
 LEXICON PROP_KAL_FEM
@@ -203,8 +207,8 @@ LEXICON PROP_OSH_FEM
 !LEXICON PROP_ПАНГО_FEM
 !+Sem/Fem: NMN_AVA ;
 
-LEXICON PROP_KUDO_FEM
-+Sem/Fem: NMN_AVA ;
+!LEXICON PROP_KUDO_FEM
+!+Sem/Fem: NMN_AVA ;
 
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/src/fst/scripts/urj-mdf-conversion.pl b/src/fst/scripts/urj-mdf-conversion.pl
index 8abb7306..581be83b 100755
--- a/src/fst/scripts/urj-mdf-conversion.pl
+++ b/src/fst/scripts/urj-mdf-conversion.pl
@@ -16,14 +16,15 @@ BEGIN
 while(<>) {
 	# Continuation lexicon substitutions:
 #	s/ C-FI-NEN/nen LONDON/g ;
-	s/ PROP_KAL_PLC/ N_KAL/g ;
-	s/ PROP_KUDO_PLC/ N_AVA/g ;
-	s/ PROP_OSH_PLC/ N_OSH/g ;
-	s/ PROP-PLC_KEL1/ N_KIAL1/g ;
-	s/ PROP-PLC_VELE/ N_TISHE/g ;
-	s/ PROP_VELE/ N_TISHE/g ;
-	s/ PROP-PLC_KUDO/ N_AVA/g ;
-	s/ PROP_KUDO/ N_AVA/g ;
+	s/ PROP_KAL_PLC/ PROP_KAL/g ;
+	s/ PROP_KUDO_PLC/ PROP_AVA/g ;
+	s/ PROP_OSH_PLC/ PROP_OSH/g ;
+	s/ PROP-PLC_KEL1/ PROP_KIAL1/g ;
+	s/ PROP-PLC_VELE/ PROP_TISHE/g ;
+	s/ PROP_VELE/ PROP_TISHE/g ;
+	s/ PROP-PLC_KUDO/ PROP_AVA/g ;
+	s/ PROP_KUDO/ PROP_AVA/g ;
+	s/ PROP_RUS_JA/ PROP_AVA/g ;
 
 	
 # loanwords with compound border over identical vowels