diff --git a/index.html b/index.html
index a1f45f443..98bfba5fd 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
     <script src="interface_config.js?v=5"></script>
-    <script src="libs/app.bundle.js?v=24"></script>
+    <script src="libs/app.bundle.js?v=25"></script>
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
     <link rel="stylesheet" href="css/font.css?v=6"/>
     <link rel="stylesheet" href="css/toastr.css?v=1">
diff --git a/libs/app.bundle.js b/libs/app.bundle.js
index a1970201d..d679a1c16 100644
--- a/libs/app.bundle.js
+++ b/libs/app.bundle.js
@@ -5680,7 +5680,7 @@ var messageHandler = (function(my) {
             displayNameSpan + '<br>' +
             '<span class=' + cls + ' data-i18n="' + messageKey + '"' +
                 (messageArguments?
-                    " i18n-options='" + JSON.stringify(messageArguments) + "'"
+                    " data-i18n-options='" + JSON.stringify(messageArguments) + "'"
                     : "") + ">" +
             APP.translation.translateString(messageKey,
                 messageArguments) +
@@ -11630,7 +11630,6 @@ var defaultOptions = {
     detectLngQS: "lang",
     useCookie: false,
     fallbackLng: DEFAULT_LANG,
-    shortcutFunction: 'defaultValue',
     load: "unspecific",
     resGetPath: 'lang/__ns__-__lng__.json',
     ns: {
@@ -11641,6 +11640,7 @@ var defaultOptions = {
     fallbackOnNull: true,
     fallbackOnEmpty: true,
     useDataAttrOptions: true,
+    defaultValueFromContent: false,
     app: interfaceConfig.APP_NAME,
     getAsync: false,
     customLoad: function(lng, ns, options, done) {
diff --git a/modules/UI/util/MessageHandler.js b/modules/UI/util/MessageHandler.js
index f66c55cb2..e7037a25d 100644
--- a/modules/UI/util/MessageHandler.js
+++ b/modules/UI/util/MessageHandler.js
@@ -188,7 +188,7 @@ var messageHandler = (function(my) {
             displayNameSpan + '<br>' +
             '<span class=' + cls + ' data-i18n="' + messageKey + '"' +
                 (messageArguments?
-                    " i18n-options='" + JSON.stringify(messageArguments) + "'"
+                    " data-i18n-options='" + JSON.stringify(messageArguments) + "'"
                     : "") + ">" +
             APP.translation.translateString(messageKey,
                 messageArguments) +
diff --git a/modules/translation/translation.js b/modules/translation/translation.js
index 575ba5377..3e46e455d 100644
--- a/modules/translation/translation.js
+++ b/modules/translation/translation.js
@@ -13,7 +13,6 @@ var defaultOptions = {
     detectLngQS: "lang",
     useCookie: false,
     fallbackLng: DEFAULT_LANG,
-    shortcutFunction: 'defaultValue',
     load: "unspecific",
     resGetPath: 'lang/__ns__-__lng__.json',
     ns: {
@@ -24,6 +23,7 @@ var defaultOptions = {
     fallbackOnNull: true,
     fallbackOnEmpty: true,
     useDataAttrOptions: true,
+    defaultValueFromContent: false,
     app: interfaceConfig.APP_NAME,
     getAsync: false,
     customLoad: function(lng, ns, options, done) {