diff --git a/asterixdb/asterix-app/src/main/resources/webui/querytemplate.html b/asterixdb/asterix-app/src/main/resources/webui/querytemplate.html
index 1157c27..31448ee 100644
--- a/asterixdb/asterix-app/src/main/resources/webui/querytemplate.html
+++ b/asterixdb/asterix-app/src/main/resources/webui/querytemplate.html
@@ -181,7 +181,14 @@
                       if (results[iter1].length < 1) {
                         continue;
                       }
-                      var resultJSON = $.parseJSON(results[iter1]);
+                      var str_obj = results[iter1].replace(/:\s*(\d+)([\s,])/g, ': "#bigint#$1#bigint#"$2');
+                      resultJSON = JSON.parse(str_obj, (key, value) => {
+                          if (/^#bigint#\d+#bigint#/g.test(value)) {
+                            value = value.substring(8, value.length - 8);
+                            return BigInt(value);
+                          }
+                          return value;
+                        });
                       $(this).append($('<div/>').attr("id", "json-record"+idx+"-"+iter1));
                       $('#json-record'+idx+"-"+iter1).jsonViewer(resultJSON, {collapsed: true, level: 10});
                     }
diff --git a/asterixdb/asterix-app/src/main/resources/webui/static/js/jquery.json-viewer.js b/asterixdb/asterix-app/src/main/resources/webui/static/js/jquery.json-viewer.js
index 5e8a79e..f31b555 100644
--- a/asterixdb/asterix-app/src/main/resources/webui/static/js/jquery.json-viewer.js
+++ b/asterixdb/asterix-app/src/main/resources/webui/static/js/jquery.json-viewer.js
@@ -56,10 +56,7 @@
       else
         html += '<span class="json-string">"' + json + '"</span>';
     }
-    else if (typeof json === 'number') {
-      html += '<span class="json-literal">' + json + '</span>';
-    }
-    else if (typeof json === 'boolean') {
+    else if (typeof json === 'number' || typeof json === 'boolean' || typeof json === 'bigint') {
       html += '<span class="json-literal">' + json + '</span>';
     }
     else if (json === null) {
@@ -111,6 +108,8 @@
       else {
         html += '{}';
       }
+    } else {
+        html += '<span class="json-literal">' + json + '</span>';
     }
     return html;
   }