diff --git a/app/init.php b/app/init.php
index 0e1848b2c3..107188514e 100644
--- a/app/init.php
+++ b/app/init.php
@@ -426,7 +426,7 @@ Structure::addFormat(APP_DATABASE_ATTRIBUTE_FLOAT_RANGE, function ($attribute) {
  * Registry
  */
 $register->set('logger', function () {
- // Register error logger
+    // Register error logger
     $providerName = App::getEnv('_APP_LOGGING_PROVIDER', '');
     $providerConfig = App::getEnv('_APP_LOGGING_CONFIG', '');
 
diff --git a/app/views/console/database/collection.phtml b/app/views/console/database/collection.phtml
index 48662ead17..ee8b1a5d07 100644
--- a/app/views/console/database/collection.phtml
+++ b/app/views/console/database/collection.phtml
@@ -567,7 +567,16 @@ $logs = $this->getParam('logs', null);
                     </div>
 
                     <ul class="margin-bottom-large text-fade text-size-small">
-                        <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-json" class="link text-size-small">View as JSON</button></li>
+                        <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> 
+                            <button data-ls-ui-trigger="open-json" 
+                                class="link text-size-small" 
+                                data-analytics
+                                data-analytics-event="click"
+                                data-analytics-category="console"
+                                data-analytics-label="View as JSON (Collection)">
+                                View as JSON
+                            </button>
+                        </li>
                         <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> Last Updated: <span data-ls-bind="{{project-collection.dateUpdated|dateText}}"></span></li>
                         <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> Created: <span data-ls-bind="{{project-collection.dateCreated|dateText}}"></span></li>
                     </ul>
diff --git a/app/views/console/database/document.phtml b/app/views/console/database/document.phtml
index a48d533830..3b9fad6dba 100644
--- a/app/views/console/database/document.phtml
+++ b/app/views/console/database/document.phtml
@@ -346,7 +346,16 @@ $logs = $this->getParam('logs', null);
                             </div>
 
                             <ul class="margin-bottom-large text-fade text-size-small" data-ls-if="({{project-document.$id}})">
-                                <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-json" class="link text-size-small">View as JSON</button></li>
+                                <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> 
+                                    <button data-ls-ui-trigger="open-json"
+                                        class="link text-size-small"
+                                        data-analytics
+                                        data-analytics-event="click"
+                                        data-analytics-category="console"
+                                        data-analytics-label="View as JSON (Document)">
+                                        View as JSON
+                                    </button>
+                                </li>
                             </ul>
 
                             <div data-ls-if="({{project-document.$id}})">
diff --git a/app/views/console/functions/function.phtml b/app/views/console/functions/function.phtml
index 17bb873ee5..48f2fc4e92 100644
--- a/app/views/console/functions/function.phtml
+++ b/app/views/console/functions/function.phtml
@@ -245,7 +245,16 @@ sort($patterns);
                         </div>
 
                         <ul class="margin-bottom-large text-fade text-size-small">
-                            <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-json" class="link text-size-small">View as JSON</button></li>
+                            <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> 
+                                <button data-ls-ui-trigger="open-json" 
+                                    class="link text-size-small"
+                                    data-analytics
+                                    data-analytics-event="click"
+                                    data-analytics-category="console"
+                                    data-analytics-label="View as JSON (Function)">
+                                    View as JSON
+                                </button>
+                            </li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> Last Updated: <span data-ls-bind="{{project-function.dateUpdated|dateText}}"></span></li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> Created: <span data-ls-bind="{{project-function.dateCreated|dateText}}"></span></li>
                         </ul>
@@ -595,7 +604,16 @@ sort($patterns);
                         </div>
 
                         <ul class="margin-bottom-large text-fade text-size-small">
-                            <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-json" class="link text-size-small">View as JSON</button></li>
+                            <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i>
+                                <button data-ls-ui-trigger="open-json" 
+                                    class="link text-size-small"
+                                    data-analytics
+                                    data-analytics-event="click"
+                                    data-analytics-category="console"
+                                    data-analytics-label="View as JSON (Function)">
+                                    View as JSON
+                                </button>
+                            </li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> Last Updated: <span data-ls-bind="{{project-function.dateUpdated|dateText}}"></span></li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> Created: <span data-ls-bind="{{project-function.dateCreated|dateText}}"></span></li>
                         </ul>
diff --git a/app/views/console/storage/bucket.phtml b/app/views/console/storage/bucket.phtml
index 3200ad72c5..39abcd97ce 100644
--- a/app/views/console/storage/bucket.phtml
+++ b/app/views/console/storage/bucket.phtml
@@ -471,7 +471,16 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                         </div>
 
                         <ul class="margin-bottom-large text-fade text-size-small">
-                            <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-json" class="link text-size-small">View as JSON</button></li>
+                            <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> 
+                                <button data-ls-ui-trigger="open-json" 
+                                    class="link text-size-small"
+                                    data-analytics
+                                    data-analytics-event="click"
+                                    data-analytics-category="console"
+                                    data-analytics-label="View as JSON (Bucket)">
+                                    View as JSON
+                                </button>
+                            </li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> Last Updated: <span data-ls-bind="{{project-bucket.dateUpdated|dateText}}"></span></li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> Created: <span data-ls-bind="{{project-bucket.dateCreated|dateText}}"></span></li>
                         </ul>
diff --git a/app/views/console/users/index.phtml b/app/views/console/users/index.phtml
index 777c3a5cc5..f6a9993a31 100644
--- a/app/views/console/users/index.phtml
+++ b/app/views/console/users/index.phtml
@@ -453,7 +453,7 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                                     data-analytics-activity
                                     data-analytics-event="submit"
                                     data-analytics-category="console"
-                                    data-analytics-label="Update Project OAuth2"
+                                    data-analytics-label="Update Project OAuth2 (<?php echo $this->escape($name); ?>)"
                                     data-service="projects.updateOAuth2"
                                     data-scope="console"
                                     data-event="submit"
diff --git a/app/views/console/users/team.phtml b/app/views/console/users/team.phtml
index 1fbe5d622d..d4c14295f3 100644
--- a/app/views/console/users/team.phtml
+++ b/app/views/console/users/team.phtml
@@ -206,7 +206,16 @@
                         </div>
 
                         <ul class="margin-bottom-large text-fade text-size-small">
-                            <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-json" class="link text-size-small">View as JSON</button></li>
+                            <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i>
+                                <button data-ls-ui-trigger="open-json" 
+                                    class="link text-size-small"
+                                    data-analytics
+                                    data-analytics-event="click"
+                                    data-analytics-category="console"
+                                    data-analytics-label="View as JSON (Team)">
+                                    View as JSON
+                                    </button>
+                                </li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> Created: <span data-ls-bind="{{team.dateCreated|dateText}}"></span></li>
                         </ul>
 
diff --git a/app/views/console/users/user.phtml b/app/views/console/users/user.phtml
index 9db057b226..304b3576a7 100644
--- a/app/views/console/users/user.phtml
+++ b/app/views/console/users/user.phtml
@@ -239,7 +239,16 @@
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-update-name" class="link text-size-small">Update name</button></li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-update-email" class="link text-size-small">Update Email</button></li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-update-password" class="link text-size-small">Update Password</button></li>
-                            <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-json" class="link text-size-small">View as JSON</button></li>
+                            <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i>
+                                <button data-ls-ui-trigger="open-json" 
+                                    class="link text-size-small"
+                                    data-analytics
+                                    data-analytics-event="click"
+                                    data-analytics-category="console"
+                                    data-analytics-label="View as JSON (User)">
+                                    View as JSON
+                                </button>
+                            </li>
                         </ul>
 
                         <div data-ls-if="{{user.emailVerification}} === false" style="display: none">
diff --git a/composer.lock b/composer.lock
index bde110f878..4e32ff04f5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -300,16 +300,16 @@
         },
         {
             "name": "colinmollenhour/credis",
-            "version": "v1.13.0",
+            "version": "v1.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/colinmollenhour/credis.git",
-                "reference": "afec8e58ec93d2291c127fa19709a048f28641e5"
+                "reference": "85df015088e00daf8ce395189de22c8eb45c8d49"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/colinmollenhour/credis/zipball/afec8e58ec93d2291c127fa19709a048f28641e5",
-                "reference": "afec8e58ec93d2291c127fa19709a048f28641e5",
+                "url": "https://api.github.com/repos/colinmollenhour/credis/zipball/85df015088e00daf8ce395189de22c8eb45c8d49",
+                "reference": "85df015088e00daf8ce395189de22c8eb45c8d49",
                 "shasum": ""
             },
             "require": {
@@ -341,9 +341,9 @@
             "homepage": "https://github.com/colinmollenhour/credis",
             "support": {
                 "issues": "https://github.com/colinmollenhour/credis/issues",
-                "source": "https://github.com/colinmollenhour/credis/tree/v1.13.0"
+                "source": "https://github.com/colinmollenhour/credis/tree/v1.13.1"
             },
-            "time": "2022-04-07T14:57:22+00:00"
+            "time": "2022-06-20T22:56:59+00:00"
         },
         {
             "name": "composer/package-versions-deprecated",