diff --git a/website/app/__init__.py b/website/app/__init__.py
index 9af0b8d1..ffa5b8cb 100644
--- a/website/app/__init__.py
+++ b/website/app/__init__.py
@@ -2,6 +2,7 @@
 from flask_sqlalchemy import SQLAlchemy
 from flask_wtf import CSRFProtect
 from flask_migrate import Migrate
+from flask_session import Session
 
 from config import config as Config
 import os
@@ -10,6 +11,7 @@
 db = SQLAlchemy()
 csrf = CSRFProtect()
 migrate = Migrate()
+sess = Session()
 
 def create_app():
     app = Flask(__name__)
@@ -22,6 +24,8 @@ def create_app():
     db.init_app(app)
     csrf.init_app(app)
     migrate.init_app(app, db, render_as_batch=True)
+    app.config["SESSION_SQLALCHEMY"] = db
+    sess.init_app(app)
 
     from .home import home_blueprint
     app.register_blueprint(home_blueprint, url_prefix="/")
diff --git a/website/app/templates/query.html b/website/app/templates/query.html
index d1f04b78..ff1d8bcb 100644
--- a/website/app/templates/query.html
+++ b/website/app/templates/query.html
@@ -49,49 +49,96 @@ <h4>Modules:</h4>
     <br/>
 
     <!-- Results Part -->
-    <hr>      
-    <div class="row" v-if="Object.keys(modules_res).length">
-        <div class="col-10">
-            <h3 id="results_part">Results</h3>
-            <div class="accordion">
-                <div class="accordion-item" v-for="result, key in modules_res">
-                    <template v-if="!('error' in result)">
-                        <h2 class="accordion-header">
-                            <button class="accordion-button" type="button" data-bs-toggle="collapse" :data-bs-target="'#panelsStayOpen-'+key" aria-expanded="true" :aria-controls="'panelsStayOpen-'+key">
-                                [[key]]
-                            </button>
-                        </h2>
-                        <div :id="'panelsStayOpen-'+key" class="accordion-collapse collapse show">
-                            <div class="accordion-body" v-html="generateCoreFormatUI(result)[0].outerHTML"></div>
-                        </div>
-                    </template>
+    <hr>
+    <ul class="nav nav-tabs" style="margin-bottom: 10px;">
+        <li class="nav-item">
+            <button class="nav-link active" id="tab-json" aria-current="page" @click="active_tab(true)">Json</button>
+        </li>
+        <li class="nav-item">
+            <button class="nav-link" id="tab-parser" @click="active_tab(false)">Parser</button>
+        </li>
+    </ul>
+
+    <template v-if="json_tab">
+        <div class="row" v-if="Object.keys(modules_res).length">
+            <div class="col-10">
+                <h3 id="results_part">Results</h3>
+                <div class="accordion">
+                    <div class="accordion-item" v-for="result, key in modules_res">
+                        <template v-if="!('error' in result)">
+                            <h2 class="accordion-header">
+                                <button class="accordion-button" type="button" data-bs-toggle="collapse" :data-bs-target="'#panelsStayOpen-'+key" aria-expanded="true" :aria-controls="'panelsStayOpen-'+key">
+                                    [[key]]
+                                </button>
+                            </h2>
+                            <div :id="'panelsStayOpen-'+key" class="accordion-collapse collapse show">
+                                <div class="accordion-body" v-html="generateCoreFormatUI(result)[0].outerHTML"></div>
+                            </div>
+                        </template>
+                    </div>
                 </div>
+
+                <!-- Errors Part -->
+                <hr style="margin-top: 50px">
+                <h3 id="errors_part">Errors</h3>
+                <div class="accordion">
+                    <div class="accordion-item" v-for="result, key in modules_res">
+                        <template v-if="'error' in result">
+                            <h2 class="accordion-header">
+                                <button class="accordion-button" type="button" data-bs-toggle="collapse" :data-bs-target="'#panelsStayOpen-'+key" aria-expanded="true" :aria-controls="'panelsStayOpen-'+key">
+                                    [[key]]
+                                    <span style="margin-left: 5px;" title="Error">❌</span>
+                                </button>
+                            </h2>
+                            <div :id="'panelsStayOpen-'+key" class="accordion-collapse collapse show">
+                                <div class="accordion-body" v-html="generateCoreFormatUI(result)[0].outerHTML"></div>
+                            </div>
+                        </template>
+                    </div>
+                </div>
+            </div>
+            <div class="col-1" style="position: fixed; right: 0px; box-shadow: 0 2px 5px 0 rgb(0 0 0 / 5%), 0 2px 10px 0 rgb(0 0 0 / 5%);">
+                <div style="padding: 10px;"><a style="text-decoration: none;" href="#results_part">Results</a></div>
+                <div style="padding: 10px;"><a style="text-decoration: none;" href="#errors_part">Errors</a></div>
             </div>
