diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ff2e25c..5c155e8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,8 +36,10 @@ jobs:
               root / 'index.html',
               root / '404.html',
               root / 'passive-scanner' / 'index.html',
+              root / 'passive-scanner' / 'report' / 'index.html',
               root / 'online-passive-scanner' / 'index.html',
               root / 'online-passive-scanner' / 'report.html',
+              root / 'online-passive-scanner' / 'report-legacy.html',
           ]
           missing_html = [str(p) for p in html_files if not p.exists()]
           if missing_html:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 32ccf7a..2cfc12e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -45,8 +45,10 @@ jobs:
               Path('index.html'),
               Path('404.html'),
               Path('passive-scanner/index.html'),
+              Path('passive-scanner/report/index.html'),
               Path('online-passive-scanner/index.html'),
               Path('online-passive-scanner/report.html'),
+              Path('online-passive-scanner/report-legacy.html'),
           ]
           pattern = re.compile(r'(?:href|src)=["\']([^"\']+)["\']')
           ignore_exact = {'link', 'link_to_plugin'}
diff --git a/README.md b/README.md
index 333a6b6..ccb3cf2 100644
--- a/README.md
+++ b/README.md
@@ -42,3 +42,4 @@ The scanner is vendored at `/online-passive-scanner/` and is accessible at:
 A Jekyll-native launcher page is available at:
 
 - `/passive-scanner/`
+- `/passive-scanner/report/`
diff --git a/_includes/header.html b/_includes/header.html
index 9b5d2ad..4ea35b8 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -2,5 +2,5 @@
 <a href="#overview" class="transition hover:text-slate-900">Overview</a><a href="#capabilities" class="transition hover:text-slate-900">Capabilities</a><a href="#standards" class="transition hover:text-slate-900">Standards</a><a href="/passive-scanner/" class="transition hover:text-slate-900">Scanner</a><a href="https://owtf.readthedocs.io/en/develop/" class="transition hover:text-slate-900">Docs</a>
 </div>
 <div class="flex items-center gap-3">
-<a href="https://github.com/owtf/owtf" class="hidden rounded-full border border-slate-200 px-4 py-2 text-xs font-semibold text-slate-700 transition hover:border-slate-300 hover:text-slate-900 lg:inline-flex">View GitHub</a><a href="https://github.com/owtf/owtf/releases" class="inline-flex items-center gap-2 rounded-full bg-slate-900 px-4 py-2 text-xs font-semibold text-white transition hover:bg-slate-700">Get OWTF<span class="text-base leading-none">&rarr;</span></a>
+<a href="https://github.com/owtf/owtf" class="hidden whitespace-nowrap rounded-full border border-slate-200 px-3 py-2 text-xs font-semibold text-slate-700 transition hover:border-slate-300 hover:text-slate-900 lg:inline-flex">GitHub</a><a href="https://github.com/owtf/owtf/releases" class="inline-flex items-center gap-2 rounded-full bg-slate-900 px-4 py-2 text-xs font-semibold text-white transition hover:bg-slate-700">Get OWTF<span class="text-base leading-none">&rarr;</span></a>
 </div></nav></header>
