diff --git a/src/kdefrontend/ui/datasources/importfilewidget.ui b/src/kdefrontend/ui/datasources/importfilewidget.ui
index 73c8fb5ab..e6c992dab 100644
--- a/src/kdefrontend/ui/datasources/importfilewidget.ui
+++ b/src/kdefrontend/ui/datasources/importfilewidget.ui
@@ -1,1273 +1,1296 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ImportFileWidget</class>
  <widget class="QWidget" name="ImportFileWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>609</width>
-    <height>939</height>
+    <width>630</width>
+    <height>1272</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_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>
     <widget class="QScrollArea" name="scrollArea">
      <property name="widgetResizable">
       <bool>true</bool>
      </property>
      <widget class="QWidget" name="scrollAreaWidgetContents">
       <property name="geometry">
        <rect>
         <x>0</x>
-        <y>0</y>
-        <width>593</width>
-        <height>1818</height>
+        <y>-349</y>
+        <width>611</width>
+        <height>1885</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <item>
         <widget class="QGroupBox" name="gbDataSource">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="title">
           <string>Data Source</string>
          </property>
          <layout class="QGridLayout" name="gridLayout">
           <item row="10" column="2">
            <widget class="QCheckBox" name="chbID">
             <property name="text">
              <string>Set ID</string>
             </property>
            </widget>
           </item>
           <item row="0" column="2">
            <widget class="QComboBox" name="cbSourceType">
             <item>
              <property name="text">
               <string>File or Named Pipe</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Network TCP Socket</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Network UDP Socket</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Local Socket</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Serial Port</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>MQTT</string>
              </property>
             </item>
            </widget>
           </item>
           <item row="22" column="4">
            <widget class="QPushButton" name="bManageFilters">
             <property name="enabled">
              <bool>false</bool>
             </property>
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="toolTip">
              <string>Manage filters</string>
             </property>
             <property name="text">
              <string/>
             </property>
            </widget>
           </item>
           <item row="1" column="4">
            <widget class="QPushButton" name="bFileInfo">
             <property name="enabled">
              <bool>false</bool>
             </property>
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="toolTip">
              <string>Show file info</string>
             </property>
             <property name="text">
              <string/>
             </property>
            </widget>
           </item>
           <item row="2" column="0">
            <widget class="QLabel" name="lHost">
             <property name="text">
              <string>Host:</string>
             </property>
            </widget>
           </item>
           <item row="0" column="0" colspan="2">
            <widget class="QLabel" name="lSourceType">
             <property name="text">
              <string>Source:</string>
             </property>
            </widget>
           </item>
           <item row="13" column="0">
            <widget class="QLabel" name="lUsername">
             <property name="text">
              <string>Username:</string>
             </property>
            </widget>
           </item>
           <item row="14" column="0">
            <widget class="QLabel" name="lPassword">
             <property name="text">
              <string>Password:</string>
             </property>
            </widget>
           </item>
           <item row="21" column="0">
            <widget class="QLabel" name="lFileType">
             <property name="text">
              <string>Type:</string>
             </property>
            </widget>
           </item>
           <item row="21" column="2">
            <widget class="KComboBox" name="cbFileType">
             <property name="enabled">
              <bool>false</bool>
             </property>
            </widget>
           </item>
           <item row="4" column="0">
            <widget class="QLabel" name="lSerialPort">
             <property name="text">
              <string>Port:</string>
             </property>
            </widget>
           </item>
           <item row="15" column="2">
            <widget class="QCheckBox" name="chbRetain">
             <property name="text">
              <string>Interpret retain messages</string>
             </property>
            </widget>
           </item>
           <item row="6" column="0">
            <spacer name="verticalSpacer_2">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeType">
              <enum>QSizePolicy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>10</height>
              </size>
             </property>
            </spacer>
           </item>
           <item row="11" column="0">
            <widget class="QLabel" name="lMqttID">
             <property name="text">
              <string>ID:</string>
             </property>
            </widget>
           </item>
