diff --git a/Trigger/TrigConfiguration/TrigConfIO/src/TrigDBJobOptionsLoader.cxx b/Trigger/TrigConfiguration/TrigConfIO/src/TrigDBJobOptionsLoader.cxx
index 38cef2c7cbd4332dd35fcb38842a1051a475eae1..d922546e23b4bc771e792a42e0c760b8338ed310 100644
--- a/Trigger/TrigConfiguration/TrigConfIO/src/TrigDBJobOptionsLoader.cxx
+++ b/Trigger/TrigConfiguration/TrigConfIO/src/TrigDBJobOptionsLoader.cxx
@@ -18,42 +18,42 @@ namespace {
    getQueryDefinitions() {
       std::vector<TrigConf::QueryDefinition> queries;
 
-      { // query for table dev2
+      { // query for table dev1
          queries.emplace_back();
          auto & q = queries.back();
          // tables
          q.addToTableList ( "SUPER_MASTER_TABLE", "SMT" );
-         q.addToTableList ( "JO_MASTER_TABLE", "JOMT" );
+         q.addToTableList ( "HLT_JOBOPTIONS", "HJO" );
          // bind vars
          q.extendBinding<int>("smk");
          // conditions
          q.extendCondition("SMT.SMT_ID = :smk");
-         q.extendCondition(" AND SMT.SMT_JO_MASTER_TABLE_ID = JOMT.JO_ID");
+         q.extendCondition("AND HJO.HJO_ID=SMT.SMT_HLT_JOBOPTIONS_ID");
          // attributes
          q.extendOutput<std::string>( "SMT.SMT_NAME" );
-         q.extendOutput<int>        ( "SMT.SMT_JO_MASTER_TABLE_ID" );
-         q.extendOutput<coral::Blob>( "JOMT.JO_CONTENT" );
+         q.extendOutput<int>        ( "SMT.SMT_HLT_JOBOPTIONS_ID" );
+         q.extendOutput<coral::Blob>( "HJO.HJO_DATA" );
          // the field with the data
-         q.setDataName("JOMT.JO_CONTENT");
+         q.setDataName("HJO.HJO_DATA");
       }
 
-      { // query for table dev1
+      { // query for table dev2
          queries.emplace_back();
          auto & q = queries.back();
          // tables
          q.addToTableList ( "SUPER_MASTER_TABLE", "SMT" );
-         q.addToTableList ( "HLT_JOBOPTIONS", "JO" );
+         q.addToTableList ( "JO_MASTER_TABLE", "JOMT" );
          // bind vars
          q.extendBinding<int>("smk");
          // conditions
          q.extendCondition("SMT.SMT_ID = :smk");
-         q.extendCondition("AND JO.HJO_ID=SMT.SMT_HLT_JOBOPTIONS_ID");
+         q.extendCondition(" AND SMT.SMT_JO_MASTER_TABLE_ID = JOMT.JO_ID");
          // attributes
          q.extendOutput<std::string>( "SMT.SMT_NAME" );
-         q.extendOutput<int>        ( "SMT.SMT_HLT_JOBOPTIONS_ID" );
-         q.extendOutput<coral::Blob>( "JO.HJO_DATA" );
+         q.extendOutput<int>        ( "SMT.SMT_JO_MASTER_TABLE_ID" );
+         q.extendOutput<coral::Blob>( "JOMT.JO_CONTENT" );
          // the field with the data
-         q.setDataName("JO.HJO_DATA");
+         q.setDataName("JOMT.JO_CONTENT");
       }
       return queries;
    }
@@ -84,6 +84,11 @@ TrigConf::TrigDBJobOptionsLoader::loadJobOptions ( unsigned int smk,
          break;
       }
       catch(coral::QueryException & ex) {
+         TRG_MSG_INFO("Trying next query after coral::QueryException caught ( " << ex.what() <<" )" );
+         continue;
+      }
+      catch(std::exception & ex) {
+         TRG_MSG_INFO("Trying next query after std::exception caught ( " << ex.what() <<" )" );
          continue;
       }
    }
diff --git a/Trigger/TrigConfiguration/TrigConfIO/src/TrigDBMenuLoader.cxx b/Trigger/TrigConfiguration/TrigConfIO/src/TrigDBMenuLoader.cxx
index 9c47a4310109343dab639af1a87117b96931c855..e73569ab3aaced2717fa12b20d61286660c9aa6d 100644
--- a/Trigger/TrigConfiguration/TrigConfIO/src/TrigDBMenuLoader.cxx
+++ b/Trigger/TrigConfiguration/TrigConfIO/src/TrigDBMenuLoader.cxx
@@ -16,43 +16,43 @@ namespace {
    getL1QueryDefinitions() {
       std::vector<TrigConf::QueryDefinition> queries;
 
-      { // query for table dev2
+      { // query for table dev1
          queries.emplace_back();
          auto & q = queries.back();
          // tables
          q.addToTableList ( "SUPER_MASTER_TABLE", "SMT" );
-         q.addToTableList ( "L1_MASTER_TABLE", "L1MT" );
+         q.addToTableList ( "L1_MENU", "L1TM" );
          // bind vars
          q.extendBinding<int>("smk");
          // conditions
          q.extendCondition("SMT.SMT_ID = :smk");
-         q.extendCondition(" AND SMT.SMT_L1_MASTER_TABLE_ID = L1MT.L1MT_ID");
+         q.extendCondition(" AND SMT.SMT_L1_MENU_ID = L1TM.L1TM_ID");
          // attributes
          q.extendOutput<std::string>( "SMT.SMT_NAME" );
-         q.extendOutput<int>        ( "SMT.SMT_L1_MASTER_TABLE_ID" );
-         q.extendOutput<coral::Blob>( "L1MT.L1MT_MENU" );
+         q.extendOutput<int>        ( "SMT.SMT_VERSION" );
+         q.extendOutput<int>        ( "SMT.SMT_L1_MENU_ID" );
+         q.extendOutput<coral::Blob>( "L1TM.L1TM_DATA" );
          // the field with the data
-         q.setDataName("L1MT.L1MT_MENU");
+         q.setDataName("L1TM.L1TM_DATA");
       }
 
-      { // query for table dev1
+      { // query for table dev2
          queries.emplace_back();
          auto & q = queries.back();
          // tables
          q.addToTableList ( "SUPER_MASTER_TABLE", "SMT" );
-         q.addToTableList ( "L1_MENU", "L1MT" );
+         q.addToTableList ( "L1_MASTER_TABLE", "L1MT" );
          // bind vars
          q.extendBinding<int>("smk");
          // conditions
          q.extendCondition("SMT.SMT_ID = :smk");
-         q.extendCondition(" AND SMT.SMT_L1_MENU_ID = L1MT.L1TM_ID");
+         q.extendCondition(" AND SMT.SMT_L1_MASTER_TABLE_ID = L1MT.L1MT_ID");
          // attributes
          q.extendOutput<std::string>( "SMT.SMT_NAME" );
-         q.extendOutput<int>        ( "SMT.SMT_VERSION" );
-         q.extendOutput<int>        ( "SMT.SMT_L1_MENU_ID" );
-         q.extendOutput<coral::Blob>( "L1MT.L1TM_DATA" );
-         // the field with the data         
-         q.setDataName("L1MT.L1TM_DATA");
+         q.extendOutput<int>        ( "SMT.SMT_L1_MASTER_TABLE_ID" );
+         q.extendOutput<coral::Blob>( "L1MT.L1MT_MENU" );
+         // the field with the data
+         q.setDataName("L1MT.L1MT_MENU");
       }
       return queries;
    }
@@ -61,43 +61,43 @@ namespace {
    getHLTQueryDefinitions() {
       std::vector<TrigConf::QueryDefinition> queries;
 
-      { // query for table dev2
+      { // query for table dev1
          queries.emplace_back();
          auto & q = queries.back();
          // tables
          q.addToTableList ( "SUPER_MASTER_TABLE", "SMT" );
-         q.addToTableList ( "HLT_MASTER_TABLE", "HMT" );
+         q.addToTableList ( "HLT_MENU", "HTM" );
          // bind vars
          q.extendBinding<int>("smk");
          // conditions
          q.extendCondition("SMT.SMT_ID = :smk");
-         q.extendCondition(" AND SMT.SMT_HLT_MASTER_TABLE_ID = HMT.HMT_ID");
+         q.extendCondition(" AND SMT.SMT_HLT_MENU_ID = HTM.HTM_ID");
          // attributes
          q.extendOutput<std::string>( "SMT.SMT_NAME" );
-         q.extendOutput<int>        ( "SMT.SMT_HLT_MASTER_TABLE_ID" );
-         q.extendOutput<coral::Blob>( "HMT.HMT_MENU" );
+         q.extendOutput<int>        ( "SMT.SMT_VERSION" );
+         q.extendOutput<int>        ( "SMT.SMT_HLT_MENU_ID" );
+         q.extendOutput<coral::Blob>( "HTM.HTM_DATA" );
          // the field with the data
-         q.setDataName("HMT.HMT_MENU");
+         q.setDataName("HTM.HTM_DATA");
       }
 
-      { // query for table dev1
+      { // query for table dev2
          queries.emplace_back();
          auto & q = queries.back();
          // tables
          q.addToTableList ( "SUPER_MASTER_TABLE", "SMT" );
-         q.addToTableList ( "HLT_MENU", "HMT" );
+         q.addToTableList ( "HLT_MASTER_TABLE", "HMT" );
          // bind vars
          q.extendBinding<int>("smk");
          // conditions
          q.extendCondition("SMT.SMT_ID = :smk");
-         q.extendCondition(" AND SMT.SMT_HLT_MENU_ID = HMT.HTM_ID");
+         q.extendCondition(" AND SMT.SMT_HLT_MASTER_TABLE_ID = HMT.HMT_ID");
          // attributes
          q.extendOutput<std::string>( "SMT.SMT_NAME" );
-         q.extendOutput<int>        ( "SMT.SMT_VERSION" );
-         q.extendOutput<int>        ( "SMT.SMT_HLT_MENU_ID" );
-         q.extendOutput<coral::Blob>( "HMT.HTM_DATA" );
-         // the field with the data         
-         q.setDataName("HMT.HTM_DATA");
+         q.extendOutput<int>        ( "SMT.SMT_HLT_MASTER_TABLE_ID" );
+         q.extendOutput<coral::Blob>( "HMT.HMT_MENU" );
+         // the field with the data
+         q.setDataName("HMT.HMT_MENU");
       }
       return queries;
    }
@@ -130,6 +130,11 @@ TrigConf::TrigDBMenuLoader::loadL1Menu ( unsigned int smk,
          break;
       }
       catch(coral::QueryException & ex) {
+         TRG_MSG_INFO("Trying next query after coral::QueryException caught ( " << ex.what() <<" )" );
+         continue;
+      }
+      catch(std::exception & ex) {
+         TRG_MSG_INFO("Trying next query after std::exception caught ( " << ex.what() <<" )" );
          continue;
       }
    }
@@ -167,6 +172,11 @@ TrigConf::TrigDBMenuLoader::loadHLTMenu ( unsigned int smk,
          break;
       }
       catch(coral::QueryException & ex) {
+         TRG_MSG_INFO("Trying next query after coral::QueryException caught ( " << ex.what() <<" )" );
+         continue;
+      }
+      catch(std::exception & ex) {
+         TRG_MSG_INFO("Trying next query after std::exception caught ( " << ex.what() <<" )" );
          continue;
       }
    }