diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1834e9c8..e7e2cc90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,7 @@
 - Added option to filter targets and scans using organization, scan status, etc
 - Added random user agent in directory scan
 - Added concurrency, rate limit, timeout, retries in Scan Engine YAML
+- Added Rescan option
 - Other tiny fixes.....
 
 ### V0.5.3 Feb25 2021
diff --git a/web/reNgine/tasks.py b/web/reNgine/tasks.py
index 48fc54ad..9948bee8 100644
--- a/web/reNgine/tasks.py
+++ b/web/reNgine/tasks.py
@@ -848,8 +848,7 @@ def directory_brute(task, domain, yaml_configuration, results_dir, activity_id):
         send_notification('Directory Bruteforce has been initiated for {}.'.format(domain.name))
 
     alive_subdomains = Subdomain.objects.filter(
-        scan_history__id=task.id).exclude(
-        http_url='')
+        scan_history__id=task.id).exclude(http_url__isnull=True)
     dirs_results = results_dir + '/dirs.json'
 
     # check the yaml settings
diff --git a/web/startScan/templates/startScan/detail_scan.html b/web/startScan/templates/startScan/detail_scan.html
index 3bf5836e..1b9bb361 100644
--- a/web/startScan/templates/startScan/detail_scan.html
+++ b/web/startScan/templates/startScan/detail_scan.html
@@ -1424,7 +1424,7 @@ $("#pills-directories-tab").click(function() {
 		"lengthMenu": [20, 50, 100, 500, 1000],
 		"pageLength": 20,
 		'serverSide': true,
-		"ajax": '/api/scanHistory/?scan_id={{scan_history_id}}&format=datatables',
+		"ajax": '/api/?scan_id={{scan_history_id}}&format=datatables',
 		"order": [[ 5, "desc" ]],
 		"columns": [
 			{'data': 'id'},
diff --git a/web/startScan/templates/startScan/history.html b/web/startScan/templates/startScan/history.html
index 704db817..02f9e234 100644
--- a/web/startScan/templates/startScan/history.html
+++ b/web/startScan/templates/startScan/history.html
@@ -158,19 +158,29 @@ Scan history
                 <a href="{% url 'detail_scan' scan_history.id %}" class="btn btn-outline-primary">View</a>
               </td>
               <td class="text-center">
-                {% if scan_history.scan_status == 1 or scan_history.scan_status == -1%}
-                <a onclick="stop_scan('{{ scan_history.celery_id }}')" href="#" class="bs-tooltip" data-toggle="tooltip" data-placement="top" title="" data-original-title="Stop Scan">
-                  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather table-delete feather-alert-octagon"><polygon points="7.86 2 16.14 2 22 7.86 22 16.14 16.14 22 7.86 22 2 16.14 2 7.86 7.86 2"></polygon><line x1="12" y1="8" x2="12" y2="12"></line><line x1="12" y1="16" x2="12.01" y2="16"></line></svg>
+                {% if scan_history.scan_status == 1 or scan_history.scan_status == -1 %}
+                &nbsp;
+                {% else %}
+                <a href="{% url 'start_scan' scan_history.domain.id %}" class="bs-tooltip m-1" data-toggle="tooltip" data-placement="top" title="" data-original-title="Rescan {{ scan_history.domain.name }}">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-refresh-ccw"><polyline points="1 4 1 10 7 10"></polyline><polyline points="23 20 23 14 17 14"></polyline><path d="M20.49 9A9 9 0 0 0 5.64 5.64L1 10m22 4l-4.64 4.36A9 9 0 0 1 3.51 15"></path></svg>
                 </a>
                 {% endif %}
-                <a onclick="delete_scan({{ scan_history.id }})" href="#" class="bs-tooltip" data-toggle="tooltip" data-placement="top" title="" data-original-title="Delete Scan {{ scan_history.domain.name }}">
-                  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather table-delete feather-x-circle">
+                {% if scan_history.scan_status == 1 or scan_history.scan_status == -1%}
+                <a onclick="stop_scan('{{ scan_history.celery_id }}')" href="#" class="bs-tooltip m-1" data-toggle="tooltip" data-placement="top" title="" data-original-title="Stop Scan">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather table-delete feather-alert-octagon"><polygon points="7.86 2 16.14 2 22 7.86 22 16.14 16.14 22 7.86 22 2 16.14 2 7.86 7.86 2"></polygon><line x1="12" y1="8" x2="12" y2="12"></line><line x1="12" y1="16" x2="12.01" y2="16"></line></svg>
+                </a>
+                {% endif %}
+                {% if scan_history.scan_status == 1 or scan_history.scan_status == -1 %}
+                &nbsp;
+                {% else %}
+                <a onclick="delete_scan({{ scan_history.id }})" href="#" class="bs-tooltip m-1" data-toggle="tooltip" data-placement="top" title="" data-original-title="Delete Scan {{ scan_history.domain.name }}">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather table-delete feather-x-circle">
                     <circle cx="12" cy="12" r="10"></circle>
                     <line x1="15" y1="9" x2="9" y2="15"></line>
                     <line x1="9" y1="9" x2="15" y2="15"></line>
                   </svg>
                 </a>
-
+                {% endif %}
               </td>
             </tr>
             {% endfor %}