-          <item row="20" column="0">
-           <spacer name="verticalSpacer_3">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>13</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
           <item row="5" column="2">
            <widget class="QComboBox" name="cbBaudRate"/>
           </item>
           <item row="4" column="2">
            <widget class="QComboBox" name="cbSerialPort"/>
           </item>
           <item row="22" column="0">
            <widget class="QLabel" name="lFilter">
             <property name="text">
              <string>Filter:</string>
             </property>
            </widget>
           </item>
           <item row="13" column="2">
            <widget class="QLineEdit" name="leUsername"/>
           </item>
           <item row="2" column="2">
            <widget class="QLineEdit" name="leHost"/>
           </item>
           <item row="23" column="0">
            <spacer name="verticalSpacer_4">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>40</height>
              </size>
             </property>
            </spacer>
           </item>
           <item row="2" column="3">
            <widget class="QPushButton" name="bConnect">
             <property name="text">
              <string>Connect</string>
             </property>
            </widget>
           </item>
           <item row="1" column="2">
            <widget class="QLineEdit" name="leFileName">
             <property name="toolTip">
              <string>Specify the name of the file to import.</string>
             </property>
             <property name="clearButtonEnabled">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item row="1" column="0" colspan="2">
            <widget class="QLabel" name="lFileName">
             <property name="text">
              <string>Name:</string>
             </property>
            </widget>
           </item>
           <item row="11" column="2">
            <widget class="QLineEdit" name="leID"/>
           </item>
           <item row="5" column="0" colspan="2">
            <widget class="QLabel" name="lBaudRate">
             <property name="text">
              <string>Baud rate:</string>
             </property>
            </widget>
           </item>
           <item row="1" column="3">
            <widget class="QPushButton" name="bOpen">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="toolTip">
              <string> Select the file to import</string>
             </property>
             <property name="text">
              <string/>
             </property>
            </widget>
           </item>
           <item row="3" column="0">
            <widget class="QLabel" name="lPort">
             <property name="text">
              <string>Port:</string>
             </property>
            </widget>
           </item>
           <item row="22" column="3">
            <widget class="QPushButton" name="bSaveFilter">
             <property name="enabled">
              <bool>false</bool>
             </property>
             <property name="toolTip">
              <string>Save the current filter settings</string>
             </property>
            </widget>
           </item>
           <item row="22" column="2">
            <widget class="KComboBox" name="cbFilter">
             <property name="enabled">
              <bool>false</bool>
             </property>
             <property name="sizePolicy">
              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
            </widget>
           </item>
           <item row="3" column="2">
            <widget class="QLineEdit" name="lePort"/>
           </item>
           <item row="14" column="2">
            <widget class="QLineEdit" name="lePassword">
             <property name="echoMode">
              <enum>QLineEdit::Password</enum>
             </property>
            </widget>
           </item>
           <item row="12" column="2">
            <widget class="QCheckBox" name="chbAuthentication">
             <property name="text">
              <string>The MQTT broker requires authentication</string>
             </property>
            </widget>
           </item>
           <item row="24" column="0">
            <widget class="QLabel" name="lField">
             <property name="text">
              <string>Field:</string>
             </property>
            </widget>
           </item>
           <item row="24" column="2">
            <widget class="QTreeView" name="tvJson">
             <property name="editTriggers">
              <set>QAbstractItemView::NoEditTriggers</set>
             </property>
             <property name="showDropIndicator" stdset="0">
              <bool>false</bool>
             </property>
             <property name="iconSize">
              <size>
               <width>16</width>
               <height>16</height>
              </size>
             </property>
            </widget>
           </item>
-          <item row="15" column="0" rowspan="4" colspan="5">
-           <widget class="QGroupBox" name="groupBox">
+          <item row="20" column="0" colspan="5">
+           <widget class="QGroupBox" name="gbManageSubscriptions">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="title">
-             <string/>
+             <string>Manage subscriptions</string>
             </property>
