diff --git a/sources/dataBase/ui/summaryquerywidget.cpp b/sources/dataBase/ui/summaryquerywidget.cpp
index 282b4c3ba..7f84fa804 100644
--- a/sources/dataBase/ui/summaryquerywidget.cpp
+++ b/sources/dataBase/ui/summaryquerywidget.cpp
@@ -17,7 +17,6 @@
 */
 #include "summaryquerywidget.h"
 #include "ui_summaryquerywidget.h"
-
 #include "qetapp.h"
 
 #include <QListWidgetItem>
@@ -31,10 +30,12 @@ SummaryQueryWidget::SummaryQueryWidget(QWidget *parent) :
 	ui(new Ui::SummaryQueryWidget)
 {
     ui->setupUi(this);
-	ui->m_config_gb->setDisabled(true);
 
 	setUpItems();
 	fillSavedQuery();
+
+	connect(ui->m_config_gb, &ConfigSaveLoaderWidget::saveClicked, this, &SummaryQueryWidget::saveConfig);
+	connect(ui->m_config_gb, &ConfigSaveLoaderWidget::loadClicked, this, &SummaryQueryWidget::loadConfig);
 }
 
 /**
@@ -133,10 +134,20 @@ void SummaryQueryWidget::setUpItems()
 
 /**
  * @brief SummaryQueryWidget::fillSavedQuery
+ * Fill the combo box of the saved query
  */
 void SummaryQueryWidget::fillSavedQuery()
 {
+	QFile file(QETApp::configDir() + "/summary.json");
+	if (file.open(QFile::ReadOnly))
+	{
+		QJsonDocument jsd(QJsonDocument::fromJson(file.readAll()));
+		QJsonObject jso = jsd.object();
 
+		for (auto it = jso.begin() ; it != jso.end() ; ++it) {
+			ui->m_config_gb->addItem(it.key());
+		}
+	}
 }
 
 /**
@@ -273,3 +284,62 @@ void SummaryQueryWidget::reset()
 	}
 	ui->m_user_query_le->clear();
 }
+
+/**
+ * @brief SummaryQueryWidget::saveConfig
+ */
+void SummaryQueryWidget::saveConfig()
+{
+	QFile file_(QETApp::configDir() + "/summary.json");
+
+	if (file_.open(QFile::ReadWrite))
+	{
+		QJsonDocument doc_(QJsonDocument::fromJson(file_.readAll()));
+		QJsonObject root_object;
+
+		if (!doc_.isEmpty())
+		{
+			root_object = doc_.object();
+			if (root_object.contains(ui->m_config_gb->text())) {
+				root_object.remove(ui->m_config_gb->text());
+			}
+		}
+
+		QJsonObject object_;
+		object_.insert("query", queryStr());
+		root_object[ui->m_config_gb->text()] = object_;
+
+		doc_.setObject(root_object);
+		file_.resize(0);
+		file_.write(doc_.toJson());
+	}
+}
+
+/**
+ * @brief SummaryQueryWidget::loadConfig
+ */
+void SummaryQueryWidget::loadConfig()
+{
+	auto name = ui->m_config_gb->selectedText();
+	if (name.isEmpty()) {
+		return;
+	}
+
+	QFile file_(QETApp::configDir() + "/summary.json");
+	if (!file_.open(QFile::ReadOnly)) {
+		return;
+	}
+
+	QJsonDocument doc_(QJsonDocument::fromJson(file_.readAll()));
+	QJsonObject object_ = doc_.object();
+
+	auto value = object_.value(name);
+	if (!value.isObject()) {
+		return;
+	}
+
+	auto value_object = value.toObject();
+	if (value_object.value("query").isString()) {
+		setQuery(value_object.value("query").toString());
+	}
+}
diff --git a/sources/dataBase/ui/summaryquerywidget.h b/sources/dataBase/ui/summaryquerywidget.h
index 6333b85d2..96430b9b9 100644
--- a/sources/dataBase/ui/summaryquerywidget.h
+++ b/sources/dataBase/ui/summaryquerywidget.h
@@ -53,6 +53,8 @@ class SummaryQueryWidget : public QWidget
 		void on_m_down_pb_clicked();
 		void on_m_edit_sql_query_cb_clicked();
 		void reset();
+		void saveConfig();
+		void loadConfig();
 
 	private:
 		Ui::SummaryQueryWidget *ui;
diff --git a/sources/dataBase/ui/summaryquerywidget.ui b/sources/dataBase/ui/summaryquerywidget.ui
index b2ec8d29d..d6eb50e10 100644
--- a/sources/dataBase/ui/summaryquerywidget.ui
+++ b/sources/dataBase/ui/summaryquerywidget.ui
@@ -17,6 +17,18 @@
    <item>
     <widget class="QWidget" name="m_info_widget" native="true">
      <layout class="QGridLayout" name="gridLayout_2">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
       <item row="1" column="2">
        <widget class="QListWidget" name="m_choosen_list"/>
       </item>
diff --git a/sources/factory/ui/addtabledialog.cpp b/sources/factory/ui/addtabledialog.cpp
index 517382360..a9f1e64f1 100644
--- a/sources/factory/ui/addtabledialog.cpp
+++ b/sources/factory/ui/addtabledialog.cpp
@@ -43,7 +43,6 @@ AddTableDialog::AddTableDialog(QWidget *content_widget, QWidget *parent) :
 	
 	connect(ui->m_config_gb, &ConfigSaveLoaderWidget::saveClicked, this, &AddTableDialog::saveConfig);
 	connect(ui->m_config_gb, &ConfigSaveLoaderWidget::loadClicked, this, &AddTableDialog::loadConfig);
-	
 }
 
 /**