diff --git a/gui/include/TemplatesConfigDlg.h b/gui/include/TemplatesConfigDlg.h
index 1491c94..592951d 100644
--- a/gui/include/TemplatesConfigDlg.h
+++ b/gui/include/TemplatesConfigDlg.h
@@ -151,7 +151,7 @@ private slots:
     QComboBox *m_cmbFltColumn;
     QLineEdit *m_edtFltPattern;
     SearchParamControl *m_fltSearchCtrl;
-    QCheckBox *m_chkApplyonLoad;
+    QCheckBox *m_chkApplyOnLoad;
     // Dialog buttons
     QPushButton *m_btnApply;
     QPushButton *m_btnSave;
diff --git a/gui/src/MainWindow.cpp b/gui/src/MainWindow.cpp
index 0f349e0..4d739a8 100644
--- a/gui/src/MainWindow.cpp
+++ b/gui/src/MainWindow.cpp
@@ -46,6 +46,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 
     m_tabViews = new QTabWidget(this);
     m_tabViews->setTabsClosable(true);
+    m_tabViews->setMovable(true);
     setCentralWidget(m_tabViews);
 
     m_updateTimer = new QTimer(this);
diff --git a/gui/src/TemplatesConfigDlg.cpp b/gui/src/TemplatesConfigDlg.cpp
index 060843c..ce7b948 100644
--- a/gui/src/TemplatesConfigDlg.cpp
+++ b/gui/src/TemplatesConfigDlg.cpp
@@ -823,7 +823,7 @@ void TemplatesConfigDlg::setCurrentFilter(int index)
         m_cmbFltColumn->setEnabled(enable);
         m_edtFltPattern->setEnabled(enable);
         m_fltSearchCtrl->setEnabled(enable);
-        m_chkApplyonLoad->setEnabled(enable);
+        m_chkApplyOnLoad->setEnabled(enable);
 
         if (!enable)
         {
@@ -844,7 +844,7 @@ void TemplatesConfigDlg::setCurrentFilter(int index)
         const auto &flt = conf->getFilterParams().at(index);
         m_edtFltName->setText(utl::toQStr(flt.name));
         m_fltSearchCtrl->setSearchParam(flt.searchParam);
-        m_chkApplyonLoad->setChecked(flt.applyOnLoad);
+        m_chkApplyOnLoad->setChecked(flt.applyOnLoad);
         enableFltFormFunc(true);
     }
     else
@@ -867,7 +867,7 @@ void TemplatesConfigDlg::updateTemplateFilter()
         auto &flt = conf->getFilterParams().at(fltIdx);
         flt.name = utl::toStr(m_edtFltName->text());
         flt.searchParam = m_fltSearchCtrl->getSearchParam();
-        flt.applyOnLoad = m_chkApplyonLoad->isChecked();
+        flt.applyOnLoad = m_chkApplyOnLoad->isChecked();
 
         auto item = m_lstFilters->item(fltIdx);
         if (item != nullptr)
@@ -1018,7 +1018,7 @@ void TemplatesConfigDlg::createConnections()
         &TemplatesConfigDlg::setCurrentFilter);
     connect(m_edtFltName, &QLineEdit::editingFinished, this, &TemplatesConfigDlg::updateTemplateFilter);
     connect(m_fltSearchCtrl, &SearchParamControl::paramChanged, this, &TemplatesConfigDlg::updateTemplateFilter);
-    connect(m_chkApplyonLoad, &QCheckBox::stateChanged, this, &TemplatesConfigDlg::updateTemplateFilter);
+    connect(m_chkApplyOnLoad, &QCheckBox::stateChanged, this, &TemplatesConfigDlg::updateTemplateFilter);
     connect(m_actAddFilter, &QAction::triggered, this, [this]() { addFilter(); });
     connect(m_actRmFilter, &QAction::triggered, this, &TemplatesConfigDlg::rmFilter);
     connect(m_actMoveFilterUp, &QAction::triggered, this, &TemplatesConfigDlg::moveFilterUp);
@@ -1294,8 +1294,8 @@ void TemplatesConfigDlg::buildLayout()
     m_fltSearchCtrl = new SearchParamControl(m_cmbFltColumn, m_edtFltPattern, m_tabFilters);
     frmFilter->addRow(tr("Options"), m_fltSearchCtrl);
 
-    m_chkApplyonLoad = new QCheckBox(tr("Apply on load"), m_tabFilters);
-    frmFilter->addRow(m_chkApplyonLoad);
+    m_chkApplyOnLoad = new QCheckBox(tr("Apply on load"), m_tabFilters);
+    frmFilter->addRow(m_chkApplyOnLoad);
 
     hFiltersTab->addLayout(frmFilter);
     // Filters edit form -------------------------------------------- (End)