diff --git a/qep/service/src/main/resources/reference.conf b/qep/service/src/main/resources/reference.conf
index 13818430c..62a7591fe 100644
--- a/qep/service/src/main/resources/reference.conf
+++ b/qep/service/src/main/resources/reference.conf
@@ -1,34 +1,34 @@
 shrine {
   queryEntryPoint {
     create = true
     audit {
       collectQepAudit = true
       database {
         dataSourceFrom = "JNDI" //Can be JNDI or testDataSource . Use testDataSource for tests, JNDI everywhere else
         jndiDataSourceName = "java:comp/env/jdbc/qepAuditDB" //or leave out for tests
         slickProfileClassName = "slick.driver.MySQLDriver$" // Can be
         //        slick.driver.H2Driver$
         //        slick.driver.MySQLDriver$
         //        slick.driver.PostgresDriver$
         //        slick.driver.SQLServerDriver$
         //        slick.driver.JdbcDriver$
         //        freeslick.OracleProfile$
         //        freeslick.MSSQLServerProfile$
         //
         //        (Yes, with the $ on the end)
 
         // For testing without JNDI
         //      testDataSource {
 
         //typical test settings for unit tests
         //driverClassName = "org.h2.Driver"
 
         //url = "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1" //H2 embedded in-memory for unit tests
         //url = "jdbc:h2:~/stewardTest.h2" //H2 embedded on disk at ~/test
         //      }
-        timeout = 100 //time to wait before db gives up, in seconds.
+        timeout = 30 //time to wait before db gives up, in seconds.
         createTablesOnStart = false //for testing with H2 in memory, when not running unit tests. Set to false normally
       }
     }
   }
 }
\ No newline at end of file
diff --git a/qep/service/src/main/sql/oracle.ddl b/qep/service/src/main/sql/oracle.ddl
index 8f056a327..4140b7d72 100644
--- a/qep/service/src/main/sql/oracle.ddl
+++ b/qep/service/src/main/sql/oracle.ddl
@@ -1,6 +1,6 @@
 create table "queriesSent" ("shrineNodeId" VARCHAR2(256) NOT NULL,"userName" VARCHAR2(256) NOT NULL,"networkQueryId" NUMBER NOT NULL,"queryName" VARCHAR2(256) NOT NULL,"queryTopicId" VARCHAR2(256),"queryTopicName" VARCHAR2(256),"timeQuerySent" NUMBER NOT NULL);
-create table "previousQueries" ("networkId" NUMBER(19) NOT NULL,"userName" VARCHAR(256) NOT NULL,"domain" VARCHAR(256) NOT NULL,"queryName" VARCHAR(256) NOT NULL,"expression" CLOB NOT NULL,"dateCreated" NUMBER(19) NOT NULL,"deleted" CHAR NOT NULL check ("deleted" in ('1', '0')),"queryXml" VARCHAR(256) NOT NULL,"changeDate" NUMBER(19) NOT NULL);
-create table "queryFlags" ("networkId" NUMBER(19) NOT NULL,"flagged" CHAR NOT NULL check ("flagged" in ('1', '0')),"flagMessage" CLOB NOT NULL,"changeDate" NUMBER(19) NOT NULL);
+create table "previousQueries" ("networkId" NUMBER(19) NOT NULL,"userName" VARCHAR(256) NOT NULL,"domain" VARCHAR(256) NOT NULL,"queryName" VARCHAR(256) NOT NULL,"expression" CLOB NOT NULL,"dateCreated" NUMBER(19) NOT NULL,"deleted" CHAR NOT NULL check ("deleted" in ('1', '0')),"queryXml" CLOB NOT NULL,"changeDate" NUMBER(19) NOT NULL);
+create table "queryFlags" ("networkId" NUMBER(19) NOT NULL,"flagged" CHAR NOT NULL check ("flagged" in ('1', '0')),"flagMessage" CLOB,"changeDate" NUMBER(19) NOT NULL);
 create table "queryResults" ("resultId" NUMBER(19) NOT NULL,"networkQueryId" NUMBER(19) NOT NULL,"instanceId" NUMBER(19) NOT NULL,"adapterNode" VARCHAR(256) NOT NULL,"resultType" VARCHAR(256) NOT NULL,"size" NUMBER(19) NOT NULL,"startDate" NUMBER(19),"endDate" NUMBER(19),"status" VARCHAR(256) NOT NULL,"statusMessage" VARCHAR(256),"changeDate" NUMBER(19) NOT NULL);
 create table "queryBreakdownResults" ("networkQueryId" NUMBER(19) NOT NULL,"adapterNode" VARCHAR(256) NOT NULL,"resultId" NUMBER(19) NOT NULL,"resultType" VARCHAR(256) NOT NULL,"dataKey" VARCHAR(256) NOT NULL,"value" NUMBER(19) NOT NULL,"changeDate" NUMBER(19) NOT NULL);
 create table "queryResultProblemDigests" ("networkQueryId" NUMBER(19) NOT NULL,"adapterNode" VARCHAR(256) NOT NULL,"codec" VARCHAR(256) NOT NULL,"stamp" VARCHAR(256) NOT NULL,"summary" CLOB NOT NULL,"description" CLOB NOT NULL,"details" CLOB NOT NULL,"changeDate" NUMBER(19) NOT NULL);
\ No newline at end of file