-            <layout class="QGridLayout" name="gridLayout_6">
-             <item row="3" column="1" colspan="2">
-              <widget class="QLineEdit" name="leTopics"/>
-             </item>
-             <item row="4" column="0">
+            <layout class="QGridLayout" name="gridLayout_6" columnstretch="2,2,1,2,2">
+             <item row="2" column="0">
               <widget class="QLabel" name="lQos">
                <property name="text">
                 <string>QOS level:</string>
                </property>
+               <property name="alignment">
+                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+               </property>
               </widget>
              </item>
-             <item row="4" column="1" colspan="2">
+             <item row="2" column="1">
               <widget class="QComboBox" name="cbQos">
                <item>
                 <property name="text">
                  <string>0</string>
                 </property>
                </item>
                <item>
                 <property name="text">
                  <string>1</string>
                 </property>
                </item>
                <item>
                 <property name="text">
                  <string>2</string>
                 </property>
                </item>
               </widget>
              </item>
-             <item row="3" column="0">
-              <widget class="QLabel" name="lTopicSearch">
-               <property name="text">
-                <string>Scroll to root:</string>
-               </property>
-              </widget>
+             <item row="1" column="1">
+              <widget class="QLineEdit" name="leTopics"/>
              </item>
-             <item row="0" column="0" rowspan="3">
+             <item row="0" column="0" colspan="2">
               <widget class="QTreeWidget" name="twTopics">
                <column>
                 <property name="text">
                  <string>Available topics</string>
                 </property>
                </column>
               </widget>
              </item>
-             <item row="0" column="2" rowspan="3">
+             <item row="0" column="2">
+              <layout class="QVBoxLayout" name="verticalLayout_5" stretch="0,1,1,0">
+               <property name="spacing">
+                <number>12</number>
+               </property>
+               <item>
+                <spacer name="verticalSpacer_5">
+                 <property name="orientation">
+                  <enum>Qt::Vertical</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>20</width>
+                   <height>40</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+               <item>
+                <widget class="QPushButton" name="bSubscribe">
+                 <property name="text">
+                  <string>Subscribe</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QPushButton" name="bUnsubscribe">
+                 <property name="text">
+                  <string>Unsubscribe</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <spacer name="verticalSpacer_3">
+                 <property name="orientation">
+                  <enum>Qt::Vertical</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>20</width>
+                   <height>40</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+              </layout>
+             </item>
+             <item row="1" column="0">
+              <widget class="QLabel" name="lTopicSearch">
+               <property name="text">
+                <string>Scroll to root:</string>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="3" colspan="2">
               <widget class="QTreeWidget" name="twSubscriptions">
                <column>
                 <property name="text">
                  <string>Subscribed topics</string>
                 </property>
                </column>
               </widget>
              </item>
