diff --git a/lib/resource-1.4/bulgarian/CatBul.gf b/lib/resource-1.4/bulgarian/CatBul.gf
index 3e12061f6..0ba7ee07e 100644
--- a/lib/resource-1.4/bulgarian/CatBul.gf
+++ b/lib/resource-1.4/bulgarian/CatBul.gf
@@ -41,7 +41,7 @@ concrete CatBul of Cat = open ResBul, Prelude, (R = ParamX) in {
     QCl = {s : ResBul.Tense => Anteriority => Polarity => QForm => Str} ;
     IP = {s : Role => Str; gn : GenNum} ;
     IComp = {s1,s2 : Str} ;    
-    IDet = {s : GenNum => Str; n : Number ; nonEmpty : Bool} ; ---- nonEmpty by AR
+    IDet = {s : DGender => Str; n : Number ; nonEmpty : Bool} ;
     IQuant = {s : GenNum => Str} ;
 
 -- Relative
diff --git a/lib/resource-1.4/bulgarian/QuestionBul.gf b/lib/resource-1.4/bulgarian/QuestionBul.gf
index d4cb9bc6a..65a11156b 100644
--- a/lib/resource-1.4/bulgarian/QuestionBul.gf
+++ b/lib/resource-1.4/bulgarian/QuestionBul.gf
@@ -41,19 +41,18 @@ concrete QuestionBul of Question = CatBul ** open ResBul, Prelude in {
                             <Pl,True> => NFPlCount ;
                             _         => NF idet.n Indef
                           }
-                 in idet.s ! gennum cn.g idet.n ++                   
-                    cn.s ! nf ;
+                 in idet.s ! cn.g ++ cn.s ! nf ;
       gn = gennum cn.g idet.n
       } ;
 
-    IdetIP idet = let g = DNeut in {
-      s  = \\c => idet.s ! gennum g idet.n ;         
-      gn = gennum g idet.n
+    IdetIP idet = {
+      s  = \\c => idet.s ! DNeut ;         
+      gn = gennum DNeut idet.n
       } ;
 
     IdetQuant iquant num = {
-      s = \\gn => iquant.s ! gn ++                   
-                    num.s ! dgenderSpecies (genGenNum gn) Indef RSubj ;
+      s = \\g => iquant.s ! gennum g num.n ++
+                    num.s ! dgenderSpecies g Indef RSubj ;
       n = num.n ;
       nonEmpty = num.nonEmpty
       } ;
diff --git a/lib/resource-1.4/bulgarian/StructuralBul.gf b/lib/resource-1.4/bulgarian/StructuralBul.gf
index 1a0444c0c..eacf50797 100644
--- a/lib/resource-1.4/bulgarian/StructuralBul.gf
+++ b/lib/resource-1.4/bulgarian/StructuralBul.gf
@@ -35,7 +35,7 @@ concrete StructuralBul of Structural = CatBul **
   here7to_Adv = ss ["до тук"] ;
   here7from_Adv = ss ["от тук"] ;
   how_IAdv = mkIAdv "как" ;
-  how8many_IDet = {s = \\_ => "колко"; n = Pl ; nonEmpty = False} ; ---- AR nonEmpty
+  how8many_IDet = {s = \\_ => "колко"; n = Pl; nonEmpty = False} ;
   if_Subj = ss "ако" ;
   in8front_Prep = mkPrep "пред" Acc ;
   i_Pron  = mkPron "аз" "мен" "ми" "мой" "моя" "моят" "моя" "моята" "мое" "моето" "мои" "моите" (GSg Masc) P1 ;
@@ -101,7 +101,7 @@ concrete StructuralBul of Structural = CatBul **
   when_IAdv = mkIAdv "кога" ;
   when_Subj = ss "когато" ;
   where_IAdv = mkIAdv "къде" ;
-  which_IQuant = {s = table GenNum ["кой";"коя";"кое";"кои"]} ; ---- FIXME AR
+  which_IQuant = {s = table GenNum ["кой";"коя";"кое";"кои"]} ;
   whoSg_IP = mkIP "кой" "кого" (GSg Masc) ;
   whoPl_IP = mkIP "кои" "кои" GPl ;
   why_IAdv = mkIAdv "защо" ;