Index: sources/view/settings/VSettings.cpp
===================================================================
diff -u -rc2f474ff07c98aa350c445a2474976a3cf985f40 -rbecdb453874007323459a9afe9fe581b6c158902
--- sources/view/settings/VSettings.cpp	(.../VSettings.cpp)	(revision c2f474ff07c98aa350c445a2474976a3cf985f40)
+++ sources/view/settings/VSettings.cpp	(.../VSettings.cpp)	(revision becdb453874007323459a9afe9fe581b6c158902)
@@ -39,7 +39,6 @@
 
     PROPERTY_POST_CONNECTION(VSettings, servicePass         );
     PROPERTY_POST_CONNECTION(VSettings, alarmVolume         );
-    PROPERTY_POST_CONNECTION(VSettings, roWaterMode         );
     PROPERTY_POST_CONNECTION(VSettings, integratedBPCuff    );
     PROPERTY_POST_CONNECTION(VSettings, heparinSyringePump  );
     PROPERTY_POST_CONNECTION(VSettings, chemicalDisinfection);
@@ -56,14 +55,6 @@
     }
 }
 
-void VSettings::roWaterMode_post(const bool &vroWaterMode_post) {
-    //TODO  The Settings shall be the Singleton SettingsController and modify the MSettings like the others.
-    if ( Storage::Settings::save(roWaterModeGroup(), roWaterModeKey(), QString::number(vroWaterMode_post)) != 0 ) {
-        roWaterMode(false);
-        // FIXME: Notify UI with a message
-    }
-}
-
 void VSettings::advancedMode_post(const bool &vadvancedMode_post) {
     //TODO  The Settings shall be the Singleton SettingsController and modify the MSettings like the others.
     if ( Storage::Settings::save(advancedModeGroup(), advancedModeKey(), QString::number(vadvancedMode_post)) != 0 ) {
@@ -150,12 +141,6 @@
                         keyValue[key]   = mServicePass ;
                         servicePass     ( mServicePass);
                     }
-                    else if ( isroWaterMode (category, group, key) ) {
-                        bool mRoWaterMode;
-                        mRoWaterMode    = _Settings.value(category, group, key).toBool    ();
-                        keyValue[key]   = mRoWaterMode ;
-                        roWaterMode     ( mRoWaterMode);
-                    }
                     else if ( isadvancedMode(category, group, key) ) {
                         bool mAdvancedMode;
                         mAdvancedMode   = _Settings.value(category, group, key).toBool    ();
@@ -207,24 +192,23 @@
     // otherwise will use the default value and will notify the update.
     servicePass ( _servicePass );
     alarmVolume ( _alarmVolume );
-    roWaterMode ( _roWaterMode );
     advancedMode( _advancedMode );
 
-    //DEBUG qDebug() << servicePass() << roWaterMode() << alarmVolume();
     adjustment(true);
 
     initConnectionsSettings();
 }
 
-VSettings::TKeysList VSettings::updateReplacements(const QString &vGroup, const QStringList &vKeys)
+VSettings::TKeysList VSettings::updateReplacements(const QString &vGroup,
+                                                   const QStringList &vKeys)
 {
     TKeysList keysList;
     Q_UNUSED(vGroup); Q_UNUSED(vKeys) // TODO: Qt6 port - remove
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 /* TODO: Qt6 port - QRegularExpression
 #endif
     for ( quint16 keyIndex = 0; keyIndex < vKeys.count(); keyIndex++ ) {
-        QRegExp regx("\\{\\s*\\d+\\s*:\\s*\\d+\\s*:\\s*\\w*\\s*:\\s*\\d*\\s*\\}");
+        QRegExp regx("\\{\\s*\\d+\\s*:\\s*\\d+\\s*:\\s*\\w+\\s*:\\s*\\d+\\s*\\}");
         QString key = vKeys[keyIndex];
         int replacementCount = key.count(regx);
         QStringList keyList;
@@ -236,10 +220,20 @@
             keyList += ""; // value placeholder
             key.remove(0, pos + regx.matchedLength());
             QStringList lst = blk.split(":");
-            quint16 id = lst[0].toUInt();
-            quint16 ix = lst[1].toUInt();
-            QString ex = lst[2]         ;
-            quint16 rd = lst[3].toUInt();
+            if ( lst.size() != 4 )
+                continue;
+
+            bool okId = false;
+            bool okIx = false;
+            bool okRd = false;
+
+            quint16 id = lst[0].trimmed().toUInt(&okId);
+            quint16 ix = lst[1].trimmed().toUInt(&okIx);
+            QString ex = lst[2].trimmed();
+            quint16 rd = lst[3].trimmed().toUInt(&okRd);
+
+            if ( ! okId || ! okIx || ! okRd )
+                continue;
             TLocation loc;
             loc.group    = vGroup       ;
             loc.keyIndex = keyIndex     ;