-             <item row="2" column="1">
-              <widget class="QPushButton" name="bUnsubscribe">
-               <property name="text">
-                <string>Unsubscribe</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <widget class="QPushButton" name="bSubscribe">
-               <property name="text">
-                <string>Subscribe</string>
-               </property>
-              </widget>
-             </item>
             </layout>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="gbOptions">
          <property name="enabled">
           <bool>false</bool>
          </property>
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="title">
           <string>Format Options</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_3">
           <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>
            <widget class="QTabWidget" name="tabWidget">
             <property name="currentIndex">
              <number>0</number>
             </property>
             <widget class="QWidget" name="tabDataFormat">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <attribute name="title">
               <string>Data format</string>
              </attribute>
              <layout class="QVBoxLayout" name="verticalLayout">
               <item>
                <widget class="QStackedWidget" name="swOptions">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                   <horstretch>0</horstretch>
                   <verstretch>0</verstretch>
                  </sizepolicy>
                 </property>
                 <widget class="QWidget" name="page">
                  <property name="sizePolicy">
                   <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                    <horstretch>0</horstretch>
                    <verstretch>0</verstretch>
                   </sizepolicy>
                  </property>
                 </widget>
                 <widget class="QWidget" name="page_2">
                  <property name="sizePolicy">
                   <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                    <horstretch>0</horstretch>
                    <verstretch>0</verstretch>
                   </sizepolicy>
                  </property>
                 </widget>
                </widget>
               </item>
              </layout>
             </widget>
             <widget class="QWidget" name="tabDataPreview">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <attribute name="title">
               <string>Preview</string>
              </attribute>
              <layout class="QGridLayout" name="gridLayout_3">
               <item row="0" column="0">
                <widget class="QLabel" name="lPreviewLines">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
                   <horstretch>0</horstretch>
                   <verstretch>0</verstretch>
                  </sizepolicy>
                 </property>
                 <property name="text">
                  <string>Number of rows to preview:</string>
                 </property>
                </widget>
               </item>
               <item row="0" column="1">
                <widget class="QSpinBox" name="sbPreviewLines">
                 <property name="minimum">
                  <number>1</number>
                 </property>
                 <property name="maximum">
                  <number>10000</number>
                 </property>
                 <property name="value">
                  <number>100</number>
                 </property>
                </widget>
               </item>
               <item row="0" column="2">
                <spacer name="horizontalSpacer">
                 <property name="orientation">
                  <enum>Qt::Horizontal</enum>
                 </property>
                 <property name="sizeHint" stdset="0">
                  <size>
                   <width>23</width>
                   <height>20</height>
                  </size>
                 </property>
                </spacer>
               </item>
               <item row="0" column="3">
                <widget class="QPushButton" name="bRefreshPreview">
                 <property name="text">
                  <string>Refresh</string>
                 </property>
                </widget>
               </item>
               <item row="1" column="0" colspan="4">
                <widget class="QTextEdit" name="tePreview">
                 <property name="undoRedoEnabled">
                  <bool>true</bool>
                 </property>
                 <property name="lineWrapMode">
                  <enum>QTextEdit::NoWrap</enum>
                 </property>
                 <property name="readOnly">
                  <bool>true</bool>
                 </property>
                </widget>
               </item>
              </layout>
             </widget>
             <widget class="QWidget" name="tabDataPortion">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <attribute name="title">
               <string>Data portion to read</string>
              </attribute>
              <layout class="QGridLayout" name="gridLayout_2">
               <item row="0" column="0">
                <widget class="QLabel" name="lStartRow">
                 <property name="text">
                  <string>Start row:</string>
                 </property>
                </widget>
               </item>
               <item row="0" column="4">
                <widget class="QSpinBox" name="sbEndRow">
                 <property name="toolTip">
                  <string>Specify the end row to import; -1 stands for the last row</string>
                 </property>
                 <property name="minimum">
                  <number>-1</number>
                 </property>
                 <property name="maximum">
                  <number>2147483647</number>
                 </property>
                 <property name="value">
                  <number>-1</number>
                 </property>
                </widget>
               </item>
               <item row="1" column="0">
                <widget class="QLabel" name="lStartColumn">
                 <property name="text">
                  <string>Start column:</string>
                 </property>
                </widget>
               </item>
               <item row="1" column="1">
                <widget class="QSpinBox" name="sbStartColumn">
                 <property name="toolTip">
                  <string>Specify the start column for import</string>
                 </property>
                 <property name="minimum">
                  <number>1</number>
                 </property>
                 <property name="maximum">
                  <number>2147483647</number>
                 </property>
                </widget>
               </item>
               <item row="1" column="2">
                <spacer name="horizontalSpacer_5">
                 <property name="orientation">
                  <enum>Qt::Horizontal</enum>
                 </property>
                 <property name="sizeType">
                  <enum>QSizePolicy::Fixed</enum>
                 </property>
                 <property name="sizeHint" stdset="0">
                  <size>
                   <width>40</width>
                   <height>20</height>
                  </size>
                 </property>
                </spacer>
               </item>
               <item row="0" column="1">
                <widget class="QSpinBox" name="sbStartRow">
                 <property name="toolTip">
                  <string>Specify the start row for import</string>
                 </property>
                 <property name="minimum">
                  <number>1</number>
                 </property>
                 <property name="maximum">
                  <number>2147483647</number>
                 </property>
                 <property name="value">
                  <number>1</number>
                 </property>
                </widget>
               </item>
               <item row="0" column="5">
                <spacer name="horizontalSpacer_4">
                 <property name="orientation">
                  <enum>Qt::Horizontal</enum>
                 </property>
                 <property name="sizeHint" stdset="0">
                  <size>
                   <width>108</width>
                   <height>20</height>
                  </size>
                 </property>
                </spacer>
               </item>
               <item row="0" column="2">
                <spacer name="horizontalSpacer_3">
                 <property name="orientation">
                  <enum>Qt::Horizontal</enum>
                 </property>
                 <property name="sizeType">
                  <enum>QSizePolicy::Fixed</enum>
                 </property>
                 <property name="sizeHint" stdset="0">
                  <size>
                   <width>40</width>
                   <height>20</height>
                  </size>
                 </property>
                </spacer>
               </item>
               <item row="1" column="3">
                <widget class="QLabel" name="lEndColumn">
                 <property name="text">
                  <string>End column:</string>
                 </property>
                </widget>
               </item>
               <item row="1" column="4">
                <widget class="QSpinBox" name="sbEndColumn">
                 <property name="toolTip">
                  <string>Specify the end column to import; -1 stands for the last column</string>
                 </property>
                 <property name="minimum">
                  <number>-1</number>
                 </property>
                 <property name="maximum">
                  <number>2147483647</number>
                 </property>
                 <property name="value">
                  <number>-1</number>
                 </property>
                </widget>
               </item>
               <item row="1" column="5">
                <spacer name="horizontalSpacer_6">
                 <property name="orientation">
                  <enum>Qt::Horizontal</enum>
                 </property>
                 <property name="sizeHint" stdset="0">
                  <size>
                   <width>108</width>
                   <height>20</height>
                  </size>
                 </property>
                </spacer>
               </item>
               <item row="0" column="3">
                <widget class="QLabel" name="lEndRow">
                 <property name="text">
                  <string>End row:</string>
                 </property>
                </widget>
               </item>
               <item row="3" column="0">
                <spacer name="verticalSpacer">
                 <property name="orientation">
                  <enum>Qt::Vertical</enum>
                 </property>
                 <property name="sizeHint" stdset="0">
                  <size>
                   <width>20</width>
                   <height>10</height>
                  </size>
                 </property>
                </spacer>
               </item>
              </layout>
             </widget>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="gbUpdateOptions">
          <property name="title">
           <string>Update Options</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_4">
           <item row="8" column="0">
            <widget class="QLabel" name="lKeepLastValues">
             <property name="text">
              <string>Keep last values:</string>
             </property>
            </widget>
           </item>
           <item row="0" column="0">
            <widget class="QLabel" name="lReadingType">
             <property name="text">
              <string>Read:</string>
             </property>
            </widget>
           </item>
           <item row="2" column="1">
            <widget class="QComboBox" name="cbUpdateType">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <item>
              <property name="text">
               <string>Periodically</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>On New Data</string>
              </property>
             </item>
            </widget>
           </item>
           <item row="10" column="0" colspan="2">
            <widget class="QCheckBox" name="chbLinkFile">
             <property name="toolTip">
              <string>If this option is checked, only the link to the file is stored in the project file but not it's content.</string>
             </property>
             <property name="text">
              <string>Link the file</string>
             </property>
             <property name="checked">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item row="2" column="0">
            <widget class="QLabel" name="lUpdateType">
             <property name="text">
              <string>Update:</string>
             </property>
            </widget>
           </item>
           <item row="3" column="0">
            <widget class="QLabel" name="lUpdateInterval">
             <property name="text">
              <string>Update interval:</string>
             </property>
            </widget>
           </item>
           <item row="8" column="1">
            <widget class="QSpinBox" name="sbKeepNValues">
             <property name="specialValueText">
              <string>All</string>
             </property>
             <property name="maximum">
              <number>999999</number>
             </property>
            </widget>
           </item>
           <item row="3" column="1">
            <widget class="QSpinBox" name="sbUpdateInterval">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="suffix">
              <string> ms</string>
             </property>
             <property name="minimum">
              <number>5</number>
             </property>
             <property name="maximum">
              <number>60000</number>
             </property>
             <property name="value">
              <number>1000</number>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="QComboBox" name="cbReadingType">
             <item>
              <property name="text">
               <string>Continuously Fixed</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>From End</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Till the End</string>
              </property>
             </item>
            </widget>
           </item>
           <item row="1" column="0">
            <widget class="QLabel" name="lSampleSize">
             <property name="text">
              <string>Sample rate:</string>
             </property>
            </widget>
           </item>
           <item row="1" column="1">
            <widget class="QSpinBox" name="sbSampleSize">
             <property name="minimum">
              <number>1</number>
             </property>
             <property name="maximum">
              <number>10000</number>
             </property>
             <property name="value">
              <number>1</number>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="gbMqttWill">
          <property name="title">
           <string>MQTT Will Message</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_5">
           <item row="9" column="0">
            <widget class="QLabel" name="lWillTopic">
             <property name="text">
              <string>Will topic:</string>
             </property>
            </widget>
           </item>
           <item row="6" column="1">
            <widget class="QListWidget" name="lwWillStatistics">
             <item>
              <property name="text">
               <string>Minimum</string>
              </property>
              <property name="checkState">
               <enum>Unchecked</enum>
              </property>
              <property name="flags">
               <set>ItemIsUserCheckable|ItemIsEnabled</set>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Maximum</string>
              </property>
              <property name="checkState">
               <enum>Unchecked</enum>
              </property>
              <property name="flags">
               <set>ItemIsUserCheckable|ItemIsEnabled</set>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Arithmetic mean</string>
              </property>
              <property name="checkState">
               <enum>Unchecked</enum>
              </property>
              <property name="flags">
               <set>ItemIsUserCheckable|ItemIsEnabled</set>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Geometric mean</string>
              </property>
              <property name="checkState">
               <enum>Unchecked</enum>
              </property>
              <property name="flags">
               <set>ItemIsUserCheckable|ItemIsEnabled</set>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Harmonic mean</string>
              </property>
              <property name="checkState">
               <enum>Unchecked</enum>
              </property>
              <property name="flags">
               <set>ItemIsUserCheckable|ItemIsEnabled</set>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Contraharmonic mean</string>
              </property>
              <property name="checkState">
               <enum>Unchecked</enum>
              </property>
              <property name="flags">
               <set>ItemIsUserCheckable|ItemIsEnabled</set>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Median</string>
              </property>
              <property name="checkState">
               <enum>Unchecked</enum>
              </property>
              <property name="flags">
               <set>ItemIsUserCheckable|ItemIsEnabled</set>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Variance</string>
              </property>
              <property name="checkState">
               <enum>Unchecked</enum>
              </property>
              <property name="flags">
               <set>ItemIsUserCheckable|ItemIsEnabled</set>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Standard deviation</string>
              </property>
              <property name="checkState">
               <enum>Unchecked</enum>
              </property>
              <property name="flags">
               <set>ItemIsUserCheckable|ItemIsEnabled</set>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Mean deviation</string>
              </property>
              <property name="checkState">
               <enum>Unchecked</enum>
              </property>
              <property name="flags">
               <set>ItemIsUserCheckable|ItemIsEnabled</set>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Mean deviation around median</string>
              </property>
              <property name="checkState">
               <enum>Unchecked</enum>
              </property>
              <property name="flags">
               <set>ItemIsUserCheckable|ItemIsEnabled</set>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Median deviation</string>
              </property>
              <property name="checkState">
               <enum>Unchecked</enum>
              </property>
              <property name="flags">
               <set>ItemIsUserCheckable|ItemIsEnabled</set>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Skewness</string>
              </property>
              <property name="checkState">
               <enum>Unchecked</enum>
              </property>
              <property name="flags">
               <set>ItemIsUserCheckable|ItemIsEnabled</set>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Kurtosis</string>
              </property>
              <property name="checkState">
               <enum>Unchecked</enum>
              </property>
              <property name="flags">
               <set>ItemIsUserCheckable|ItemIsEnabled</set>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Entropy</string>
              </property>
              <property name="checkState">
               <enum>Unchecked</enum>
              </property>
              <property name="flags">
               <set>ItemIsUserCheckable|ItemIsEnabled</set>
              </property>
             </item>
            </widget>
           </item>
           <item row="5" column="0">
            <widget class="QLabel" name="lWillOwnMessage">
             <property name="text">
              <string>Own message:</string>
             </property>
            </widget>
           </item>
           <item row="13" column="1">
            <widget class="QComboBox" name="cbWillUpdate">
             <item>
              <property name="text">
               <string>Time interval</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>On click</string>
              </property>
             </item>
            </widget>
           </item>
           <item row="2" column="1">
            <widget class="QComboBox" name="cbWillMessageType">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <item>
              <property name="text">
               <string>Own message</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Statistics</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>Last message received</string>
              </property>
             </item>
            </widget>
           </item>
           <item row="11" column="1">
            <widget class="QComboBox" name="cbWillQoS">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <item>
              <property name="text">
               <string>0</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>1</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>2</string>
              </property>
             </item>
            </widget>
           </item>
           <item row="12" column="0" colspan="2">
            <widget class="QCheckBox" name="chbWillRetain">
             <property name="text">
              <string>Set will message as retain</string>
             </property>
            </widget>
           </item>
           <item row="15" column="1">
            <widget class="QLineEdit" name="leWillUpdateInterval">
             <property name="text">
              <string>10000</string>
             </property>
            </widget>
           </item>
           <item row="15" column="0">
            <widget class="QLabel" name="lWillUpdateInterval">
             <property name="text">
              <string>Time interval:</string>
             </property>
            </widget>
           </item>
           <item row="11" column="0">
            <widget class="QLabel" name="lWillQos">
             <property name="text">
              <string>Will QoS:</string>
             </property>
            </widget>
           </item>
           <item row="13" column="0">
            <widget class="QLabel" name="lWillUpdate">
             <property name="text">
              <string>Will Update Type:</string>
             </property>
            </widget>
           </item>
           <item row="2" column="0">
            <widget class="QLabel" name="lWillMessageType">
             <property name="text">
              <string>Message type:</string>
             </property>
            </widget>
           </item>
           <item row="6" column="0">
            <widget class="QLabel" name="lWillStatistics">
             <property name="text">
              <string>Will Statistics:</string>
             </property>
            </widget>
           </item>
           <item row="5" column="1">
            <widget class="QLineEdit" name="leWillOwnMessage"/>
           </item>
           <item row="9" column="1">
            <widget class="QComboBox" name="cbWillTopic">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
            </widget>
           </item>
           <item row="0" column="0" colspan="2">
            <widget class="QCheckBox" name="chbWill">
             <property name="text">
              <string>Set will message for the client</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/tests/import_export/ASCII/MqttTest/MQTT_test.pro b/tests/import_export/ASCII/MqttTest/MQTT_test.pro
index 12996cb74..c06e95fc6 100644
--- a/tests/import_export/ASCII/MqttTest/MQTT_test.pro
+++ b/tests/import_export/ASCII/MqttTest/MQTT_test.pro
@@ -1,23 +1,18 @@
 QT       += core gui network widgets mqtt
 
-TARGET = mqttsubscriptions
-
 # The following define makes your compiler emit warnings if you use
 # any feature of Qt which as been marked as deprecated (the exact warnings
 # depend on your compiler). Please consult the documentation of the
 # deprecated API in order to know how to port your code away from it.
 DEFINES += QT_DEPRECATED_WARNINGS
 
 # You can also make your code fail to compile if you use deprecated APIs.
 # In order to do so, uncomment the following line.
 # You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
 SOURCES += main.cpp\
         MQTT_test.cpp
 
 HEADERS  += MQTT_test.h 
 FORMS    += MQTT_test.ui 
-
-target.path = $$[QT_INSTALL_EXAMPLES]/mqtt/subscriptions
-INSTALLS += target