Index: /trunk/FACT++/src/Configuration.cc
===================================================================
--- /trunk/FACT++/src/Configuration.cc	(revision 11593)
+++ /trunk/FACT++/src/Configuration.cc	(revision 11594)
@@ -438,8 +438,8 @@
     }*/
 
-    // Retrieve a subset of the sample stock table set up by resetdb
-    // and display it.
-    // FIXME: What about a prefix?
-    const mysqlpp::StoreQueryResult res = conn.query("select `Key`, Value from Configuration").store();
+    const mysqlpp::StoreQueryResult res =
+        conn.query("SELECT fProgram, CONCAT(fKey1,fKey2), fValue "
+                   "FROM ProgramOption WHERE fCounter="
+                   "(SELECT MAX(fCounter) FROM History)").store();
     /* throws exceptions
     if (!res)