Index: sources/view/settings/VSettings.cpp
===================================================================
diff -u -red3945bdd13d73f5cb1aec03fafa1697be5f1b66 -ra55e0de27d8c427dd4d441f47bb22ca2fe0ca462
--- sources/view/settings/VSettings.cpp	(.../VSettings.cpp)	(revision ed3945bdd13d73f5cb1aec03fafa1697be5f1b66)
+++ sources/view/settings/VSettings.cpp	(.../VSettings.cpp)	(revision a55e0de27d8c427dd4d441f47bb22ca2fe0ca462)
@@ -109,24 +109,29 @@
             QStringList  keys ;
             QVariantList values ;
             QString title = "";
-            for (const QString &key : _Settings.keys(category, group)) {
-                if (Storage::Settings::isKeyTitle       ( key ) ) {
-                    title = _Settings.value(category, group, key).toString();
-                } else {
-                    const QString imagePath = QStringLiteral("%1%2").arg(_location)
-                                                  .arg(_Settings.value(category, group, key).toString());
-                    QFileInfo fileInfo(imagePath);
-                    values.append(fileInfo.exists() && fileInfo.isFile() ? "file:" + imagePath : "");
-                    keys.append(key);
-                }
-            }
 
             if ( Storage::Settings::isCategoryInstructions( category ) ) {
+                for (const QString &key : _Settings.keys(category, group)) {
+                    if (Storage::Settings::isKeyTitle       ( key ) ) {
+                        title = _Settings.value(category, group, key).toString();
+                    } else {
+                        const QString imagePath = QStringLiteral("%1%2").arg(_location)
+                                                      .arg(_Settings.value(category, group, key).toString());
+                        QFileInfo fileInfo(imagePath);
+                        values.append(fileInfo.exists() && fileInfo.isFile() ? "file:" + imagePath : "");
+                        keys.append(key);
+                    }
+                }
+
                 TKeysList keysList = updateReplacements(group, keys                     );
                                      updateInstructions(group, keysList, values, title  );
                                      updateInstructions(group                           );
             }
             else { //TODO: Since it is global system settings, move this to the settings controller so the C++ backend can also use it. like Date/Time formats.
+                for (const QString &key : _Settings.keys(category, group)) {
+                    keys.append(key);
+                }
+
                 for (const auto &key : qAsConst(keys)) {
                     // DEBUG: qDebug() << " ~~~~~~~~~~ " << category << group << key << _Settings.value(category, group, key).toString  ();
                     QVariantMap           keyValue;