diff --git a/index.html b/index.html
index c7e9ea5..776452f 100644
--- a/index.html
+++ b/index.html
@@ -61,7 +61,7 @@
                             aria-haspopup="true"
                             aria-expanded="false"
                             data-i18n="[title]keyboard.generic-shortcut"
-                            data-i18n-options="{ 'action': '$t(navbar.export-tooltip)', 'key': 'X' }"
+                            data-i18n-options='{ "action": "$t(navbar.export-tooltip)", "key": "X" }'
                             title="Export route"
                         >
                             <span class="fa fa-lg fa-cloud-download" aria-hidden="true"> </span>
@@ -121,7 +121,7 @@
                     <div
                         class="nav-item"
                         data-i18n="[title]keyboard.generic-shortcut"
-                        data-i18n-options="{ 'action': '$t(about.tooltip)', 'key': 'H' }"
+                        data-i18n-options='{ "action": "$t(about.tooltip)", "key": "H" }'
                         title="Show more information about BRouter-Web"
                     >
                         <a class="nav-link" href="#" data-toggle="modal" data-target="#about"
@@ -824,11 +824,11 @@
                             href="#tab_layers_control"
                             role="tab"
                             data-i18n="[title]sidebar.tab-tooltip"
-                            data-i18n-options="{
-                                'action': '$t(sidebar.layers.tooltip)',
-                                'toggleKey': 'T',
-                                'switchKey': '$t(keyboard.shift)+T'
-                            }"
+                            data-i18n-options='{
+                                "action": "$t(sidebar.layers.tooltip)",
+                                "toggleKey": "T",
+                                "switchKey": "$t(keyboard.shift)+T"
+                            }'
                             title="Select layers"
                         >
                             <!--
@@ -858,11 +858,11 @@
                             href="#tab_itinerary"
                             role="tab"
                             data-i18n="[title]sidebar.tab-tooltip"
-                            data-i18n-options="{
-                                'action': '$t(sidebar.itinerary.tooltip)',
-                                'toggleKey': 'T',
-                                'switchKey': '$t(keyboard.shift)+T'
-                            }"
+                            data-i18n-options='{
+                                "action": "$t(sidebar.itinerary.tooltip)",
+                                "toggleKey": "T",
+                                "switchKey": "$t(keyboard.shift)+T"
+                            }'
                             title="Show Itinerary"
                             ><i class="fa fa-map-signs"></i
                         ></a>
@@ -872,11 +872,11 @@
                             href="#tab_profile"
                             role="tab"
                             data-i18n="[title]sidebar.tab-tooltip"
-                            data-i18n-options="{
-                                'action': '$t(sidebar.customize-profile.tooltip)',
-                                'toggleKey': 'T',
-                                'switchKey': '$t(keyboard.shift)+T'
-                            }"
+                            data-i18n-options='{
+                                "action": "$t(sidebar.customize-profile.tooltip)",
+                                "toggleKey": "T",
+                                "switchKey": "$t(keyboard.shift)+T"
+                            }'
                             title="Customize profile"
                             ><i class="fa fa-wrench"></i
                         ></a>
@@ -886,11 +886,11 @@
                             href="#tab_data"
                             role="tab"
                             data-i18n="[title]sidebar.tab-tooltip"
-                            data-i18n-options="{
-                                'action': '$t(sidebar.data.tooltip)',
-                                'toggleKey': 'T',
-                                'switchKey': '$t(keyboard.shift)+T'
-                            }"
+                            data-i18n-options='{
+                                "action": "$t(sidebar.data.tooltip)",
+                                "toggleKey": "T",
+                                "switchKey": "$t(keyboard.shift)+T"
+                            }'
                             title="Show detailed route data table"
                             ><i class="fa fa-table"></i
                         ></a>
@@ -900,11 +900,11 @@
                             href="#tab_analysis"
                             role="tab"
                             data-i18n="[title]sidebar.tab-tooltip"
-                            data-i18n-options="{
-                                'action': '$t(sidebar.analysis.tooltip)',
-                                'toggleKey': 'T',
-                                'switchKey': '$t(keyboard.shift)+T'
-                            }"
+                            data-i18n-options='{
+                                "action": "$t(sidebar.analysis.tooltip)",
+                                "toggleKey": "T",
+                                "switchKey": "$t(keyboard.shift)+T"
+                            }'
                             title="Analyse route"
                             ><i class="fa fa-pie-chart"></i
                         ></a>
@@ -1220,7 +1220,7 @@
                 aria-expanded="false"
                 aria-label="Toggle elevation chart"
                 data-i18n="[title]keyboard.generic-shortcut"
-                data-i18n-options="{ 'action': '$t(footer.elevation-chart)', 'key': 'E' }"
+                data-i18n-options='{ "action": "$t(footer.elevation-chart)", "key": "E" }'
                 title="Toggle elevation chart"
             >
                 <span class="fa fa-area-chart"></span>
diff --git a/js/WhatsNew.js b/js/WhatsNew.js
index fba931c..afb2959 100644
--- a/js/WhatsNew.js
+++ b/js/WhatsNew.js
@@ -4,7 +4,9 @@ BR.WhatsNew = {
         self.dismissableMessage = new BR.Message('whats_new_message', {
             onClosed: function () {
                 document.getElementsByClassName('version')[0].classList.remove('version-new');
-                localStorage.setItem('changelogVersion', self.getLatestVersion());
+                if (BR.Util.localStorageAvailable()) {
+                    localStorage.setItem('changelogVersion', self.getLatestVersion());
+                }
                 // next time popup is open, by default we will see everything
                 self.prepare(false);
             },
@@ -12,7 +14,7 @@ BR.WhatsNew = {
         $('#whatsnew').on('shown.bs.modal', function () {
             self.dismissableMessage.hide();
         });
-        if (!self.getCurrentVersion()) {
+        if (!self.getCurrentVersion() && BR.Util.localStorageAvailable()) {
             localStorage.setItem('changelogVersion', self.getLatestVersion());
         }
         self.prepare(self.hasNewVersions());
@@ -28,12 +30,12 @@ BR.WhatsNew = {
     },
 
     getCurrentVersion: function () {
+        if (!BR.Util.localStorageAvailable()) return null;
+
         return localStorage.getItem('changelogVersion');
     },
 
     hasNewVersions: function () {
-        if (!BR.Util.localStorageAvailable()) return false;
-
         return this.getCurrentVersion() && this.getCurrentVersion() < this.getLatestVersion();
     },