Index: sources/view/settings/VSettings.h
===================================================================
diff -u -r0dfba44fb7172b9458d161b3ed5f54527f93b698 -ra55e0de27d8c427dd4d441f47bb22ca2fe0ca462
--- sources/view/settings/VSettings.h	(.../VSettings.h)	(revision 0dfba44fb7172b9458d161b3ed5f54527f93b698)
+++ sources/view/settings/VSettings.h	(.../VSettings.h)	(revision a55e0de27d8c427dd4d441f47bb22ca2fe0ca462)
@@ -58,7 +58,7 @@
 
     // TODO: This view needs modification and it needs to isolate the settings and have its own specific properties, not the complete settings exposed to QML and let QML access it.
     // Don't use QVariantHash, qml doesn't like it and won't show the values, *** and not even complains/errors ***.
-    CONSTANT(QString        , groupFormat   , "%1^%2"   )
+
     PROPERTY(bool           , initialized   , false     )
     PROPERTY(QStringList    , categorys     , {}        )
     PROPERTY(QVariantMap    , instructions  , {}        )
@@ -71,7 +71,7 @@
     SETTINGS(bool           , integratedBPCuff      , false , Storage::Settings_Category_SettingsSystem , "Feature Configurations"  , "IntegratedBPCuff"                )
     SETTINGS(bool           , heparinSyringePump    , false , Storage::Settings_Category_SettingsSystem , "Feature Configurations"  , "HeparinSyringePump"              )
     SETTINGS(bool           , chemicalDisinfection  , false , Storage::Settings_Category_SettingsSystem , "Feature Configurations"  , "ChemicalDisinfection"            )
-    SETTINGS(bool           , advancedMode  , false , Storage::Settings_Category_SettingsSystem , "AdvancedMode", "AdvancedMode"                    )
+    SETTINGS(bool           , advancedMode          , false , Storage::Settings_Category_SettingsSystem , "AdvancedMode"            , "AdvancedMode"                    )
 
     TRIGGER (bool           , encryptionPass, false )
 
@@ -100,6 +100,10 @@
     void    updateServicePassword   (const QString &vPassword);
     void    checkServicePasswordSet ();
 
+    QString groupFormat (const QString &vFirst, const QString &vSecond = QString()) { return QString("%1%2").arg(_advancedMode ? "@" : "")
+                                                                                                            .arg(vSecond.isEmpty() ?    QString("%1").arg(vFirst) :
+                                                                                                                                        QString("%1^%2").arg(vFirst, vSecond)); }
+
 private slots:
     void onActionReceive (GuiActionType vAction, const QVariantList &vData);