Index: sources/view/settings/VSettings.cpp
===================================================================
diff -u -r8f6ecb60abf6d47d4554cfd3019ca496d79b6f69 -rb12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd
--- sources/view/settings/VSettings.cpp	(.../VSettings.cpp)	(revision 8f6ecb60abf6d47d4554cfd3019ca496d79b6f69)
+++ sources/view/settings/VSettings.cpp	(.../VSettings.cpp)	(revision b12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd)
@@ -118,29 +118,24 @@
             QStringList  keys ;
             QVariantList values ;
             QString title = "";
-
-            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);
-                    }
+            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 ) ) {
                 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;