--- a/src/common/beaglequeuecache.cpp
+++ b/src/common/beaglequeuecache.cpp
@@ -1,5 +1,23 @@
+/* Copyright (C) 2011 J.F.Dockes
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the
+ *   Free Software Foundation, Inc.,
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
 #include "autoconfig.h"
 
+#include "cstr.h"
 #include "beaglequeuecache.h"
 #include "circache.h"
 #include "debuglog.h"
@@ -42,18 +60,18 @@
     ConfSimple cf(dict, 1);
     
     if (htt)
-        cf.get(Rcl::Doc::keybght, *htt, "");
+        cf.get(Rcl::Doc::keybght, *htt, cstr_null);
 
     // Build a doc from saved metadata 
-    cf.get("url", dotdoc.url, "");
-    cf.get("mimetype", dotdoc.mimetype, "");
-    cf.get("fmtime", dotdoc.fmtime, "");
-    cf.get("fbytes", dotdoc.fbytes, "");
-    dotdoc.sig = "";
-    list<string> names = cf.getNames("");
+    cf.get(cstr_url, dotdoc.url, cstr_null);
+    cf.get(cstr_mimetype, dotdoc.mimetype, cstr_null);
+    cf.get(cstr_fmtime, dotdoc.fmtime, cstr_null);
+    cf.get(cstr_fbytes, dotdoc.fbytes, cstr_null);
+    dotdoc.sig.clear();
+    list<string> names = cf.getNames(cstr_null);
     for (list<string>::const_iterator it = names.begin();
          it != names.end(); it++) {
-        cf.get(*it, dotdoc.meta[*it], "");
+        cf.get(*it, dotdoc.meta[*it], cstr_null);
     }
     dotdoc.meta[Rcl::Doc::keyudi] = udi;
     return true;