diff --git a/src/GF/Shell/Commands.hs b/src/GF/Shell/Commands.hs
index 678d3d7da..345e5cd02 100644
--- a/src/GF/Shell/Commands.hs
+++ b/src/GF/Shell/Commands.hs
@@ -325,7 +325,7 @@ mkRefineMenuAll env sstate =
     _ -> b
   ifShort = ifOpt sizeDisplay "short"
   ifTyped t = ifOpt typeDisplay "typed" t ""
-  prOrLinExp t = prt_ t ---- 
+  prOrLinExp t = err (const $ prt_ t) prOrLinTree $ annotateInState cgr t state
   prOrLinRef t = case t of
     G.Q m f  ->  printname env sstate (m,f) 
     G.QC m f ->  printname env sstate (m,f) 
diff --git a/src/GF/UseGrammar/Custom.hs b/src/GF/UseGrammar/Custom.hs
index 400b358c7..71bbfab58 100644
--- a/src/GF/UseGrammar/Custom.hs
+++ b/src/GF/UseGrammar/Custom.hs
@@ -208,9 +208,8 @@ customTermCommand =
   ,(strCI "generate",   \g t -> let gr = grammar g
                                     cat = actCat $ tree2loc t --- not needed
                                 in
-                                  tree2termlistCommand gr
-                                    (generateTrees gr cat 2
-                                      Nothing . Just) t)
+                         [tr | t <- generateTrees gr cat 2 Nothing (Just t), 
+                               Ok tr <- [annotate gr $ MM.qualifTerm (absId g) t]])
 
   ,(strCI "typecheck",  \g t -> let gr = grammar g in
                                   err (const []) (return . const t)
diff --git a/src/Today.hs b/src/Today.hs
index 34e882dcb..6a2be6191 100644
--- a/src/Today.hs
+++ b/src/Today.hs
@@ -1 +1 @@
-module Today where today = "Sun May  2 11:14:33 CEST 2004"
+module Today where today = "Sun May  2 15:21:39 CEST 2004"