diff --git a/online-passive-scanner/report-legacy.html b/online-passive-scanner/report-legacy.html
new file mode 100644
index 0000000..b0a137a
--- /dev/null
+++ b/online-passive-scanner/report-legacy.html
@@ -0,0 +1,1237 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.2/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.2/css/bootstrap-responsive.min.css" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.1/css/font-awesome.min.css" />
+    <script type="text/javascript">
+      const isGithubPages =
+        window.location.hostname === "owtf.github.io" &&
+        window.location.pathname.startsWith("/online-passive-scanner");
+
+      if (isGithubPages && window.location.protocol === "http:") {
+        const { host, pathname, search, hash } = window.location;
+        window.location.replace("https://" + host + pathname + search + hash);
+      }
+
+      const parameters = window.location.hash.substring(1).split("&");
+      const [keyValue] = parameters;
+      const [, rawQuery = ""] = (keyValue || "").split("=");
+      window.q = decodeURIComponent(rawQuery || "");
+      window.date = new Date();
+
+        function subDomain(url)
+        {
+            url = url.replace(new RegExp(/^\s+/), "");
+            url = url.replace(new RegExp(/\s+$/), "");
+            url = url.replace(new RegExp(/\\/g), "/");
+            url = url.replace(new RegExp(/^http\:\/\/|^https\:\/\/|^ftp\:\/\//i), "");
+            url = url.replace(new RegExp(/^www\./i), "");
+            url = url.replace(new RegExp(/\/(.*)/), "");
+
+            if (url.match(new RegExp(/\.[a-z]{2,3}\.[a-z]{2}$/i)))
+            {
+                url = url.replace(new RegExp(/\.[a-z]{2,3}\.[a-z]{2}$/i), "");
+            }
+
+            else if (url.match(new RegExp(/\.[a-z]{2,4}$/i)))
+            {
+                url = url.replace(new RegExp(/\.[a-z]{2,4}$/i), "");
+            }
+
+            var subDomain = (url.match(new RegExp(/\./g))) ? true : false;
+            return (subDomain);
+
+        }
+
+        function parseUrl(url)
+        {
+            var parser = document.createElement('a');
+            parser.href = url;
+            var datas = [parser.hostname, parser.port, parser.pathname];
+            return (datas);
+        }
+
+        function printer(test_var)
+        {
+            var k = "";
+            k = test_var.toString();
+            var k1 = addhttp(k);
+            q = k1[0];
+            scheme = k1[2];
+            k = k1[1];
+            k = parseUrl(k);
+            return k;
+        }
+
+        function addhttp(url)
+        {
+            var k3 = ""
+            if (url.match(/http:\/\//))
+            {
+                url = url.substring(7);
+                k3 = "http://"
+            }
+
+            if (url.match(/https:\/\//))
+            {
+                url = url.substring(8);
+                k3 = "https://"
+            }
+
+            var k = "";
+            k = url;
+            if (url.match(/^www\./))
+            {
+                url = url.substring(4);
+            }
+
+            if (!/^(f|ht)tps?:\/\//i.test(url))
+            {
+                url = "http://" + url;
+            }
+            var k2 = [k, url, k3]
+            return k2;
+        }
+
+        //var q = 'https://demo.testfire.net:1234/hey'
+        //var output = document.getElementById('output');
+        var temp = "";
+        var hosts = "";
+        var port = "";
+        var scheme = "";
+        var path = "";
+        var sub = "";
+
+        var datas = printer(q);
+
+        sub = datas[0];
+        port = datas[1];
+        path = datas[2];
+
+        if (!subDomain(sub))
+        {
+            hosts = sub;
+        }
+        else
+        {
+            hosts = sub.split(".")[1] + "." + sub.split(".")[2];
+        };
+
+        if (!port)
+        {
+            port = 80;
+        }
+        if (!scheme)
+        {
+            scheme = 'http://';
+        }
+
+        var ip='Resolving…';
+        (function resolveIp(target) {
+            if (!target) {
+                ip = 'Unavailable';
+                if (window.jQuery) {
+                    jQuery('.ip_url').text(ip);
+                }
+                return;
+            }
+            var lookup = encodeURIComponent(target);
+            fetch('https://dns.google/resolve?name=' + lookup)
+                .then(function(response) {
+                    if (!response.ok) {
+                        throw new Error('Network response was not ok');
+                    }
+                    return response.json();
+                })
+                .then(function(payload) {
+                    if (payload.Answer && payload.Answer.length) {
+                        for (var i = 0; i < payload.Answer.length; i++) {
+                            var answer = payload.Answer[i];
+                            if (answer.type === 1 && answer.data) {
+                                ip = answer.data;
+                                if (window.jQuery) {
+                                    jQuery('.ip_url').text(ip);
+                                }
+                                break;
+                            }
+                        }
+                    }
+                    if (!ip) {
+                        ip = 'Unavailable';
+                        if (window.jQuery) {
+                            jQuery('.ip_url').text(ip);
+                        }
+                    }
+                })
+                .catch(function() {
+                    ip = 'Unavailable';
+                    if (window.jQuery) {
+                        jQuery('.ip_url').text(ip);
+                    }
+                });
+        })(q);
+    </script>
+
+    <title>OWASP OWTF Report</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="OWASP OWTF Report">
+    <meta name="author" content="OWASP OWTF Team">
+    <style>
+        body {
+            position: relative;
+            min-height: 100vh;
+        }
+
+        .github-ribbon {
+            position: fixed;
+            top: 1rem;
+            right: -3.5rem;
+            display: block;
+            width: 12rem;
+            padding: 0.75rem 0;
+            background: linear-gradient(135deg, #1f2328, #24292f);
+            color: #f8fbff;
+            text-align: center;
+            text-decoration: none;
+            font-weight: 600;
+            font-size: 0.9rem;
+            letter-spacing: 0.05em;
+            text-transform: uppercase;
+            transform: rotate(45deg);
+            transform-origin: top right;
+            box-shadow: 0 6px 12px rgba(15, 23, 42, 0.35);
+            z-index: 1000;
+        }
+
+        .github-ribbon:focus-visible {
+            outline: 2px solid #f0f6ff;
+            outline-offset: 2px;
+        }
+
+        @media (max-width: 576px) {
+            .github-ribbon {
+                width: 10rem;
+                right: -3rem;
+                font-size: 0.75rem;
+            }
+        }
+
+        .nav-tabs-container {
+            padding: 3px;
+            border: 1px solid #d9d9d9;
+            border-radius: 4px;
+        }
+    </style>
+</head>
+<body>
+       <div class="container">
+        <a href="https://github.com/owtf/online-passive-scanner" aria-label="Fork me on GitHub" class="github-ribbon">Fork me on GitHub</a>
+        <!-- start page header -->
+        <div class="page-header row">
+            <div class="col col-md-3">
+                <a href="http://www.owtf.org" >
+                    <img src="images/owtf-logo.svg" class="img-rounded" height="150" width="150" alt="OWASP OWTF Logo">
+                </a>
+            </div>
+            <div class="col col-md-9">
+                <h5>                Online Passive Scanner
+                <small>
+                Version: 1.0.1
+                , Release <b>Lionheart</b>
+                <span class="hidden">, Seed <sup><span class="hidden" id="seed"> 2NfaMaxkF_ </span></sup></span>
+                </small></h5>
+            </div>
+        </div>
+        <!-- end page header -->
+<!--  navbar row-->
+<div class="row">
+        <ul class="nav nav-pills nav-justified">
+                        <li class="active"><a href="#main" data-toggle="tab">Home</a></li>
+                        <li class=""><a href="#filter" data-toggle="tab">Browse</a></li>
+                        <li><a href="#review" data-toggle="tab">Review</a></li>
+                        <!--
+                   <li class="divider-vertical"></li>
+
+                              <li class="dropdown">
+                                        <a class="dropdown-toggle"
+                                            data-toggle="dropdown"
+                                        href="#">
+                                        Targets (4)
+                                        <b class="caret"></b>
+                                        </a>
+                                        <ul class="dropdown-menu">
+                                          <li><a> 193.168.77.199</a></li>
+                                          </ul>
+                                  </li>
+                     <li class="dropdown">
+                                        <a class="dropdown-toggle"
+                                            data-toggle="dropdown"
+                                        href="#">
+                                        Plugins (23)
+                                        <b class="caret"></b>
+                                        </a>
+                                        <ul class="dropdown-menu">
+                                          <li><a> OWASP-IG-005 <small>Application Discovery</small></a></li>
+                                          </ul>
+                                  </li>
+                      -->
+                        <li class="divider-vertical"></li>
+                        <li class="dropdown">
+                            <a class="dropdown-toggle"
+                               data-toggle="dropdown"
+                               href="#">
+                                Links
+                                <b class="caret"></b>
+                            </a>
+                            <ul class="dropdown-menu">
+                                <li class="dropdown-submenu">
+                                    <a tabindex="-1" href="#">Exploitation</a>
+                                    <ul class="dropdown-menu">
+                                        <li><a href="http://hackvertor.co.uk/public" target="_blank"> Hackvertor </a></li>
+                                        <!--  <li><a href="http://hackarmoury.com/" target="_blank"> Hackarmoury </a></li> -->
+                                        <li><a href="http://www.exploit-db.com/" target="_blank"> ExploitDB </a></li>
+                                        <li><a href="http://www.exploitsearch.net/" target="_blank"> ExploitSearch </a></li>
+                                        <li><a href="http://www.hakipedia.com/index.php/Hakipedia" target="_blank"> Hackipedia </a></li>
+                                    </ul>
+                                </li>
+                                <li class="dropdown-submenu">
+                                    <a tabindex="-1" href="#">Methodology</a>
+                                    <ul class="dropdown-menu">
+                                        <li><a href="https://www.owasp.org/index.php/OWASP_Testing_Guide_v3_Table_of_Contents" target="_blank"> OWASP </a></li>
+                                        <li><a href="http://www.pentest-standard.org/index.php/Main_Page" target="_blank"> Pentest Standard </a></li>
+                                        <li><a href="http://www.isecom.org/osstmm/"> OSSTMM </a></li>
+
+                                    </ul>
+                                </li>
+                                <li class="dropdown-submenu">
+                                    <a tabindex="-1" href="#">Calculators</a>
+                                    <ul class="dropdown-menu">
+                                        <li><a href="http://nvd.nist.gov/cvss.cfm?adv&calculator&version=2" target="_blank"> CVSS Advanced </a></li>
+                                        <li><a href="http://nvd.nist.gov/cvss.cfm?calculator&version=2" target="_blank"> CVSS Normal </a></li>
+
+                                    </ul>
+                                </li>
+                                <li class="dropdown-submenu">
+                                    <a tabindex="-1" href="#">Test/Learn</a>
+                                    <ul class="dropdown-menu">
+                                        <li><a href="http://www.owasp.org/index.php?title=OWASP_Vulnerable_Web_Applications_Directory_Project" target="_blank"> OWASP VWAD </a></li>
+                                        <li><a href="http://securitythoughts.wordpress.com/2010/03/22/vulnerable-web-applications-for-learning/" target="_blank"> Securitythoughts </a></li>
+                                        <li><a href="http://danielmiessler.com/projects/webappsec_testing_resources/" target="_blank"> Danielmiessler </a></li>
+
+                                    </ul>
+                                </li>
+
+
+                            </ul>
+
+                        </li>
+                    </ul>
+<!--  end navbar row -->
+
+<!-- start Content -->
+<div class="row">
+<div class="span12">
+<div class="tab-content">
+<div class="tab-pane active" id="main">
+
+    <div class="row-fluid">
+        <div class="span7">
+
+            <h3>Status <small
+
+                    class="text-success"
+
+                    > Complete  </small></h3>
+
+            <div><span class="icon-stack"><i class="icon-circle icon-stack-base"></i><i class="icon-terminal icon-light"></i></span> <strong>Command: </strong>owtf.py -t passive <span class="q_url"> </span></div>
+            <div><span class="icon-stack"><i class="icon-circle icon-stack-base"></i><i class="icon-screenshot icon-light"></i></span> <strong>Target: </strong><span class="q_url"> </span>(<span class="ip_url"> </span>) <i class="icon-link"></i></a></div>
+            <!--  <div><span class="icon-stack"><i class="icon-circle icon-stack-base"></i><i class="icon-stethoscope icon-light"></i></span> <strong>Last plugin: </strong>{ current_plugin }</div>-->
+            <!--   <div><span class="icon-stack"><i class="icon-circle icon-stack-base"></i><i class="icon-spinner icon-light"></i></span> <strong>Completion rate: </strong>{ completed_targets_nb }/{ total_targets_nb } targets - {completed_plugins_nb}/{total_plugins_nb} plugins</div> -->
+
+
+
+            <h3> History </h3>
+            <table class="table table-bordered table-striped table-hover">
+                <thead>
+                <tr>
+                    <th> N° </th>
+                    <th> START </th>
+                    <th> END </th>
+                    <th> COMMAND </th>
+                    <th> STATUS </th>
+                </tr>
+                </thead>
+                <tbody>
+
+                <tr
+
+                        class="text-success"
+
+                        >
+                    <td> 1 </td>
+                    <td> <span class="date_url"> </span> </td>
+                    <td> <span class="date_url"> </span> </td>
+                    <td> owtf.py -t passive <span class="q_url"> </span> </td>
+                    <td> Complete </td>
+                </tr>
+
+                <!--
+                <tr class="text-warning">
+                    <td>3</td>
+                    <td>owtf.py www.esi.dz</td>
+                    <td> 16/06/2013-18:40 </td>
+                    <td> 16/06/2013-18:42 </td>
+                    <td>2m, 14s, 478ms</td>
+                    <td>Aborted by user</td>
+                </tr>
+                <tr class="text-success">
+                    <td>2</td>
+                    <td>owtf.py www.esi.dz</td>
+                    <td> 16/06/2013-18:40 </td>
+                    <td> 16/06/2013-18:42 </td>
+                    <td>2m, 14s, 478ms</td>
+                    <td>Completed</td>
+                </tr>
+                <tr class="text-error">
+                    <td>1</td>
+                    <td>owtf.py www.esi.dz</td>
+                    <td> 16/06/2013-18:40 </td>
+                    <td> 16/06/2013-18:42 </td>
+                    <td>2m, 14s, 478ms</td>
+                    <td>Crashed</td>
+                </tr>
+                 -->
+                </tbody>
+            </table>
+
+            <!--
+            #Not implemented yet
+            <h3> Stats </h3>
+            +analysin stats
+            +review stats
+            <hr/> -->
+
+
+        </div>
+        <div class="span5">
+            <div class="well well-small">
+                <h3><i class="icon-screenshot"></i> Target <small>(1)</small> </h3>
+                <ul>
+
+
+
+
+                    <li><a href="#" class="target_jumper" data-value="#iframe_"> <span class="q_url"> </span> (<span class="ip_url"> </span>)</a></li>
+
+
+
+                </ul>
+            </div>
+            <!--
+            <div class="well well-small">
+                <h3><i class="icon-stethoscope"></i> Test Plugins <small>(25)</small></h3>
+                    <ul>
+                        <li><a href="link_to_plugin">OWASP-IG-01</a>  </li>
+                        <li><a href="link_to_plugin">OWASP-IG-02</a></li>
+                        <li><a href="link_to_plugin">OWASP-IG-03</a></li>
+                        <li><a href="link_to_plugin">OWASP-IG-04</a></li>
+                    </ul>
+            </div>
+            -->
+        </div>
+    </div>
+</div>
+<div class="tab-pane" id="filter">
+<!--  Filter Proto #4  -->
+<div class="row-fluid">
+    <div class="span12">
+        <div class="btn-toolbar">
+            <div class="btn-group" data-toggle="buttons-checkbox">
+                <button id="filterinfo" class="btn btn-info filter"  onclick="FilterResultsSummary('info', 'NetMap',this)" rel="tooltip" data-original-title="Completed" data-placement="bottom"><i class="icon-ok icon-white"></i> <span id="filterinfo_counter" class="counter"></span></button>
+            </div>
+            <div class="btn-group " data-toggle="buttons-checkbox">
+                <button class="btn filter" onclick="FilterResultsSummary('flag', 'NetMap',this)" rel="tooltip" data-original-title="Flagged" data-placement="bottom"><i class="icon-flag"></i>  <span id="filterflag_counter" class="counter"></span></button>
+                <button class="btn filter" onclick="FilterResultsSummary('no_flag', 'NetMap',this)" rel="tooltip" data-original-title="Not Flagged" data-placement="bottom"><i class="icon-flag-alt"></i>  <span id="filterno_flag_counter" class="counter"></span></button>
+            </div>
+            <div class="btn-group" data-toggle="buttons-checkbox">
+                <button onclick="FilterResultsSummary('fav', 'NetMap',this)" class="btn filter" rel="tooltip" data-original-title="Favorated" data-placement="bottom"><i class="icon-heart icon-white"></i> <span id="filterfav_counter"></span></button>
+            </div>
+            <div class="btn-group" data-toggle="buttons-checkbox">
+                <button  id="filternotes"  onclick="FilterResultsSummary('notes', 'NetMap',this)" class="btn  filter" rel="tooltip" data-original-title="Commented" data-placement="bottom"><i class="icon-comment icon-white"></i> <span id="filternotes_counter"></span></button>
+            </div>
+
+            <div class="btn-group" data-toggle="buttons-checkbox">
+                <button  id="filterunseen" onclick="FilterResultsSummary('unseen', 'NetMap',this)" class="btn filter" rel="tooltip" data-original-title="Not seen" data-placement="bottom"><i class="icon-eye-close icon-white"></i> <span id="filterunseen_counter" class="counter"></span></button>
+                <button id="filterseen" onclick="FilterResultsSummary('seen', 'NetMap',this)" class="btn filter" rel="tooltip" data-original-title="Seen" data-placement="bottom"><i class="icon-eye-open icon-white"></i> <span id="filterseen_counter" class="counter"></span></button>
+            </div>
+
+            <div class="btn-group" data-toggle="buttons-checkbox">
+                <button id="filterstar_3" onclick="FilterResultsSummary('star_3', 'NetMap',this)" class="btn btn-inverse filter" rel="tooltip" data-original-title="Unknown" data-placement="bottom"><i class="icon-asterisk  icon-white"></i> <span  id="filterstar_3_counter"></span></button>
+                <button id="filterattention_orange" onclick="FilterResultsSummary('attention_orange', 'NetMap',this)" class="btn btn-warning filter" rel="tooltip" data-original-title="Warning" data-placement="bottom"><i class="icon-warning-sign icon-white"></i> <span id="filterattention_orange_counter"></span></button>
+                <button id="filterbonus_red" onclick="FilterResultsSummary('bonus_red', 'NetMap',this)" class="btn btn-danger filter" rel="tooltip" data-original-title="Exploitable" data-placement="bottom"><i class="icon-fire icon-white"></i> <span id="filterbonus_red_counter"></span></button>
+                <button id="filterbug" onclick="FilterResultsSummary('bug', 'NetMap',this)" class="btn btn-info  filter" rel="tooltip" data-original-title="Logic Bug" data-placement="bottom"><i class="icon-bug icon-white"></i> <span id="filterbug_counter"></span></button>
+                <button id="filtercheck_green" onclick="FilterResultsSummary('check_green', 'NetMap',this)" class="btn btn-success filter " rel="tooltip" data-original-title="Test passed" data-placement="bottom"><i class="icon-thumbs-up icon-white"></i> <span  id="filtercheck_green_counter"></span></button>
+            </div>
+
+            <div class="btn-group" data-toggle="buttons-checkbox">
+                <button id="filterflag_violet" onclick="FilterResultsSummary('flag_violet', 'NetMap',this)" class="btn sev-critic filter" rel="tooltip" data-original-title="Critical severity" data-placement="bottom"><i class="icon-exclamation-sign icon-white"></i> <span id="filterflag_violet_counter"></span></button>
+                <button id="filterflag_red" onclick="FilterResultsSummary('flag_red', 'NetMap',this)" class="btn sev-hi filter" rel="tooltip" data-original-title="High severity" data-placement="bottom"><i class="icon-arrow-up icon-white"></i> <span id="filterflag_red_counter"></span></button>
+                <button id="filterflag_yellow" onclick="FilterResultsSummary('flag_yellow', 'NetMap',this)" class="btn sev-med filter" rel="tooltip" data-original-title="Medium severity" data-placement="bottom"><i class="icon-arrow-right icon-white"></i> <span id="filterflag_yellow_counter"></span></button>
+                <button id="filterflag_blue"  onclick="FilterResultsSummary('flag_blue', 'NetMap',this)" class="btn sev-low filter" rel="tooltip" data-original-title="Low severity" data-placement="bottom"><i class="icon-arrow-down icon-white"></i> <span id="filterflag_blue_counter"></span></button>
+                <button id="filterflag_white" onclick="FilterResultsSummary('flag_white', 'NetMap',this)" class="btn sev-no filter" rel="tooltip" data-original-title="No severity" data-placement="bottom"><i class="icon-remove-circle icon-white"></i> <span id="filterflag_white_counter"></span></button>
+            </div>
+
+            <div class="btn-group">
+                <a href="#more_filters_modal" role="button" class="btn filter" data-toggle="modal" rel="tooltip" data-original-title="More filters" data-placement="bottom"><i class="icon-filter icon-white"></i></a>
+                <button onclick="FilterResultsSummary('delete', 'NetMap',this)"  class="btn filter" rel="tooltip" data-original-title="Clear filters" data-placement="bottom"><i class="icon-ban-circle icon-white"></i></button>
+                <button onclick="FilterResultsSummary('refresh', 'NetMap',this)" id="refresh" class="btn" rel="tooltip" data-original-title="Refresh" data-placement="bottom"><i class="icon-refresh icon-white"></i></button>
+            </div>
+            <span class="label label-success pull-right counter" rel="tooltip" data-original-title="Number of plugins that matched the search" data-placement="bottom"><strong> Matches:<span id="filtermatches_counter" >--</span></strong></span>
+        </div>
+
+    </div>
+</div>
+<!--  End Filter Proto #4  -->
+
+<!-- Modal more-filters -->
+<div id="more_filters_modal" class="modal hide fade" style="width: 700px;" tabindex="-1" role="dialog" aria-labelledby="more_filters_modal_label" aria-hidden="true">
+<div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+    <h3 id="more_filters_modal_label">More filters</h3>
+</div>
+<div class="modal-body" >
+<table >
+<tr>
+    <th colspan="3">Plugin Groups</th>
+</tr>
+<tr >
+    <td colspan="3">
+        <select multiple='multiple'  id='SelectPluginGroup'  size='3' onchange='SetSelectFilterOptions(this)' style="width:100%;">
+
+            <option value="aux">
+                aux
+            </option>
+
+            <option value="net">
+                net
+            </option>
+
+            <option value="web">
+                web
+            </option>
+
+        </select>
+
+    </td>
+</tr>
+<tr>
+    <th>Web Plugin Types</th>
+    <th>Aux Plugin Types</th>
+    <th>Net Plugin Types</th>
+</tr>
+<tr>
+    <td>
+        <select multiple='multiple'  id='SelectPluginTypesWeb' size='5' onchange='SetSelectFilterOptions(this)'>
+
+            <option value="active">
+                active
+            </option>
+
+            <option value="external">
+                external
+            </option>
+
+            <option value="grep">
+                grep
+            </option>
+
+            <option value="passive">
+                passive
+            </option>
+
+            <option value="semi_passive">
+                semi_passive
+            </option>
+
+        </select>
+    </td>
+    <td>
+        <select multiple='multiple'  id='SelectPluginTypesAux' size='5' onchange='SetSelectFilterOptions(this)'>
+
+            <option value="bruteforce">
+                bruteforce
+            </option>
+
+            <option value="dos">
+                dos
+            </option>
+
+            <option value="exploit">
+                exploit
+            </option>
+
+            <option value="rce">
+                rce
+            </option>
+
+            <option value="se">
+                se
+            </option>
+
+            <option value="selenium">
+                selenium
+            </option>
+
+            <option value="smb">
+                smb
+            </option>
+
+        </select>
+    </td>
+    <td>
+        <select multiple='multiple'  id='SelectPluginTypesNet' size='5' onchange='SetSelectFilterOptions(this)'>
+
+            <option value="active">
+                active
+            </option>
+
+            <option value="bruteforce">
+                bruteforce
+            </option>
+
+        </select>
+    </td>
+</tr>
+
+<tr>
+    <th colspan="3" >Web Test Groups</th>
+</tr>
+<tr>
+
+
+<td colspan="3" >
+<select multiple='multiple' style="width:100%;"  id='SelectWebTestGroups' size='5' onchange='SetSelectFilterOptions(this)'>
+
+<option value="OWASP-IG-001">
+    OWASP-IG-001 - Spiders, Robots, and Crawlers (robots.txt Analysis)
+</option>
+
+<option value="OWASP-IG-002">
+    OWASP-IG-002 - Search engine discovery/reconnaissance (Google Hacking, Metadata)
+</option>
+
+<option value="OWASP-IG-003">
+    OWASP-IG-003 - Identify application entry points (Crawling)
+</option>
+
+<option value="OWASP-IG-004">
+    OWASP-IG-004 - Web Application Fingerprint (What is that site running?)
+</option>
+
+<option value="OWASP-IG-005">
+    OWASP-IG-005 - Application Discovery (Port Scanning, Whois)
+</option>
+
+<option value="OWASP-IG-006">
+    OWASP-IG-006 - Testing for Error Code (Error Messages)
+</option>
+
+<option value="OWASP-CM-001">
+    OWASP-CM-001 - Testing for SSL-TLS (SSL Testing)
+</option>
+
+<option value="OWASP-CM-002">
+    OWASP-CM-002 - Testing for DB Listener (DB Service Testing)
+</option>
+
+<option value="OWASP-CM-003">
+    OWASP-CM-003 - Infrastructure Configuration Management (WAF, Load Balancer, Rev Proxy, User Agent)
+</option>
+
+<option value="OWASP-CM-004">
+    OWASP-CM-004 - Application Configuration Management (Comments, Source code disclosure)
+</option>
+
+<option value="OWASP-CM-005">
+    OWASP-CM-005 - File Extensions Handling (File uploads, etc)
+</option>
+
+<option value="OWASP-CM-006">
+    OWASP-CM-006 - Old, Backup and Unreferenced Files (DirBuster, directory/file bruteforce)
+</option>
+
+<option value="OWASP-CM-007">
+    OWASP-CM-007 - Testing for Admin Interfaces (Admin interface)
+</option>
+
+<option value="OWASP-CM-008">
+    OWASP-CM-008 - HTTP Methods and XST (PUT, TRACE, WebDAV, etc)
+</option>
+
+<option value="OWASP-AT-001">
+    OWASP-AT-001 - Testing for Credentials Transport (Passwords in clear-text)
+</option>
+
+<option value="OWASP-AT-002">
+    OWASP-AT-002 - Testing for User Enumeration (User Enumeration)
+</option>
+
+<option value="OWASP-AT-003">
+    OWASP-AT-003 - Default or Guessable User Account (Default accounts)
+</option>
+
+<option value="OWASP-AT-004">
+    OWASP-AT-004 - Testing for Brute Force (Brute Force)
+</option>
+
+<option value="OWASP-AT-005">
+    OWASP-AT-005 - Bypassing Authentication Schema ()
+</option>
+
+<option value="OWASP-AT-006">
+    OWASP-AT-006 - Vulnerable Remember Password and Pwd Reset ()
+</option>
+
+<option value="OWASP-AT-007">
+    OWASP-AT-007 - Logout and Browser Cache Management ()
+</option>
+
+<option value="OWASP-AT-008">
+    OWASP-AT-008 - Testing for Captcha ()
+</option>
+
+<option value="OWASP-AT-009">
+    OWASP-AT-009 - Multiple Factors Authentication ()
+</option>
+
+<option value="OWASP-AT-010">
+    OWASP-AT-010 - Race Conditions ()
+</option>
+
+<option value="OWASP-SM-001">
+    OWASP-SM-001 - Session Management Schema ()
+</option>
+
+<option value="OWASP-SM-002">
+    OWASP-SM-002 - Cookies Attributes ()
+</option>
+
+<option value="OWASP-SM-003">
+    OWASP-SM-003 - Session Fixation ()
+</option>
+
+<option value="OWASP-SM-004">
+    OWASP-SM-004 - Exposed Session Variables ()
+</option>
+
+<option value="OWASP-SM-005">
+    OWASP-SM-005 - Testing for CSRF ()
+</option>
+
+<option value="OWASP-AZ-001">
+    OWASP-AZ-001 - Path Traversal ()
+</option>
+
+<option value="OWASP-AZ-002">
+    OWASP-AZ-002 - Bypassing Authorization Schema ()
+</option>
+
+<option value="OWASP-AZ-003">
+    OWASP-AZ-003 - Privilege Escalation ()
+</option>
+
+<option value="OWASP-BL-001">
+    OWASP-BL-001 - Business Logic ()
+</option>
+
+<option value="OWASP-DV-001">
+    OWASP-DV-001 - Reflected Cross Site Scripting ()
+</option>
+
+<option value="OWASP-DV-002">
+    OWASP-DV-002 - Stored Cross Site Scripting ()
+</option>
+
+<option value="OWASP-DV-003">
+    OWASP-DV-003 - DOM-based Cross Site Scripting ()
+</option>
+
+<option value="OWASP-DV-004">
+    OWASP-DV-004 - Cross Site Flashing ()
+</option>
+
+<option value="OWASP-DV-005">
+    OWASP-DV-005 - SQL Injection ()
+</option>
+
+<option value="OWASP-DV-006">
+    OWASP-DV-006 - LDAP Injection ()
+</option>
+
+<option value="OWASP-DV-007">
+    OWASP-DV-007 - ORM Injection ()
+</option>
+
+<option value="OWASP-DV-008">
+    OWASP-DV-008 - XML Injection ()
+</option>
+
+<option value="OWASP-DV-009">
+    OWASP-DV-009 - SSI Injection ()
+</option>
+
+<option value="OWASP-DV-010">
+    OWASP-DV-010 - XPath Injection ()
+</option>
+
+<option value="OWASP-DV-011">
+    OWASP-DV-011 - SMTP Injection ()
+</option>
+
+<option value="OWASP-DV-012">
+    OWASP-DV-012 - Code Injection ()
+</option>
+
+<option value="OWASP-DV-013">
+    OWASP-DV-013 - Command Injection ()
+</option>
+
+<option value="OWASP-DV-014">
+    OWASP-DV-014 - Buffer Overflow ()
+</option>
+
+<option value="OWASP-DV-015">
+    OWASP-DV-015 - Incubated Vulnerability ()
+</option>
+
+<option value="OWASP-DV-016">
+    OWASP-DV-016 - HTTP Splitting/Smuggling ()
+</option>
+
+<option value="OWASP-DS-001">
+    OWASP-DS-001 - SQL Wildcard Attacks ()
+</option>
+
+<option value="OWASP-DS-002">
+    OWASP-DS-002 - DoS Locking Customer Accounts ()
+</option>
+
+<option value="OWASP-DS-003">
+    OWASP-DS-003 - DoS Buffer Overflows ()
+</option>
+
+<option value="OWASP-DS-004">
+    OWASP-DS-004 - DoS User Specified Object Allocation ()
+</option>
+
+<option value="OWASP-DS-005">
+    OWASP-DS-005 - User Input as a Loop Counter ()
+</option>
+
+<option value="OWASP-DS-006">
+    OWASP-DS-006 - Writing User Provided Data to Disk ()
+</option>
+
+<option value="OWASP-DS-007">
+    OWASP-DS-007 - DoS Failure to Release Resources ()
+</option>
+
+<option value="OWASP-DS-008">
+    OWASP-DS-008 - Storing too Much Data in Session ()
+</option>
+
+<option value="OWASP-WS-001">
+    OWASP-WS-001 - WS Information Gathering ()
+</option>
+
+<option value="OWASP-WS-002">
+    OWASP-WS-002 - Testing WSDL ()
+</option>
+
+<option value="OWASP-WS-003">
+    OWASP-WS-003 - Testing for XML Structural ()
+</option>
+
+<option value="OWASP-WS-004">
+    OWASP-WS-004 - Testing for XML Content-Level ()
+</option>
+
+<option value="OWASP-WS-005">
+    OWASP-WS-005 - WS HTTP GET parameters/REST attacks ()
+</option>
+
+<option value="OWASP-WS-006">
+    OWASP-WS-006 - Naughty SOAP Attachments ()
+</option>
+
+<option value="OWASP-WS-007">
+    OWASP-WS-007 - Testing for WS Replay ()
+</option>
+
+<option value="OWASP-AJ-001">
+    OWASP-AJ-001 - Testing for AJAX Vulnerabilities ()
+</option>
+
+<option value="OWASP-AJ-002">
+    OWASP-AJ-002 - Testing for AJAX ()
+</option>
+
+<option value="OWTF-WGP-001">
+    OWTF-WGP-001 - ClickJacking (ClickJacking)
+</option>
+
+<option value="OWTF-WGP-002">
+    OWTF-WGP-002 - Cross Origin Resource Sharing (CORS) (CORS)
+</option>
+
+<option value="OWTF-WVS-001">
+    OWTF-WVS-001 - Arachni Unauthenticated ()
+</option>
+
+<option value="OWTF-WVS-002">
+    OWTF-WVS-002 - Nikto Unauthenticated ()
+</option>
+
+<option value="OWTF-WVS-003">
+    OWTF-WVS-003 - Wapiti Unauthenticated ()
+</option>
+
+<option value="OWTF-WVS-004">
+    OWTF-WVS-004 - W3AF Unauthenticated ()
+</option>
+
+<option value="OWTF-WVS-005">
+    OWTF-WVS-005 - WebSecurify Unauthenticated ()
+</option>
+
+<option value="OWTF-WVS-006">
+    OWTF-WVS-006 - Skipfish Unauthenticated ()
+</option>
+
+</select>
+</td>
+</tr>
+<tr>
+    <th colspan="3" >Available Targets</th>
+</tr>
+<tr>
+    <td colspan="3">
+        <select multiple="multiple" id="SelectTargets" size='5' style="width:100%;"  onchange='SetSelectFilterOptions(this)'>
+
+
+
+
+            <option value="i65_61_137_117p80">
+                <span class="ip_url"> </span> - <span class="q_url"> </span>
+            </option>
+
+
+
+        </select>
+    </td>
+</tr>
+
+</table>
+
+</div>
+<div class="modal-footer">
+    <button class="btn btn-success" data-dismiss="modal" aria-hidden="true">Save</button>
+    <button class="btn btn-primary" data-dismiss="modal" onclick="FilterResultsSummary('info', 'NetMap',this)">Apply</button>
+</div>
+
+</div>
+
+<!-- NetMap -->
+<div class="row">
+    <div class="span3 hidden-phone">
+        <div  id="sidebar" class="bs-docs-sidebar">
+            <ul class="nav nav-pills nav-stacked bs-docs-sidenav affix ">
+                <li class="nav-header"><i class="icon-screenshot icon-white"> </i> Targets</li>
+
+
+
+
+
+
+
+
+
+                <li id="sb_target"><a href="#"  class="tooltip_sidebar" data-toggle="tooltip" data-placement="right" title="" data-original-title=""></a><a><i class="icon-chevron-right"></i> <span class="q_url"> </span> </a></li>
+
+
+
+
+            </ul>
+        </div>
+    </div>
+    <div class="span9" id="content" data-spy="scroll" data-target="#sidebar">
+
+
+
+
+
+
+
+
+
+        <section id="section_i65_61_137_117p80" class="well well-small">
+            <div class="page-header">
+                <h3><span class="icon-screenshot icon-white"> </span><a href="link" class='dynamicLink'>link</a>
+
+
+                    <script>
+
+                        var href = scheme + q;
+                        var links = document.getElementsByClassName('dynamicLink');
+                        for (var i = 0; i < links.length; i++)
+                        {
+
+                            links[i].href = href;
+                            links[i].innerHTML = href.replace('http://',"http://");
+                        }
+                    </script>
+
+
+                    <small class="">
+                        <span id="ip"><span class="ip_url"> </span></span>:<span id="port"><span class="port_url"> </span></span>
+                    </small>
+		                        
+		                        <span class="btn-group hidden">
+		                        	<a class="btn btn-info disabled" href="#review_modal" role="button" data-toggle="modal">Review</a>
+		                        	<a class="btn btn-info disabled" href="#export_subreport" role="button" data-toggle="modal" >Export</a>
+		                       	</span>
+		                       	<span class="btn-group">
+		                       		<a class="btn btn-primary subreport_expand target_button" href="#" role="button"  data-value="#subreport_i65_61_137_117p80" data-toggle="tooltip" title="Expand all test groups of target"><i class="icon-expand-alt icon-large"></i></a>
+									<a class="btn btn-primary subreport_collapse target_button" href="#" role="button"  data-value="#subreport_i65_61_137_117p80" data-toggle="tooltip" title="Collapse all test groups of target"><i class="icon-check-minus "></i></a>
+		                       	</span>
+                    <a class="btn btn-warning subreport_refresh target_button" href="#" role="button"  data-value="#subreport_i65_61_137_117p80" data-toggle="tooltip" title="Refresh target subreport"><i class="icon-refresh"></i></a>
+                    <a class="btn btn-success subreport_generate target_button" href="#" role="button" onclick="ToggleReportMode('i65_61_137_117p80')" data-value="#subreport_i65_61_137_117p80" data-toggle="tooltip" title="Generate target review report"><i class="icon-magic"></i></a>
+                </h3>
+
+            </div>
+
+            <div id="generated_report_i65_61_137_117p80" class="well" style="display:none">
+                <div id="i65_61_137_117p80__rep__intro" class="muted"></div>
+                <h3> Statistics </h3>
+                <div id="i65_61_137_117p80__rep__stats"></div>
+                <h3> Passed Tests </h3>
+                <div id="i65_61_137_117p80__rep__passed"></div>
+                <h3> Findings </h3>
+                <div id="i65_61_137_117p80__rep__findings"></div>
+                <h3> Unrated </h3>
+                <div id="i65_61_137_117p80__rep__unrated">
+                    <div class="alert"><strong>Alert!</strong> Unimplemented</div>
+                </div>
+            </div>
+
+
+            <div id="subreport_i65_61_137_117p80" class="subreport" data-value="http__target.html">
+								 	<span class="alert alert-warning">
+								 		<i class="icon-spinner icon-spin icon-large"></i> 
+								 			Subreport is not loaded yet ... click <strong>Refresh <i class="icon-refresh"></i></strong> button!   
+								 	</span>
+            </div>
+            <!--
+              <iframe id="iframe_http://demo.testfire.net" src="http__demo.testfire.net.html"   frameborder="0"  width="100%" height="100%" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen>
+                                            Your browser does not support iframes
+                                        </iframe>
+                <div id="ip_http://demo.testfire.net" style = 'display: none'>65.61.137.117</div>
+                <div id="port_http://demo.testfire.net" style = 'display: none'>80</div>
+             -->
+        </section>
+
+
+
+
+    </div>
+</div>
+
+
+<!-- end NetMap -->
+<!-- start AUX -->
+
+<!-- end AUX -->
+</div>
+<div class="tab-pane" id="review">
+    &nbsp;
+    <div class="btn-toolbar">
+        <button class="btn" onclick="ImportReview();">
+            <span> Import </span>
+        </button>
+        <div class="btn-group">
+            <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">Export
+                <span class="caret"></span>
+            </a>
+            <ul class="dropdown-menu">
+                <li><a href="#" onclick="ExportReviewAsText();">TEXT</a></li>
+                <li class="disabled"><a class="disabled" href="#">HTML</a></li>
+                <li class="disabled"><a class="disabled" href="#">PDF</a></li>
+
+            </ul>
+        </div>
+        <button class="btn btn-success disabled">Share</button>
+        <div class="btn-group">
+            <a class="btn btn-danger dropdown-toggle " data-toggle="dropdown" href="#">Delete
+                <span class="caret"></span>
+            </a>
+            <ul class="dropdown-menu">
+                <li><a href="#" onclick="ClearReview();">This review!</a></li>
+                <li><a href="#" onclick="DeleteStorage();">All reviews!</a></li>
+            </ul>
+        </div>
+        <div class="btn-group">
+
+            <a class="btn btn-inverse dropdown-toggle " data-toggle="dropdown" href="#">Memory
+                <span class="caret"></span>
+            </a>
+            <ul class="dropdown-menu">
+                <li><a href="#" onclick="ShowUsedMem();">Show Used Memory (KB)</a></li>
+                <li><a href="#" onclick="ShowUsedMemPercentage();">Show Used Memory (%)</a></li>
+            </ul>
+        </div>
+
+
+
+    </div>
+    <textarea rows="15" cols="100" id="import_export_box" class="span12"></textarea>
+
+</div>
+
+</div>
+</div>
+<!-- end Content -->
+
+<!--  start footer -->
+<div class="container">
+    <br>
+    <hr>
+    <p class="muted credit pull-right">
+        Generated by
+        <a href="http://owtf.org">OWASP OWTF</a>
+        -
+        <a href="https://github.com/owtf/owtf/releases/tag/OWTF_0.45.0">Version 1.0.1 "Lionheart"</a>
+        -
+        <a href="http://github.com/owtf/owtf"> @github <i class="icon-github-alt"></i></a>
+    </p>
+    </div></div></div>
+<!--  end footer -->
+<!-- Placed at the end of the document so the pages load faster -->
+<script src="https://code.jquery.com/jquery-1.12.4.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
+
+<script>
+    $('.tooltip_sidebar').tooltip();
+    // $('#myTab a:first').tab('show');
+    // $('#myTab2 a:first').tab('show');
+    $('#sidebar').affix();
+    //$('body').scrollspy({ target: '#sidebar' });
+    // $("#info").tooltip();
+    $(".filter").tooltip();
+    $(".counter").tooltip();
+    $("#refresh").tooltip();
+    $(".target_button").tooltip();
+    $("#more_options").tooltip();
+
+
+    window.ReportsInfo = {} // init the variable that will contain subreports info
+    window.AllTargets = new Array()
+    var REPORT_PREFIX = '__rep__'
+    var AllCounters = new Array('filterinfo_counter','filterfav_counter','filterno_flag_counter','filterflag_counter','filterunseen_counter','filterseen_counter','filternotes_counter','filterattention_orange_counter','filterbonus_red_counter','filterstar_3_counter','filtercheck_green_counter','filterbug_counter','filterflag_white_counter','filterflag_blue_counter','filterflag_yellow_counter','filterflag_red_counter','filterflag_violet_counter')
+    var NetMap = {ip: {"80": [q]}}
+    var PluginDelim = '__'
+    var SeverityWeightOrder = new Array('flag_white', 'bonus_red','flag_violet','flag_red','flag_yellow','flag_blue','bug')
+    var PassedTestIcons = new Array('check_green')
+    var SeverityFlags = new Array('flag_white', 'flag_violet','flag_red','flag_yellow','flag_blue')
+    var TypeFlags = new Array("star_3","attention_orange","bonus_red","bug","check_green")
+    var FlagIcons = {
+        "N":"",
+        "fav":"icon-heart",
+        "star_3":"icon-asterisk",
+        "attention_orange":"icon-warning-sign",
+        "bonus_red": "icon-fire",
+        "bug":"icon-bug",
+        "check_green":"icon-thumbs-up",
+        "flag_white":"icon-remove-circle",
+        "flag_blue":"icon-arrow-down",
+        "flag_yellow":"icon-arrow-right",
+        "flag_red":"icon-arrow-up",
+        "flag_violet":"icon-exclamation-sign"
+    }
+</script>
+<script>
+    if (!q) {
+        $(".q_url").text('No target selected');
+        $(".ip_url").text('Unavailable');
+        $(".port_url").text('--');
+        $('#main').prepend('<div class="alert alert-warning"><strong>No target provided.</strong> Use the form on the landing page to generate a contextualised report.</div>');
+    } else {
+        $(".q_url").text(q);
+        $(".ip_url").text(ip);
+        $(".port_url").text(port);
+    }
+    $(".date_url").text(date);
+    // load subreports
+    $(".subreport").each(function(){
+        /*$.ajax({
+         url:$(this).data('value'),
+         async:true,
+         success: function(result){
+         $(this).html(result);
+         }
+         });*/
+        $(this).load($(this).data('value'));
+
+    });
+
+    $(".subreport_refresh").click(function(){
+        target_subreport = $(this).data('value');
+        $(target_subreport).load($(target_subreport).data('value'));
+        $('html, body').animate({
+            scrollTop: $(this).offset().top - 40
+        }, 500);
+    });
+
+    $(".subreport_refresh").click(function(){
+        target_subreport = $(this).data('value');
+        $(target_subreport).load($(target_subreport).data('value'));
+        $('html, body').animate({
+            scrollTop: $(this).offset().top - 40
+        }, 500);
+    });
+
+    $(".subreport_collapse").click(function(){
+        target_subreport = $(this).data('value');
+        $(target_subreport + " .collapse").collapse('hide')
+    });
+
+    $(".subreport_expand").click(function(){
+        target_subreport = $(this).data('value');
+        $(target_subreport + " .collapse").collapse('show')
+        //$(target_subreport + " .first_tab").tab('show')
+    });
+
+    $('.target_jumper').click(function (e) {
+        $("#mainmenu a[href='#filter']").tab('show');
+        target_subreport = $(this).data("value");
+        $('html, body').animate({
+            scrollTop: $(target_subreport).offset().top - 40
+        }, 500);
+
+    })
+
+</script>
+<script type="text/javascript" src="includes/owtf_general.js"></script>
+<script type="text/javascript" src="includes/owtf_review.js"></script>
+<script type="text/javascript" src="includes/owtf_filter.js"></script>
+<script type="text/javascript" src="includes/owtf_reporting.js"></script>
+<script type="text/javascript" src="includes/jsonStringify.js"></script>
+<script type="text/javascript" src="includes/ckeditor/ckeditor.js"></script>
+<script type="text/javascript" src="includes/ckeditor/adapters/jquery.js"></script>
+<script type="text/javascript" src="includes/owtf_localStorage.js"></script>
+
+
+</body>
+</html>
diff --git a/online-passive-scanner/report.html b/online-passive-scanner/report.html
index b0a137a..6bfff66 100644
--- a/online-passive-scanner/report.html
+++ b/online-passive-scanner/report.html
@@ -1,1237 +1,27 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.2/css/bootstrap.min.css" />
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.2/css/bootstrap-responsive.min.css" />
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.1/css/font-awesome.min.css" />
-    <script type="text/javascript">
-      const isGithubPages =
-        window.location.hostname === "owtf.github.io" &&
-        window.location.pathname.startsWith("/online-passive-scanner");
-
-      if (isGithubPages && window.location.protocol === "http:") {
-        const { host, pathname, search, hash } = window.location;
-        window.location.replace("https://" + host + pathname + search + hash);
-      }
-
-      const parameters = window.location.hash.substring(1).split("&");
-      const [keyValue] = parameters;
-      const [, rawQuery = ""] = (keyValue || "").split("=");
-      window.q = decodeURIComponent(rawQuery || "");
-      window.date = new Date();
-
-        function subDomain(url)
-        {
-            url = url.replace(new RegExp(/^\s+/), "");
-            url = url.replace(new RegExp(/\s+$/), "");
-            url = url.replace(new RegExp(/\\/g), "/");
-            url = url.replace(new RegExp(/^http\:\/\/|^https\:\/\/|^ftp\:\/\//i), "");
-            url = url.replace(new RegExp(/^www\./i), "");
-            url = url.replace(new RegExp(/\/(.*)/), "");
-
-            if (url.match(new RegExp(/\.[a-z]{2,3}\.[a-z]{2}$/i)))
-            {
-                url = url.replace(new RegExp(/\.[a-z]{2,3}\.[a-z]{2}$/i), "");
-            }
-
-            else if (url.match(new RegExp(/\.[a-z]{2,4}$/i)))
-            {
-                url = url.replace(new RegExp(/\.[a-z]{2,4}$/i), "");
-            }
-
-            var subDomain = (url.match(new RegExp(/\./g))) ? true : false;
-            return (subDomain);
-
-        }
-
-        function parseUrl(url)
-        {
-            var parser = document.createElement('a');
-            parser.href = url;
-            var datas = [parser.hostname, parser.port, parser.pathname];
-            return (datas);
-        }
-
-        function printer(test_var)
-        {
-            var k = "";
-            k = test_var.toString();
-            var k1 = addhttp(k);
-            q = k1[0];
-            scheme = k1[2];
-            k = k1[1];
-            k = parseUrl(k);
-            return k;
-        }
-
-        function addhttp(url)
-        {
-            var k3 = ""
-            if (url.match(/http:\/\//))
-            {
-                url = url.substring(7);
-                k3 = "http://"
-            }
-
-            if (url.match(/https:\/\//))
-            {
-                url = url.substring(8);
-                k3 = "https://"
-            }
-
-            var k = "";
-            k = url;
-            if (url.match(/^www\./))
-            {
-                url = url.substring(4);
-            }
-
-            if (!/^(f|ht)tps?:\/\//i.test(url))
-            {
-                url = "http://" + url;
-            }
-            var k2 = [k, url, k3]
-            return k2;
-        }
-
-        //var q = 'https://demo.testfire.net:1234/hey'
-        //var output = document.getElementById('output');
-        var temp = "";
-        var hosts = "";
-        var port = "";
-        var scheme = "";
-        var path = "";
-        var sub = "";
-
-        var datas = printer(q);
-
-        sub = datas[0];
-        port = datas[1];
-        path = datas[2];
-
-        if (!subDomain(sub))
-        {
-            hosts = sub;
-        }
-        else
-        {
-            hosts = sub.split(".")[1] + "." + sub.split(".")[2];
-        };
-
-        if (!port)
-        {
-            port = 80;
-        }
-        if (!scheme)
-        {
-            scheme = 'http://';
-        }
-
-        var ip='Resolving…';
-        (function resolveIp(target) {
-            if (!target) {
-                ip = 'Unavailable';
-                if (window.jQuery) {
-                    jQuery('.ip_url').text(ip);
-                }
-                return;
-            }
-            var lookup = encodeURIComponent(target);
-            fetch('https://dns.google/resolve?name=' + lookup)
-                .then(function(response) {
-                    if (!response.ok) {
-                        throw new Error('Network response was not ok');
-                    }
-                    return response.json();
-                })
-                .then(function(payload) {
-                    if (payload.Answer && payload.Answer.length) {
-                        for (var i = 0; i < payload.Answer.length; i++) {
-                            var answer = payload.Answer[i];
-                            if (answer.type === 1 && answer.data) {
-                                ip = answer.data;
-                                if (window.jQuery) {
-                                    jQuery('.ip_url').text(ip);
-                                }
-                                break;
-                            }
-                        }
-                    }
-                    if (!ip) {
-                        ip = 'Unavailable';
-                        if (window.jQuery) {
-                            jQuery('.ip_url').text(ip);
-                        }
-                    }
-                })
-                .catch(function() {
-                    ip = 'Unavailable';
-                    if (window.jQuery) {
-                        jQuery('.ip_url').text(ip);
-                    }
-                });
-        })(q);
-    </script>
-
-    <title>OWASP OWTF Report</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="OWASP OWTF Report">
-    <meta name="author" content="OWASP OWTF Team">
-    <style>
-        body {
-            position: relative;
-            min-height: 100vh;
-        }
-
-        .github-ribbon {
-            position: fixed;
-            top: 1rem;
-            right: -3.5rem;
-            display: block;
-            width: 12rem;
-            padding: 0.75rem 0;
-            background: linear-gradient(135deg, #1f2328, #24292f);
-            color: #f8fbff;
-            text-align: center;
-            text-decoration: none;
-            font-weight: 600;
-            font-size: 0.9rem;
-            letter-spacing: 0.05em;
-            text-transform: uppercase;
-            transform: rotate(45deg);
-            transform-origin: top right;
-            box-shadow: 0 6px 12px rgba(15, 23, 42, 0.35);
-            z-index: 1000;
-        }
-
-        .github-ribbon:focus-visible {
-            outline: 2px solid #f0f6ff;
-            outline-offset: 2px;
-        }
-
-        @media (max-width: 576px) {
-            .github-ribbon {
-                width: 10rem;
-                right: -3rem;
-                font-size: 0.75rem;
-            }
-        }
-
-        .nav-tabs-container {
-            padding: 3px;
-            border: 1px solid #d9d9d9;
-            border-radius: 4px;
-        }
-    </style>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <title>Redirecting to passive scanner report...</title>
+  <meta http-equiv="refresh" content="0; url=/passive-scanner/report/" />
+  <script>
+    (function () {
+      var destination = '/passive-scanner/report/' + (window.location.hash || '');
+      window.location.replace(destination);
+    })();
+  </script>
 </head>
 <body>
-       <div class="container">
-        <a href="https://github.com/owtf/online-passive-scanner" aria-label="Fork me on GitHub" class="github-ribbon">Fork me on GitHub</a>
-        <!-- start page header -->
-        <div class="page-header row">
-            <div class="col col-md-3">
-                <a href="http://www.owtf.org" >
-                    <img src="images/owtf-logo.svg" class="img-rounded" height="150" width="150" alt="OWASP OWTF Logo">
-                </a>
-            </div>
-            <div class="col col-md-9">
-                <h5>                Online Passive Scanner
-                <small>
-                Version: 1.0.1
-                , Release <b>Lionheart</b>
-                <span class="hidden">, Seed <sup><span class="hidden" id="seed"> 2NfaMaxkF_ </span></sup></span>
-                </small></h5>
-            </div>
-        </div>
-        <!-- end page header -->
-<!--  navbar row-->
-<div class="row">
-        <ul class="nav nav-pills nav-justified">
-                        <li class="active"><a href="#main" data-toggle="tab">Home</a></li>
-                        <li class=""><a href="#filter" data-toggle="tab">Browse</a></li>
-                        <li><a href="#review" data-toggle="tab">Review</a></li>
-                        <!--
-                   <li class="divider-vertical"></li>
-
-                              <li class="dropdown">
-                                        <a class="dropdown-toggle"
-                                            data-toggle="dropdown"
-                                        href="#">
-                                        Targets (4)
-                                        <b class="caret"></b>
-                                        </a>
-                                        <ul class="dropdown-menu">
-                                          <li><a> 193.168.77.199</a></li>
-                                          </ul>
-                                  </li>
-                     <li class="dropdown">
-                                        <a class="dropdown-toggle"
-                                            data-toggle="dropdown"
-                                        href="#">
-                                        Plugins (23)
-                                        <b class="caret"></b>
-                                        </a>
-                                        <ul class="dropdown-menu">
-                                          <li><a> OWASP-IG-005 <small>Application Discovery</small></a></li>
-                                          </ul>
-                                  </li>
-                      -->
-                        <li class="divider-vertical"></li>
-                        <li class="dropdown">
-                            <a class="dropdown-toggle"
-                               data-toggle="dropdown"
-                               href="#">
-                                Links
-                                <b class="caret"></b>
-                            </a>
-                            <ul class="dropdown-menu">
-                                <li class="dropdown-submenu">
-                                    <a tabindex="-1" href="#">Exploitation</a>
-                                    <ul class="dropdown-menu">
-                                        <li><a href="http://hackvertor.co.uk/public" target="_blank"> Hackvertor </a></li>
-                                        <!--  <li><a href="http://hackarmoury.com/" target="_blank"> Hackarmoury </a></li> -->
-                                        <li><a href="http://www.exploit-db.com/" target="_blank"> ExploitDB </a></li>
-                                        <li><a href="http://www.exploitsearch.net/" target="_blank"> ExploitSearch </a></li>
-                                        <li><a href="http://www.hakipedia.com/index.php/Hakipedia" target="_blank"> Hackipedia </a></li>
-                                    </ul>
-                                </li>
-                                <li class="dropdown-submenu">
-                                    <a tabindex="-1" href="#">Methodology</a>
-                                    <ul class="dropdown-menu">
-                                        <li><a href="https://www.owasp.org/index.php/OWASP_Testing_Guide_v3_Table_of_Contents" target="_blank"> OWASP </a></li>
-                                        <li><a href="http://www.pentest-standard.org/index.php/Main_Page" target="_blank"> Pentest Standard </a></li>
-                                        <li><a href="http://www.isecom.org/osstmm/"> OSSTMM </a></li>
-
-                                    </ul>
-                                </li>
-                                <li class="dropdown-submenu">
-                                    <a tabindex="-1" href="#">Calculators</a>
-                                    <ul class="dropdown-menu">
-                                        <li><a href="http://nvd.nist.gov/cvss.cfm?adv&calculator&version=2" target="_blank"> CVSS Advanced </a></li>
-                                        <li><a href="http://nvd.nist.gov/cvss.cfm?calculator&version=2" target="_blank"> CVSS Normal </a></li>
-
-                                    </ul>
-                                </li>
-                                <li class="dropdown-submenu">
-                                    <a tabindex="-1" href="#">Test/Learn</a>
-                                    <ul class="dropdown-menu">
-                                        <li><a href="http://www.owasp.org/index.php?title=OWASP_Vulnerable_Web_Applications_Directory_Project" target="_blank"> OWASP VWAD </a></li>
-                                        <li><a href="http://securitythoughts.wordpress.com/2010/03/22/vulnerable-web-applications-for-learning/" target="_blank"> Securitythoughts </a></li>
-                                        <li><a href="http://danielmiessler.com/projects/webappsec_testing_resources/" target="_blank"> Danielmiessler </a></li>
-
-                                    </ul>
-                                </li>
-
-
-                            </ul>
-
-                        </li>
-                    </ul>
-<!--  end navbar row -->
-
-<!-- start Content -->
-<div class="row">
-<div class="span12">
-<div class="tab-content">
-<div class="tab-pane active" id="main">
-
-    <div class="row-fluid">
-        <div class="span7">
-
-            <h3>Status <small
-
-                    class="text-success"
-
-                    > Complete  </small></h3>
-
-            <div><span class="icon-stack"><i class="icon-circle icon-stack-base"></i><i class="icon-terminal icon-light"></i></span> <strong>Command: </strong>owtf.py -t passive <span class="q_url"> </span></div>
-            <div><span class="icon-stack"><i class="icon-circle icon-stack-base"></i><i class="icon-screenshot icon-light"></i></span> <strong>Target: </strong><span class="q_url"> </span>(<span class="ip_url"> </span>) <i class="icon-link"></i></a></div>
-            <!--  <div><span class="icon-stack"><i class="icon-circle icon-stack-base"></i><i class="icon-stethoscope icon-light"></i></span> <strong>Last plugin: </strong>{ current_plugin }</div>-->
-            <!--   <div><span class="icon-stack"><i class="icon-circle icon-stack-base"></i><i class="icon-spinner icon-light"></i></span> <strong>Completion rate: </strong>{ completed_targets_nb }/{ total_targets_nb } targets - {completed_plugins_nb}/{total_plugins_nb} plugins</div> -->
-
-
-
-            <h3> History </h3>
-            <table class="table table-bordered table-striped table-hover">
-                <thead>
-                <tr>
-                    <th> N° </th>
-                    <th> START </th>
-                    <th> END </th>
-                    <th> COMMAND </th>
-                    <th> STATUS </th>
-                </tr>
-                </thead>
-                <tbody>
-
-                <tr
-
-                        class="text-success"
-
-                        >
-                    <td> 1 </td>
-                    <td> <span class="date_url"> </span> </td>
-                    <td> <span class="date_url"> </span> </td>
-                    <td> owtf.py -t passive <span class="q_url"> </span> </td>
-                    <td> Complete </td>
-                </tr>
-
-                <!--
-                <tr class="text-warning">
-                    <td>3</td>
-                    <td>owtf.py www.esi.dz</td>
-                    <td> 16/06/2013-18:40 </td>
-                    <td> 16/06/2013-18:42 </td>
-                    <td>2m, 14s, 478ms</td>
-                    <td>Aborted by user</td>
-                </tr>
-                <tr class="text-success">
-                    <td>2</td>
-                    <td>owtf.py www.esi.dz</td>
-                    <td> 16/06/2013-18:40 </td>
-                    <td> 16/06/2013-18:42 </td>
-                    <td>2m, 14s, 478ms</td>
-                    <td>Completed</td>
-                </tr>
-                <tr class="text-error">
-                    <td>1</td>
-                    <td>owtf.py www.esi.dz</td>
-                    <td> 16/06/2013-18:40 </td>
-                    <td> 16/06/2013-18:42 </td>
-                    <td>2m, 14s, 478ms</td>
-                    <td>Crashed</td>
-                </tr>
-                 -->
-                </tbody>
-            </table>
-
-            <!--
-            #Not implemented yet
-            <h3> Stats </h3>
-            +analysin stats
-            +review stats
-            <hr/> -->
-
-
-        </div>
-        <div class="span5">
-            <div class="well well-small">
-                <h3><i class="icon-screenshot"></i> Target <small>(1)</small> </h3>
-                <ul>
-
-
-
-
-                    <li><a href="#" class="target_jumper" data-value="#iframe_"> <span class="q_url"> </span> (<span class="ip_url"> </span>)</a></li>
-
-
-
-                </ul>
-            </div>
-            <!--
-            <div class="well well-small">
-                <h3><i class="icon-stethoscope"></i> Test Plugins <small>(25)</small></h3>
-                    <ul>
-                        <li><a href="link_to_plugin">OWASP-IG-01</a>  </li>
-                        <li><a href="link_to_plugin">OWASP-IG-02</a></li>
-                        <li><a href="link_to_plugin">OWASP-IG-03</a></li>
-                        <li><a href="link_to_plugin">OWASP-IG-04</a></li>
-                    </ul>
-            </div>
-            -->
-        </div>
-    </div>
-</div>
-<div class="tab-pane" id="filter">
-<!--  Filter Proto #4  -->
-<div class="row-fluid">
-    <div class="span12">
-        <div class="btn-toolbar">
-            <div class="btn-group" data-toggle="buttons-checkbox">
-                <button id="filterinfo" class="btn btn-info filter"  onclick="FilterResultsSummary('info', 'NetMap',this)" rel="tooltip" data-original-title="Completed" data-placement="bottom"><i class="icon-ok icon-white"></i> <span id="filterinfo_counter" class="counter"></span></button>
-            </div>
-            <div class="btn-group " data-toggle="buttons-checkbox">
-                <button class="btn filter" onclick="FilterResultsSummary('flag', 'NetMap',this)" rel="tooltip" data-original-title="Flagged" data-placement="bottom"><i class="icon-flag"></i>  <span id="filterflag_counter" class="counter"></span></button>
-                <button class="btn filter" onclick="FilterResultsSummary('no_flag', 'NetMap',this)" rel="tooltip" data-original-title="Not Flagged" data-placement="bottom"><i class="icon-flag-alt"></i>  <span id="filterno_flag_counter" class="counter"></span></button>
-            </div>
-            <div class="btn-group" data-toggle="buttons-checkbox">
-                <button onclick="FilterResultsSummary('fav', 'NetMap',this)" class="btn filter" rel="tooltip" data-original-title="Favorated" data-placement="bottom"><i class="icon-heart icon-white"></i> <span id="filterfav_counter"></span></button>
-            </div>
-            <div class="btn-group" data-toggle="buttons-checkbox">
-                <button  id="filternotes"  onclick="FilterResultsSummary('notes', 'NetMap',this)" class="btn  filter" rel="tooltip" data-original-title="Commented" data-placement="bottom"><i class="icon-comment icon-white"></i> <span id="filternotes_counter"></span></button>
-            </div>
-
-            <div class="btn-group" data-toggle="buttons-checkbox">
-                <button  id="filterunseen" onclick="FilterResultsSummary('unseen', 'NetMap',this)" class="btn filter" rel="tooltip" data-original-title="Not seen" data-placement="bottom"><i class="icon-eye-close icon-white"></i> <span id="filterunseen_counter" class="counter"></span></button>
-                <button id="filterseen" onclick="FilterResultsSummary('seen', 'NetMap',this)" class="btn filter" rel="tooltip" data-original-title="Seen" data-placement="bottom"><i class="icon-eye-open icon-white"></i> <span id="filterseen_counter" class="counter"></span></button>
-            </div>
-
-            <div class="btn-group" data-toggle="buttons-checkbox">
-                <button id="filterstar_3" onclick="FilterResultsSummary('star_3', 'NetMap',this)" class="btn btn-inverse filter" rel="tooltip" data-original-title="Unknown" data-placement="bottom"><i class="icon-asterisk  icon-white"></i> <span  id="filterstar_3_counter"></span></button>
-                <button id="filterattention_orange" onclick="FilterResultsSummary('attention_orange', 'NetMap',this)" class="btn btn-warning filter" rel="tooltip" data-original-title="Warning" data-placement="bottom"><i class="icon-warning-sign icon-white"></i> <span id="filterattention_orange_counter"></span></button>
-                <button id="filterbonus_red" onclick="FilterResultsSummary('bonus_red', 'NetMap',this)" class="btn btn-danger filter" rel="tooltip" data-original-title="Exploitable" data-placement="bottom"><i class="icon-fire icon-white"></i> <span id="filterbonus_red_counter"></span></button>
-                <button id="filterbug" onclick="FilterResultsSummary('bug', 'NetMap',this)" class="btn btn-info  filter" rel="tooltip" data-original-title="Logic Bug" data-placement="bottom"><i class="icon-bug icon-white"></i> <span id="filterbug_counter"></span></button>
-                <button id="filtercheck_green" onclick="FilterResultsSummary('check_green', 'NetMap',this)" class="btn btn-success filter " rel="tooltip" data-original-title="Test passed" data-placement="bottom"><i class="icon-thumbs-up icon-white"></i> <span  id="filtercheck_green_counter"></span></button>
-            </div>
-
-            <div class="btn-group" data-toggle="buttons-checkbox">
-                <button id="filterflag_violet" onclick="FilterResultsSummary('flag_violet', 'NetMap',this)" class="btn sev-critic filter" rel="tooltip" data-original-title="Critical severity" data-placement="bottom"><i class="icon-exclamation-sign icon-white"></i> <span id="filterflag_violet_counter"></span></button>
-                <button id="filterflag_red" onclick="FilterResultsSummary('flag_red', 'NetMap',this)" class="btn sev-hi filter" rel="tooltip" data-original-title="High severity" data-placement="bottom"><i class="icon-arrow-up icon-white"></i> <span id="filterflag_red_counter"></span></button>
-                <button id="filterflag_yellow" onclick="FilterResultsSummary('flag_yellow', 'NetMap',this)" class="btn sev-med filter" rel="tooltip" data-original-title="Medium severity" data-placement="bottom"><i class="icon-arrow-right icon-white"></i> <span id="filterflag_yellow_counter"></span></button>
-                <button id="filterflag_blue"  onclick="FilterResultsSummary('flag_blue', 'NetMap',this)" class="btn sev-low filter" rel="tooltip" data-original-title="Low severity" data-placement="bottom"><i class="icon-arrow-down icon-white"></i> <span id="filterflag_blue_counter"></span></button>
-                <button id="filterflag_white" onclick="FilterResultsSummary('flag_white', 'NetMap',this)" class="btn sev-no filter" rel="tooltip" data-original-title="No severity" data-placement="bottom"><i class="icon-remove-circle icon-white"></i> <span id="filterflag_white_counter"></span></button>
-            </div>
-
-            <div class="btn-group">
-                <a href="#more_filters_modal" role="button" class="btn filter" data-toggle="modal" rel="tooltip" data-original-title="More filters" data-placement="bottom"><i class="icon-filter icon-white"></i></a>
-                <button onclick="FilterResultsSummary('delete', 'NetMap',this)"  class="btn filter" rel="tooltip" data-original-title="Clear filters" data-placement="bottom"><i class="icon-ban-circle icon-white"></i></button>
-                <button onclick="FilterResultsSummary('refresh', 'NetMap',this)" id="refresh" class="btn" rel="tooltip" data-original-title="Refresh" data-placement="bottom"><i class="icon-refresh icon-white"></i></button>
-            </div>
-            <span class="label label-success pull-right counter" rel="tooltip" data-original-title="Number of plugins that matched the search" data-placement="bottom"><strong> Matches:<span id="filtermatches_counter" >--</span></strong></span>
-        </div>
-
-    </div>
-</div>
-<!--  End Filter Proto #4  -->
-
-<!-- Modal more-filters -->
-<div id="more_filters_modal" class="modal hide fade" style="width: 700px;" tabindex="-1" role="dialog" aria-labelledby="more_filters_modal_label" aria-hidden="true">
-<div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="more_filters_modal_label">More filters</h3>
-</div>
-<div class="modal-body" >
-<table >
-<tr>
-    <th colspan="3">Plugin Groups</th>
-</tr>
-<tr >
-    <td colspan="3">
-        <select multiple='multiple'  id='SelectPluginGroup'  size='3' onchange='SetSelectFilterOptions(this)' style="width:100%;">
-
-            <option value="aux">
-                aux
-            </option>
-
-            <option value="net">
-                net
-            </option>
-
-            <option value="web">
-                web
-            </option>
-
-        </select>
-
-    </td>
-</tr>
-<tr>
-    <th>Web Plugin Types</th>
-    <th>Aux Plugin Types</th>
-    <th>Net Plugin Types</th>
-</tr>
-<tr>
-    <td>
-        <select multiple='multiple'  id='SelectPluginTypesWeb' size='5' onchange='SetSelectFilterOptions(this)'>
-
-            <option value="active">
-                active
-            </option>
-
-            <option value="external">
-                external
-            </option>
-
-            <option value="grep">
-                grep
-            </option>
-
-            <option value="passive">
-                passive
-            </option>
-
-            <option value="semi_passive">
-                semi_passive
-            </option>
-
-        </select>
-    </td>
-    <td>
-        <select multiple='multiple'  id='SelectPluginTypesAux' size='5' onchange='SetSelectFilterOptions(this)'>
-
-            <option value="bruteforce">
-                bruteforce
-            </option>
-
-            <option value="dos">
-                dos
-            </option>
-
-            <option value="exploit">
-                exploit
-            </option>
-
-            <option value="rce">
-                rce
-            </option>
-
-            <option value="se">
-                se
-            </option>
-
-            <option value="selenium">
-                selenium
-            </option>
-
-            <option value="smb">
-                smb
-            </option>
-
-        </select>
-    </td>
-    <td>
-        <select multiple='multiple'  id='SelectPluginTypesNet' size='5' onchange='SetSelectFilterOptions(this)'>
-
-            <option value="active">
-                active
-            </option>
-
-            <option value="bruteforce">
-                bruteforce
-            </option>
-
-        </select>
-    </td>
-</tr>
-
-<tr>
-    <th colspan="3" >Web Test Groups</th>
-</tr>
-<tr>
-
-
-<td colspan="3" >
-<select multiple='multiple' style="width:100%;"  id='SelectWebTestGroups' size='5' onchange='SetSelectFilterOptions(this)'>
-
-<option value="OWASP-IG-001">
-    OWASP-IG-001 - Spiders, Robots, and Crawlers (robots.txt Analysis)
-</option>
-
-<option value="OWASP-IG-002">
-    OWASP-IG-002 - Search engine discovery/reconnaissance (Google Hacking, Metadata)
-</option>
-
-<option value="OWASP-IG-003">
-    OWASP-IG-003 - Identify application entry points (Crawling)
-</option>
-
-<option value="OWASP-IG-004">
-    OWASP-IG-004 - Web Application Fingerprint (What is that site running?)
-</option>
-
-<option value="OWASP-IG-005">
-    OWASP-IG-005 - Application Discovery (Port Scanning, Whois)
-</option>
-
-<option value="OWASP-IG-006">
-    OWASP-IG-006 - Testing for Error Code (Error Messages)
-</option>
-
-<option value="OWASP-CM-001">
-    OWASP-CM-001 - Testing for SSL-TLS (SSL Testing)
-</option>
-
-<option value="OWASP-CM-002">
-    OWASP-CM-002 - Testing for DB Listener (DB Service Testing)
-</option>
-
-<option value="OWASP-CM-003">
-    OWASP-CM-003 - Infrastructure Configuration Management (WAF, Load Balancer, Rev Proxy, User Agent)
-</option>
-
-<option value="OWASP-CM-004">
-    OWASP-CM-004 - Application Configuration Management (Comments, Source code disclosure)
-</option>
-
-<option value="OWASP-CM-005">
-    OWASP-CM-005 - File Extensions Handling (File uploads, etc)
-</option>
-
-<option value="OWASP-CM-006">
-    OWASP-CM-006 - Old, Backup and Unreferenced Files (DirBuster, directory/file bruteforce)
-</option>
-
-<option value="OWASP-CM-007">
-    OWASP-CM-007 - Testing for Admin Interfaces (Admin interface)
-</option>
-
-<option value="OWASP-CM-008">
-    OWASP-CM-008 - HTTP Methods and XST (PUT, TRACE, WebDAV, etc)
-</option>
-
-<option value="OWASP-AT-001">
-    OWASP-AT-001 - Testing for Credentials Transport (Passwords in clear-text)
-</option>
-
-<option value="OWASP-AT-002">
-    OWASP-AT-002 - Testing for User Enumeration (User Enumeration)
-</option>
-
-<option value="OWASP-AT-003">
-    OWASP-AT-003 - Default or Guessable User Account (Default accounts)
-</option>
-
-<option value="OWASP-AT-004">
-    OWASP-AT-004 - Testing for Brute Force (Brute Force)
-</option>
-
-<option value="OWASP-AT-005">
-    OWASP-AT-005 - Bypassing Authentication Schema ()
-</option>
-
-<option value="OWASP-AT-006">
-    OWASP-AT-006 - Vulnerable Remember Password and Pwd Reset ()
-</option>
-
-<option value="OWASP-AT-007">
-    OWASP-AT-007 - Logout and Browser Cache Management ()
-</option>
-
-<option value="OWASP-AT-008">
-    OWASP-AT-008 - Testing for Captcha ()
-</option>
-
-<option value="OWASP-AT-009">
-    OWASP-AT-009 - Multiple Factors Authentication ()
-</option>
-
-<option value="OWASP-AT-010">
-    OWASP-AT-010 - Race Conditions ()
-</option>
-
-<option value="OWASP-SM-001">
-    OWASP-SM-001 - Session Management Schema ()
-</option>
-
-<option value="OWASP-SM-002">
-    OWASP-SM-002 - Cookies Attributes ()
-</option>
-
-<option value="OWASP-SM-003">
-    OWASP-SM-003 - Session Fixation ()
-</option>
-
-<option value="OWASP-SM-004">
-    OWASP-SM-004 - Exposed Session Variables ()
-</option>
-
-<option value="OWASP-SM-005">
-    OWASP-SM-005 - Testing for CSRF ()
-</option>
-
-<option value="OWASP-AZ-001">
-    OWASP-AZ-001 - Path Traversal ()
-</option>
-
-<option value="OWASP-AZ-002">
-    OWASP-AZ-002 - Bypassing Authorization Schema ()
-</option>
-
-<option value="OWASP-AZ-003">
-    OWASP-AZ-003 - Privilege Escalation ()
-</option>
-
-<option value="OWASP-BL-001">
-    OWASP-BL-001 - Business Logic ()
-</option>
-
-<option value="OWASP-DV-001">
-    OWASP-DV-001 - Reflected Cross Site Scripting ()
-</option>
-
-<option value="OWASP-DV-002">
-    OWASP-DV-002 - Stored Cross Site Scripting ()
-</option>
-
-<option value="OWASP-DV-003">
-    OWASP-DV-003 - DOM-based Cross Site Scripting ()
-</option>
-
-<option value="OWASP-DV-004">
-    OWASP-DV-004 - Cross Site Flashing ()
-</option>
-
-<option value="OWASP-DV-005">
-    OWASP-DV-005 - SQL Injection ()
-</option>
-
-<option value="OWASP-DV-006">
-    OWASP-DV-006 - LDAP Injection ()
-</option>
-
-<option value="OWASP-DV-007">
-    OWASP-DV-007 - ORM Injection ()
-</option>
-
-<option value="OWASP-DV-008">
-    OWASP-DV-008 - XML Injection ()
-</option>
-
-<option value="OWASP-DV-009">
-    OWASP-DV-009 - SSI Injection ()
-</option>
-
-<option value="OWASP-DV-010">
-    OWASP-DV-010 - XPath Injection ()
-</option>
-
-<option value="OWASP-DV-011">
-    OWASP-DV-011 - SMTP Injection ()
-</option>
-
-<option value="OWASP-DV-012">
-    OWASP-DV-012 - Code Injection ()
-</option>
-
-<option value="OWASP-DV-013">
-    OWASP-DV-013 - Command Injection ()
-</option>
-
-<option value="OWASP-DV-014">
-    OWASP-DV-014 - Buffer Overflow ()
-</option>
-
-<option value="OWASP-DV-015">
-    OWASP-DV-015 - Incubated Vulnerability ()
-</option>
-
-<option value="OWASP-DV-016">
-    OWASP-DV-016 - HTTP Splitting/Smuggling ()
-</option>
-
-<option value="OWASP-DS-001">
-    OWASP-DS-001 - SQL Wildcard Attacks ()
-</option>
-
-<option value="OWASP-DS-002">
-    OWASP-DS-002 - DoS Locking Customer Accounts ()
-</option>
-
-<option value="OWASP-DS-003">
-    OWASP-DS-003 - DoS Buffer Overflows ()
-</option>
-
-<option value="OWASP-DS-004">
-    OWASP-DS-004 - DoS User Specified Object Allocation ()
-</option>
-
-<option value="OWASP-DS-005">
-    OWASP-DS-005 - User Input as a Loop Counter ()
-</option>
-
-<option value="OWASP-DS-006">
-    OWASP-DS-006 - Writing User Provided Data to Disk ()
-</option>
-
-<option value="OWASP-DS-007">
-    OWASP-DS-007 - DoS Failure to Release Resources ()
-</option>
-
-<option value="OWASP-DS-008">
-    OWASP-DS-008 - Storing too Much Data in Session ()
-</option>
-
-<option value="OWASP-WS-001">
-    OWASP-WS-001 - WS Information Gathering ()
-</option>
-
-<option value="OWASP-WS-002">
-    OWASP-WS-002 - Testing WSDL ()
-</option>
-
-<option value="OWASP-WS-003">
-    OWASP-WS-003 - Testing for XML Structural ()
-</option>
-
-<option value="OWASP-WS-004">
-    OWASP-WS-004 - Testing for XML Content-Level ()
-</option>
-
-<option value="OWASP-WS-005">
-    OWASP-WS-005 - WS HTTP GET parameters/REST attacks ()
-</option>
-
-<option value="OWASP-WS-006">
-    OWASP-WS-006 - Naughty SOAP Attachments ()
-</option>
-
-<option value="OWASP-WS-007">
-    OWASP-WS-007 - Testing for WS Replay ()
-</option>
-
-<option value="OWASP-AJ-001">
-    OWASP-AJ-001 - Testing for AJAX Vulnerabilities ()
-</option>
-
-<option value="OWASP-AJ-002">
-    OWASP-AJ-002 - Testing for AJAX ()
-</option>
-
-<option value="OWTF-WGP-001">
-    OWTF-WGP-001 - ClickJacking (ClickJacking)
-</option>
-
-<option value="OWTF-WGP-002">
-    OWTF-WGP-002 - Cross Origin Resource Sharing (CORS) (CORS)
-</option>
-
-<option value="OWTF-WVS-001">
-    OWTF-WVS-001 - Arachni Unauthenticated ()
-</option>
-
-<option value="OWTF-WVS-002">
-    OWTF-WVS-002 - Nikto Unauthenticated ()
-</option>
-
-<option value="OWTF-WVS-003">
-    OWTF-WVS-003 - Wapiti Unauthenticated ()
-</option>
-
-<option value="OWTF-WVS-004">
-    OWTF-WVS-004 - W3AF Unauthenticated ()
-</option>
-
-<option value="OWTF-WVS-005">
-    OWTF-WVS-005 - WebSecurify Unauthenticated ()
-</option>
-
-<option value="OWTF-WVS-006">
-    OWTF-WVS-006 - Skipfish Unauthenticated ()
-</option>
-
-</select>
-</td>
-</tr>
-<tr>
-    <th colspan="3" >Available Targets</th>
-</tr>
-<tr>
-    <td colspan="3">
-        <select multiple="multiple" id="SelectTargets" size='5' style="width:100%;"  onchange='SetSelectFilterOptions(this)'>
-
-
-
-
-            <option value="i65_61_137_117p80">
-                <span class="ip_url"> </span> - <span class="q_url"> </span>
-            </option>
-
-
-
-        </select>
-    </td>
-</tr>
-
-</table>
-
-</div>
-<div class="modal-footer">
-    <button class="btn btn-success" data-dismiss="modal" aria-hidden="true">Save</button>
-    <button class="btn btn-primary" data-dismiss="modal" onclick="FilterResultsSummary('info', 'NetMap',this)">Apply</button>
-</div>
-
-</div>
-
-<!-- NetMap -->
-<div class="row">
-    <div class="span3 hidden-phone">
-        <div  id="sidebar" class="bs-docs-sidebar">
-            <ul class="nav nav-pills nav-stacked bs-docs-sidenav affix ">
-                <li class="nav-header"><i class="icon-screenshot icon-white"> </i> Targets</li>
-
-
-
-
-
-
-
-
-
-                <li id="sb_target"><a href="#"  class="tooltip_sidebar" data-toggle="tooltip" data-placement="right" title="" data-original-title=""></a><a><i class="icon-chevron-right"></i> <span class="q_url"> </span> </a></li>
-
-
-
-
-            </ul>
-        </div>
-    </div>
-    <div class="span9" id="content" data-spy="scroll" data-target="#sidebar">
-
-
-
-
-
-
-
-
-
-        <section id="section_i65_61_137_117p80" class="well well-small">
-            <div class="page-header">
-                <h3><span class="icon-screenshot icon-white"> </span><a href="link" class='dynamicLink'>link</a>
-
-
-                    <script>
-
-                        var href = scheme + q;
-                        var links = document.getElementsByClassName('dynamicLink');
-                        for (var i = 0; i < links.length; i++)
-                        {
-
-                            links[i].href = href;
-                            links[i].innerHTML = href.replace('http://',"http://");
-                        }
-                    </script>
-
-
-                    <small class="">
-                        <span id="ip"><span class="ip_url"> </span></span>:<span id="port"><span class="port_url"> </span></span>
-                    </small>
-		                        
-		                        <span class="btn-group hidden">
-		                        	<a class="btn btn-info disabled" href="#review_modal" role="button" data-toggle="modal">Review</a>
-		                        	<a class="btn btn-info disabled" href="#export_subreport" role="button" data-toggle="modal" >Export</a>
-		                       	</span>
-		                       	<span class="btn-group">
-		                       		<a class="btn btn-primary subreport_expand target_button" href="#" role="button"  data-value="#subreport_i65_61_137_117p80" data-toggle="tooltip" title="Expand all test groups of target"><i class="icon-expand-alt icon-large"></i></a>
-									<a class="btn btn-primary subreport_collapse target_button" href="#" role="button"  data-value="#subreport_i65_61_137_117p80" data-toggle="tooltip" title="Collapse all test groups of target"><i class="icon-check-minus "></i></a>
-		                       	</span>
-                    <a class="btn btn-warning subreport_refresh target_button" href="#" role="button"  data-value="#subreport_i65_61_137_117p80" data-toggle="tooltip" title="Refresh target subreport"><i class="icon-refresh"></i></a>
-                    <a class="btn btn-success subreport_generate target_button" href="#" role="button" onclick="ToggleReportMode('i65_61_137_117p80')" data-value="#subreport_i65_61_137_117p80" data-toggle="tooltip" title="Generate target review report"><i class="icon-magic"></i></a>
-                </h3>
-
-            </div>
-
-            <div id="generated_report_i65_61_137_117p80" class="well" style="display:none">
-                <div id="i65_61_137_117p80__rep__intro" class="muted"></div>
-                <h3> Statistics </h3>
-                <div id="i65_61_137_117p80__rep__stats"></div>
-                <h3> Passed Tests </h3>
-                <div id="i65_61_137_117p80__rep__passed"></div>
-                <h3> Findings </h3>
-                <div id="i65_61_137_117p80__rep__findings"></div>
-                <h3> Unrated </h3>
-                <div id="i65_61_137_117p80__rep__unrated">
-                    <div class="alert"><strong>Alert!</strong> Unimplemented</div>
-                </div>
-            </div>
-
-
-            <div id="subreport_i65_61_137_117p80" class="subreport" data-value="http__target.html">
-								 	<span class="alert alert-warning">
-								 		<i class="icon-spinner icon-spin icon-large"></i> 
-								 			Subreport is not loaded yet ... click <strong>Refresh <i class="icon-refresh"></i></strong> button!   
-								 	</span>
-            </div>
-            <!--
-              <iframe id="iframe_http://demo.testfire.net" src="http__demo.testfire.net.html"   frameborder="0"  width="100%" height="100%" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen>
-                                            Your browser does not support iframes
-                                        </iframe>
-                <div id="ip_http://demo.testfire.net" style = 'display: none'>65.61.137.117</div>
-                <div id="port_http://demo.testfire.net" style = 'display: none'>80</div>
-             -->
-        </section>
-
-
-
-
-    </div>
-</div>
-
-
-<!-- end NetMap -->
-<!-- start AUX -->
-
-<!-- end AUX -->
-</div>
-<div class="tab-pane" id="review">
-    &nbsp;
-    <div class="btn-toolbar">
-        <button class="btn" onclick="ImportReview();">
-            <span> Import </span>
-        </button>
-        <div class="btn-group">
-            <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">Export
-                <span class="caret"></span>
-            </a>
-            <ul class="dropdown-menu">
-                <li><a href="#" onclick="ExportReviewAsText();">TEXT</a></li>
-                <li class="disabled"><a class="disabled" href="#">HTML</a></li>
-                <li class="disabled"><a class="disabled" href="#">PDF</a></li>
-
-            </ul>
-        </div>
-        <button class="btn btn-success disabled">Share</button>
-        <div class="btn-group">
-            <a class="btn btn-danger dropdown-toggle " data-toggle="dropdown" href="#">Delete
-                <span class="caret"></span>
-            </a>
-            <ul class="dropdown-menu">
-                <li><a href="#" onclick="ClearReview();">This review!</a></li>
-                <li><a href="#" onclick="DeleteStorage();">All reviews!</a></li>
-            </ul>
-        </div>
-        <div class="btn-group">
-
-            <a class="btn btn-inverse dropdown-toggle " data-toggle="dropdown" href="#">Memory
-                <span class="caret"></span>
-            </a>
-            <ul class="dropdown-menu">
-                <li><a href="#" onclick="ShowUsedMem();">Show Used Memory (KB)</a></li>
-                <li><a href="#" onclick="ShowUsedMemPercentage();">Show Used Memory (%)</a></li>
-            </ul>
-        </div>
-
-
-
-    </div>
-    <textarea rows="15" cols="100" id="import_export_box" class="span12"></textarea>
-
-</div>
-
-</div>
-</div>
-<!-- end Content -->
-
-<!--  start footer -->
-<div class="container">
-    <br>
-    <hr>
-    <p class="muted credit pull-right">
-        Generated by
-        <a href="http://owtf.org">OWASP OWTF</a>
-        -
-        <a href="https://github.com/owtf/owtf/releases/tag/OWTF_0.45.0">Version 1.0.1 "Lionheart"</a>
-        -
-        <a href="http://github.com/owtf/owtf"> @github <i class="icon-github-alt"></i></a>
-    </p>
-    </div></div></div>
-<!--  end footer -->
-<!-- Placed at the end of the document so the pages load faster -->
-<script src="https://code.jquery.com/jquery-1.12.4.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
-
-<script>
-    $('.tooltip_sidebar').tooltip();
-    // $('#myTab a:first').tab('show');
-    // $('#myTab2 a:first').tab('show');
-    $('#sidebar').affix();
-    //$('body').scrollspy({ target: '#sidebar' });
-    // $("#info").tooltip();
-    $(".filter").tooltip();
-    $(".counter").tooltip();
-    $("#refresh").tooltip();
-    $(".target_button").tooltip();
-    $("#more_options").tooltip();
-
-
-    window.ReportsInfo = {} // init the variable that will contain subreports info
-    window.AllTargets = new Array()
-    var REPORT_PREFIX = '__rep__'
-    var AllCounters = new Array('filterinfo_counter','filterfav_counter','filterno_flag_counter','filterflag_counter','filterunseen_counter','filterseen_counter','filternotes_counter','filterattention_orange_counter','filterbonus_red_counter','filterstar_3_counter','filtercheck_green_counter','filterbug_counter','filterflag_white_counter','filterflag_blue_counter','filterflag_yellow_counter','filterflag_red_counter','filterflag_violet_counter')
-    var NetMap = {ip: {"80": [q]}}
-    var PluginDelim = '__'
-    var SeverityWeightOrder = new Array('flag_white', 'bonus_red','flag_violet','flag_red','flag_yellow','flag_blue','bug')
-    var PassedTestIcons = new Array('check_green')
-    var SeverityFlags = new Array('flag_white', 'flag_violet','flag_red','flag_yellow','flag_blue')
-    var TypeFlags = new Array("star_3","attention_orange","bonus_red","bug","check_green")
-    var FlagIcons = {
-        "N":"",
-        "fav":"icon-heart",
-        "star_3":"icon-asterisk",
-        "attention_orange":"icon-warning-sign",
-        "bonus_red": "icon-fire",
-        "bug":"icon-bug",
-        "check_green":"icon-thumbs-up",
-        "flag_white":"icon-remove-circle",
-        "flag_blue":"icon-arrow-down",
-        "flag_yellow":"icon-arrow-right",
-        "flag_red":"icon-arrow-up",
-        "flag_violet":"icon-exclamation-sign"
-    }
-</script>
-<script>
-    if (!q) {
-        $(".q_url").text('No target selected');
-        $(".ip_url").text('Unavailable');
-        $(".port_url").text('--');
-        $('#main').prepend('<div class="alert alert-warning"><strong>No target provided.</strong> Use the form on the landing page to generate a contextualised report.</div>');
-    } else {
-        $(".q_url").text(q);
-        $(".ip_url").text(ip);
-        $(".port_url").text(port);
-    }
-    $(".date_url").text(date);
-    // load subreports
-    $(".subreport").each(function(){
-        /*$.ajax({
-         url:$(this).data('value'),
-         async:true,
-         success: function(result){
-         $(this).html(result);
-         }
-         });*/
-        $(this).load($(this).data('value'));
-
-    });
-
-    $(".subreport_refresh").click(function(){
-        target_subreport = $(this).data('value');
-        $(target_subreport).load($(target_subreport).data('value'));
-        $('html, body').animate({
-            scrollTop: $(this).offset().top - 40
-        }, 500);
-    });
-
-    $(".subreport_refresh").click(function(){
-        target_subreport = $(this).data('value');
-        $(target_subreport).load($(target_subreport).data('value'));
-        $('html, body').animate({
-            scrollTop: $(this).offset().top - 40
-        }, 500);
-    });
-
-    $(".subreport_collapse").click(function(){
-        target_subreport = $(this).data('value');
-        $(target_subreport + " .collapse").collapse('hide')
-    });
-
-    $(".subreport_expand").click(function(){
-        target_subreport = $(this).data('value');
-        $(target_subreport + " .collapse").collapse('show')
-        //$(target_subreport + " .first_tab").tab('show')
-    });
-
-    $('.target_jumper').click(function (e) {
-        $("#mainmenu a[href='#filter']").tab('show');
-        target_subreport = $(this).data("value");
-        $('html, body').animate({
-            scrollTop: $(target_subreport).offset().top - 40
-        }, 500);
-
-    })
-
-</script>
-<script type="text/javascript" src="includes/owtf_general.js"></script>
-<script type="text/javascript" src="includes/owtf_review.js"></script>
-<script type="text/javascript" src="includes/owtf_filter.js"></script>
-<script type="text/javascript" src="includes/owtf_reporting.js"></script>
-<script type="text/javascript" src="includes/jsonStringify.js"></script>
-<script type="text/javascript" src="includes/ckeditor/ckeditor.js"></script>
-<script type="text/javascript" src="includes/ckeditor/adapters/jquery.js"></script>
-<script type="text/javascript" src="includes/owtf_localStorage.js"></script>
-
-
+  <p>Redirecting to the modern passive scanner report view...</p>
+  <p><a id="fallback-link" href="/passive-scanner/report/">Continue</a></p>
+  <script>
+    (function () {
+      var link = document.getElementById('fallback-link');
+      if (window.location.hash) {
+        link.href = '/passive-scanner/report/' + window.location.hash;
+      }
+    })();
+  </script>
 </body>
 </html>
diff --git a/passive-scanner/index.html b/passive-scanner/index.html
index baa7044..396e559 100644
--- a/passive-scanner/index.html
+++ b/passive-scanner/index.html
@@ -11,7 +11,7 @@
       <div class="max-w-3xl space-y-6">
         <p class="text-xs font-semibold uppercase tracking-[0.4em] text-slate-500">Passive scanner</p>
         <h1 class="text-4xl font-semibold tracking-tight text-slate-900 sm:text-5xl">Scan a target URL</h1>
-        <p class="text-lg leading-relaxed text-slate-600">This Jekyll page launches OWTF's upstream online passive scanner and opens its report view for the URL you provide.</p>
+        <p class="text-lg leading-relaxed text-slate-600">Passive scanning reviews publicly exposed signals such as headers, metadata, and client-side behavior to surface likely security misconfigurations without active exploitation.</p>
       </div>
 
       <div class="mt-12 rounded-3xl border border-slate-200 bg-white p-8 shadow-card">
@@ -54,7 +54,7 @@ <h1 class="text-4xl font-semibold tracking-tight text-slate-900 sm:text-5xl">Sca
 
       try {
         var parsed = new URL(value);
-        var destination = '/online-passive-scanner/report.html#q=' + encodeURIComponent(parsed.href);
+        var destination = '/passive-scanner/report/#q=' + encodeURIComponent(parsed.href);
         window.location.assign(destination);
       } catch (err) {
         showError('The value provided is not a valid URL.');
diff --git a/passive-scanner/report/index.html b/passive-scanner/report/index.html
new file mode 100644
index 0000000..a3190e9
--- /dev/null
+++ b/passive-scanner/report/index.html
@@ -0,0 +1,95 @@
+---
+layout: default
+title: "OWTF Passive Scanner Report"
+description: "Review passive scan findings in a modern report interface."
+---
+<div class="pointer-events-none absolute inset-x-0 top-0 -z-10 h-[420px] bg-gradient-to-b from-slate-100 via-white to-white"></div>
+<div class="relative flex min-h-screen flex-col">
+  {% include header.html %}
+  <main class="space-y-32 pb-16">
+    <section class="section-container pb-24 pt-24">
+      <div class="max-w-3xl space-y-6">
+        <p class="text-xs font-semibold uppercase tracking-[0.4em] text-slate-500">Passive scanner report</p>
+        <h1 class="text-4xl font-semibold tracking-tight text-slate-900 sm:text-5xl">Target Findings</h1>
+        <p class="text-lg leading-relaxed text-slate-600">This report highlights externally visible signals that can indicate weak security posture, such as risky headers, information disclosure, and client-side findings.</p>
+      </div>
+
+      <div class="mt-12 rounded-3xl border border-slate-200 bg-white p-8 shadow-card">
+        <div class="grid gap-6 md:grid-cols-3">
+          <div class="rounded-2xl border border-slate-200 bg-slate-50 p-6 text-sm text-slate-600 md:col-span-2">
+            <p class="text-xs font-semibold uppercase tracking-[0.35em] text-slate-500">Target</p>
+            <p id="report-target" class="mt-3 break-words text-sm font-semibold text-slate-900">No target selected.</p>
+            <p class="mt-2 text-sm text-slate-600">Enter a URL and reopen the report if you need to switch targets.</p>
+          </div>
+          <div class="rounded-2xl border border-slate-200 bg-slate-50 p-6 text-sm text-slate-600">
+            <p class="text-xs font-semibold uppercase tracking-[0.35em] text-slate-500">Actions</p>
+            <div class="mt-3 flex flex-col gap-3">
+              <a id="open-classic" href="/online-passive-scanner/report-legacy.html" class="inline-flex items-center justify-center rounded-full border border-slate-200 px-4 py-2 text-xs font-semibold text-slate-700 transition hover:border-slate-300 hover:text-slate-900">Open classic report</a>
+              <a href="/passive-scanner/" class="inline-flex items-center justify-center rounded-full bg-slate-900 px-4 py-2 text-xs font-semibold text-white transition hover:bg-slate-700">Scan another URL</a>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div class="mt-8 rounded-3xl border border-slate-200 bg-white p-6 shadow-card">
+        <div class="flex items-center justify-between">
+          <h2 class="text-xl font-semibold text-slate-900">Report View</h2>
+          <p class="text-xs uppercase tracking-[0.35em] text-slate-500">Embedded legacy engine</p>
+        </div>
+        <iframe id="legacy-report-frame" title="OWTF passive scanner report" class="mt-4 block rounded-2xl border border-slate-200 bg-white" style="width:100%;min-height:980px"></iframe>
+      </div>
+    </section>
+  </main>
+  {% include footer.html %}
+</div>
+<script>
+  (function () {
+    var frame = document.getElementById('legacy-report-frame');
+    var openClassic = document.getElementById('open-classic');
+    var reportTarget = document.getElementById('report-target');
+
+    function readTarget() {
+      var hash = window.location.hash || '';
+      var match = hash.match(/(?:^#|&)q=([^&]+)/);
+      if (!match) {
+        return '';
+      }
+      try {
+        return decodeURIComponent(match[1]);
+      } catch (err) {
+        return '';
+      }
+    }
+
+    function loadReport() {
+      var target = readTarget();
+      if (!target) {
+        reportTarget.textContent = 'No target selected.';
+        frame.src = '/online-passive-scanner/report-legacy.html';
+        openClassic.href = '/online-passive-scanner/report-legacy.html';
+        return;
+      }
+
+      reportTarget.textContent = target;
+      var encoded = encodeURIComponent(target);
+      var reportUrl = '/online-passive-scanner/report-legacy.html#q=' + encoded;
+      frame.src = reportUrl;
+      openClassic.href = reportUrl;
+    }
+
+    frame.addEventListener('load', function () {
+      try {
+        var doc = frame.contentDocument;
+        if (!doc) {
+          return;
+        }
+        var style = doc.createElement('style');
+        style.textContent = '.github-ribbon,.page-header,.nav,.navbar,#footer{display:none !important;} body{padding-top:0 !important;background:#fff !important;} .container{width:100% !important;max-width:none !important;}';
+        doc.head.appendChild(style);
+      } catch (err) {
+      }
+    });
+
+    loadReport();
+  })();
+</script>

+ OWASP-IG-001 - Spiders, Robots, and Crawlers (robots.txt Analysis) +
+ OWASP-IG-002 - Search engine discovery/reconnaissance (Google Hacking, Metadata) +
+ OWASP-IG-003 - Identify application entry points (Crawling) +
+ OWASP-IG-004 - Web Application Fingerprint (What is that site running?) +
+ OWASP-IG-005 - Application Discovery (Port Scanning, Whois) +
+ OWASP-IG-006 - Testing for Error Code (Error Messages) +
+ OWASP-CM-001 - Testing for SSL-TLS (SSL Testing) +
+ OWASP-CM-002 - Testing for DB Listener (DB Service Testing) +
+ OWASP-CM-003 - Infrastructure Configuration Management (WAF, Load Balancer, Rev Proxy, User Agent) +
+ OWASP-CM-004 - Application Configuration Management (Comments, Source code disclosure) +
+ OWASP-CM-005 - File Extensions Handling (File uploads, etc) +
+ OWASP-CM-006 - Old, Backup and Unreferenced Files (DirBuster, directory/file bruteforce) +
+ OWASP-CM-007 - Testing for Admin Interfaces (Admin interface) +
+ OWASP-CM-008 - HTTP Methods and XST (PUT, TRACE, WebDAV, etc) +
+ OWASP-AT-001 - Testing for Credentials Transport (Passwords in clear-text) +
+ OWASP-AT-002 - Testing for User Enumeration (User Enumeration) +
+ OWASP-AT-003 - Default or Guessable User Account (Default accounts) +
+ OWASP-AT-004 - Testing for Brute Force (Brute Force) +
+ OWASP-AT-005 - Bypassing Authentication Schema () +
+ OWASP-AT-006 - Vulnerable Remember Password and Pwd Reset () +
+ OWASP-AT-007 - Logout and Browser Cache Management () +
+ OWASP-AT-008 - Testing for Captcha () +
+ OWASP-AT-009 - Multiple Factors Authentication () +
+ OWASP-AT-010 - Race Conditions () +
+ OWASP-SM-001 - Session Management Schema () +
+ OWASP-SM-002 - Cookies Attributes () +
+ OWASP-SM-003 - Session Fixation () +
+ OWASP-SM-004 - Exposed Session Variables () +
+ OWASP-SM-005 - Testing for CSRF () +
+ OWASP-AZ-001 - Path Traversal () +
+ OWASP-AZ-002 - Bypassing Authorization Schema () +
+ OWASP-AZ-003 - Privilege Escalation () +
+ OWASP-BL-001 - Business Logic () +
+ OWASP-DV-001 - Reflected Cross Site Scripting () +
+ OWASP-DV-002 - Stored Cross Site Scripting () +
+ OWASP-DV-003 - DOM-based Cross Site Scripting () +
+ OWASP-DV-004 - Cross Site Flashing () +
+ OWASP-DV-005 - SQL Injection () +
+ OWASP-DV-006 - LDAP Injection () +
+ OWASP-DV-007 - ORM Injection () +
+ OWASP-DV-008 - XML Injection () +
+ OWASP-DV-009 - SSI Injection () +
+ OWASP-DV-010 - XPath Injection () +
+ OWASP-DV-011 - SMTP Injection () +
+ OWASP-DV-012 - Code Injection () +
+ OWASP-DV-013 - Command Injection () +
+ OWASP-DV-014 - Buffer Overflow () +
+ OWASP-DV-015 - Incubated Vulnerability () +
+ OWASP-DV-016 - HTTP Splitting/Smuggling () +
+ OWASP-DS-001 - SQL Wildcard Attacks () +
+ OWASP-DS-002 - DoS Locking Customer Accounts () +
+ OWASP-DS-003 - DoS Buffer Overflows () +
+ OWASP-DS-004 - DoS User Specified Object Allocation () +
+ OWASP-DS-005 - User Input as a Loop Counter () +
+ OWASP-DS-006 - Writing User Provided Data to Disk () +
+ OWASP-DS-007 - DoS Failure to Release Resources () +
+ OWASP-DS-008 - Storing too Much Data in Session () +
+ OWASP-WS-001 - WS Information Gathering () +
+ OWASP-WS-002 - Testing WSDL () +
+ OWASP-WS-003 - Testing for XML Structural () +
+ OWASP-WS-004 - Testing for XML Content-Level () +
+ OWASP-WS-005 - WS HTTP GET parameters/REST attacks () +
+ OWASP-WS-006 - Naughty SOAP Attachments () +
+ OWASP-WS-007 - Testing for WS Replay () +
+ OWASP-AJ-001 - Testing for AJAX Vulnerabilities () +
+ OWASP-AJ-002 - Testing for AJAX () +
+ OWTF-WGP-001 - ClickJacking (ClickJacking) +
+ OWTF-WGP-002 - Cross Origin Resource Sharing (CORS) (CORS) +
+ OWTF-WVS-001 - Arachni Unauthenticated () +
+ OWTF-WVS-002 - Nikto Unauthenticated () +
+ OWTF-WVS-003 - Wapiti Unauthenticated () +
+ OWTF-WVS-004 - W3AF Unauthenticated () +
+ OWTF-WVS-005 - WebSecurify Unauthenticated () +
+ OWTF-WVS-006 - Skipfish Unauthenticated () +
- OWASP-IG-001 - Spiders, Robots, and Crawlers (robots.txt Analysis) -
- OWASP-IG-002 - Search engine discovery/reconnaissance (Google Hacking, Metadata) -
- OWASP-IG-003 - Identify application entry points (Crawling) -
- OWASP-IG-004 - Web Application Fingerprint (What is that site running?) -
- OWASP-IG-005 - Application Discovery (Port Scanning, Whois) -
- OWASP-IG-006 - Testing for Error Code (Error Messages) -
- OWASP-CM-001 - Testing for SSL-TLS (SSL Testing) -
- OWASP-CM-002 - Testing for DB Listener (DB Service Testing) -
- OWASP-CM-003 - Infrastructure Configuration Management (WAF, Load Balancer, Rev Proxy, User Agent) -
- OWASP-CM-004 - Application Configuration Management (Comments, Source code disclosure) -
- OWASP-CM-005 - File Extensions Handling (File uploads, etc) -
- OWASP-CM-006 - Old, Backup and Unreferenced Files (DirBuster, directory/file bruteforce) -
- OWASP-CM-007 - Testing for Admin Interfaces (Admin interface) -
- OWASP-CM-008 - HTTP Methods and XST (PUT, TRACE, WebDAV, etc) -
- OWASP-AT-001 - Testing for Credentials Transport (Passwords in clear-text) -
- OWASP-AT-002 - Testing for User Enumeration (User Enumeration) -
- OWASP-AT-003 - Default or Guessable User Account (Default accounts) -
- OWASP-AT-004 - Testing for Brute Force (Brute Force) -
- OWASP-AT-005 - Bypassing Authentication Schema () -
- OWASP-AT-006 - Vulnerable Remember Password and Pwd Reset () -
- OWASP-AT-007 - Logout and Browser Cache Management () -
- OWASP-AT-008 - Testing for Captcha () -
- OWASP-AT-009 - Multiple Factors Authentication () -
- OWASP-AT-010 - Race Conditions () -
- OWASP-SM-001 - Session Management Schema () -
- OWASP-SM-002 - Cookies Attributes () -
- OWASP-SM-003 - Session Fixation () -
- OWASP-SM-004 - Exposed Session Variables () -
- OWASP-SM-005 - Testing for CSRF () -
- OWASP-AZ-001 - Path Traversal () -
- OWASP-AZ-002 - Bypassing Authorization Schema () -
- OWASP-AZ-003 - Privilege Escalation () -
- OWASP-BL-001 - Business Logic () -
- OWASP-DV-001 - Reflected Cross Site Scripting () -
- OWASP-DV-002 - Stored Cross Site Scripting () -
- OWASP-DV-003 - DOM-based Cross Site Scripting () -
- OWASP-DV-004 - Cross Site Flashing () -
- OWASP-DV-005 - SQL Injection () -
- OWASP-DV-006 - LDAP Injection () -
- OWASP-DV-007 - ORM Injection () -
- OWASP-DV-008 - XML Injection () -
- OWASP-DV-009 - SSI Injection () -
- OWASP-DV-010 - XPath Injection () -
- OWASP-DV-011 - SMTP Injection () -
- OWASP-DV-012 - Code Injection () -
- OWASP-DV-013 - Command Injection () -
- OWASP-DV-014 - Buffer Overflow () -
- OWASP-DV-015 - Incubated Vulnerability () -
- OWASP-DV-016 - HTTP Splitting/Smuggling () -
- OWASP-DS-001 - SQL Wildcard Attacks () -
- OWASP-DS-002 - DoS Locking Customer Accounts () -
- OWASP-DS-003 - DoS Buffer Overflows () -
- OWASP-DS-004 - DoS User Specified Object Allocation () -
- OWASP-DS-005 - User Input as a Loop Counter () -
- OWASP-DS-006 - Writing User Provided Data to Disk () -
- OWASP-DS-007 - DoS Failure to Release Resources () -
- OWASP-DS-008 - Storing too Much Data in Session () -
- OWASP-WS-001 - WS Information Gathering () -
- OWASP-WS-002 - Testing WSDL () -
- OWASP-WS-003 - Testing for XML Structural () -
- OWASP-WS-004 - Testing for XML Content-Level () -
- OWASP-WS-005 - WS HTTP GET parameters/REST attacks () -
- OWASP-WS-006 - Naughty SOAP Attachments () -
- OWASP-WS-007 - Testing for WS Replay () -
- OWASP-AJ-001 - Testing for AJAX Vulnerabilities () -
- OWASP-AJ-002 - Testing for AJAX () -
- OWTF-WGP-001 - ClickJacking (ClickJacking) -
- OWTF-WGP-002 - Cross Origin Resource Sharing (CORS) (CORS) -
- OWTF-WVS-001 - Arachni Unauthenticated () -
- OWTF-WVS-002 - Nikto Unauthenticated () -
- OWTF-WVS-003 - Wapiti Unauthenticated () -
- OWTF-WVS-004 - W3AF Unauthenticated () -
- OWTF-WVS-005 - WebSecurify Unauthenticated () -
- OWTF-WVS-006 - Skipfish Unauthenticated () -
Plugin Groups
+ + +
Web Plugin Types	Aux Plugin Types	Net Plugin Types
+ +	+ +	+ +
Web Test Groups
+ +
Available Targets
+ +
Plugin Groups
- - -
Web Plugin Types	Aux Plugin Types	Net Plugin Types
- -	- -	- -
Web Test Groups
- -
Available Targets
- -