diff --git a/grammars/database/DatabaseEng.gf b/grammars/database/DatabaseEng.gf
index 29ae87fec..971ab96a5 100644
--- a/grammars/database/DatabaseEng.gf
+++ b/grammars/database/DatabaseEng.gf
@@ -1,6 +1,6 @@
 --# -path=.:../resource/nabstract:../resource/nenglish:../prelude
 
-concrete DatabaseEng of Database = open Prelude, ResEng in {
+concrete DatabaseEng of Database = open Prelude, ResourceEng in {
 
 flags lexer=text ; unlexer=text ;
 
@@ -17,8 +17,8 @@ lincat
 
 lin
   WhichAre A B = QuestPhrase (IntVP (NounIPMany A) (PosVG (PredAP B))) ;
-  IsThere A = QuestPhrase (IsThereCN A) ;
-  AreThere A = QuestPhrase (AreThereCN NoNum A) ;
+  IsThere A = QuestPhrase (IsThereNP (IndefOneNP A)) ;
+  AreThere A = QuestPhrase (IsThereNP (IndefManyNP NoNum A)) ;
   WhatIs val = QuestPhrase (IntVP WhatOne (PosVG (PredNP val))) ;
   IsIt Q A = QuestPhrase (QuestVP Q (PosVG (PredAP A))) ;
 
diff --git a/grammars/database/RestaurantEng.gf b/grammars/database/RestaurantEng.gf
index 04e89a5b6..9b0b208a3 100644
--- a/grammars/database/RestaurantEng.gf
+++ b/grammars/database/RestaurantEng.gf
@@ -1,7 +1,7 @@
 --# -path=.:../resource/nabstract:../resource/nenglish:../prelude
 
 concrete RestaurantEng of Restaurant = 
-  DatabaseEng ** open Prelude,ParadigmsEng in {
+  DatabaseEng ** open Prelude, ParadigmsEng in {
 
 lin 
   Restaurant = cnNonhuman "restaurant" ;