+        </div>
+    </template>
 
-            <!-- Errors Part -->
-            <hr style="margin-top: 50px">
-            <h3 id="errors_part">Errors</h3>
+    <template v-else>
+        <div v-if="Object.keys(modules_res).length">
             <div class="accordion">
                 <div class="accordion-item" v-for="result, key in modules_res">
-                    <template v-if="'error' in result">
+                    <template v-if="!('error' in result)">
                         <h2 class="accordion-header">
                             <button class="accordion-button" type="button" data-bs-toggle="collapse" :data-bs-target="'#panelsStayOpen-'+key" aria-expanded="true" :aria-controls="'panelsStayOpen-'+key">
                                 [[key]]
-                                <span style="margin-left: 5px;" title="Error">❌</span>
                             </button>
                         </h2>
                         <div :id="'panelsStayOpen-'+key" class="accordion-collapse collapse show">
-                            <div class="accordion-body" v-html="generateCoreFormatUI(result)[0].outerHTML"></div>
+                            <div class="accordion-body row">
+                                <template v-for="obj, key_obj in result.results.Object">
+                                    <h4>Object #[[key_obj+1]] - <small>[[obj.name]]</small></h4>
+                                    <div class="row" style="margin: 5px; padding: 5px;">
+                                        <div class="col-4 mb-3" style="border: 1px solid #939393; border-radius: 10px;" v-for="attr, key_attr in obj.Attribute">
+                                            <h6>Attributes #[[key_attr+1]]</h6>
+                                            <div>
+                                                Type: [[attr.type]]
+                                            </div>
+                                            <div>
+                                                Value: [[attr.value]]
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <hr>
+                                </template>
+                            </div>
                         </div>
                     </template>
                 </div>
             </div>
         </div>
-        <div class="col-1" style="position: fixed; right: 0px; box-shadow: 0 2px 5px 0 rgb(0 0 0 / 5%), 0 2px 10px 0 rgb(0 0 0 / 5%);">
-            <div style="padding: 10px;"><a style="text-decoration: none;" href="#results_part">Results</a></div>
-            <div style="padding: 10px;"><a style="text-decoration: none;" href="#errors_part">Errors</a></div>
-        </div>
-    </div>
+    </template>
+
     <span id="goTop">[<a href="#top">Go Back Top</a>]</span>
 {% endblock %}
 
@@ -109,6 +156,7 @@ <h2 class="accordion-header">
             const modules_res = ref({})
             const progress = ref(0)
             const status_site = ref()
+            const json_tab = ref(true)
 
 
             function actionQuery(){
@@ -148,18 +196,35 @@ <h2 class="accordion-header">
                 modules_res.value = loc
             }
 
+            function active_tab(is_json){
+                if(is_json){
+                    json_tab.value = true
+                    if ( !document.getElementById("tab-json").classList.contains("active") ){
+                        document.getElementById("tab-json").classList.add("active")
+                        document.getElementById("tab-parser").classList.remove("active")
+                    }
+                }else{
+                    json_tab.value = false
+                    if ( !document.getElementById("tab-parser").classList.contains("active") ){
+                        document.getElementById("tab-parser").classList.add("active")
+                        document.getElementById("tab-json").classList.remove("active")
+                    }
+                }
+            }
+
             onMounted(() => {
                 actionQuery()
             })
 
-
             return {
                 message_list,
                 progress,
                 status_site,
                 is_searching,
                 modules_res,
-                generateCoreFormatUI
+                json_tab,
+                generateCoreFormatUI,
+                active_tab
             }
         }
     }).mount('.container')
diff --git a/website/config.py b/website/config.py
index 864b2de6..9d64b43c 100644
--- a/website/config.py
+++ b/website/config.py
@@ -8,6 +8,8 @@ class Config:
 class DevelopmentConfig(Config):
     DEBUG = True
     SQLALCHEMY_DATABASE_URI = "sqlite:///misp-module.sqlite"
+    SESSION_TYPE = "sqlalchemy"
+    SESSION_SQLALCHEMY_TABLE = "flask_sessions"
 
     @classmethod
     def init_app(cls, app):