diff --git a/var/www/modules/hiddenServices/Flask_hiddenServices.py b/var/www/modules/hiddenServices/Flask_hiddenServices.py
index 8e323368..620cec5a 100644
--- a/var/www/modules/hiddenServices/Flask_hiddenServices.py
+++ b/var/www/modules/hiddenServices/Flask_hiddenServices.py
@@ -426,9 +426,15 @@ def auto_crawler():
     if start > nb_auto_i2p:
         auto_crawler_domain_i2p = []
     elif stop > nb_auto_i2p:
+<<<<<<< Updated upstream
         auto_crawler_domain_i2p = list(r_serv_onion.smembers('auto_crawler_url:onion'))[start:nb_auto_i2p]
     else:
         auto_crawler_domain_i2p = list(r_serv_onion.smembers('auto_crawler_url:onion'))[start:stop]
+=======
+        auto_crawler_domain_i2p = list(r_serv_onion.smembers('auto_crawler_url:i2p'))[start:nb_auto_i2p]
+    else:
+        auto_crawler_domain_i2p = list(r_serv_onion.smembers('auto_crawler_url:i2p'))[start:stop]
+>>>>>>> Stashed changes
 
     if start > nb_auto_regular:
         auto_crawler_domain_regular = []
diff --git a/var/www/modules/hiddenServices/templates/Crawler_auto.html b/var/www/modules/hiddenServices/templates/Crawler_auto.html
index befed709..b074b644 100644
--- a/var/www/modules/hiddenServices/templates/Crawler_auto.html
+++ b/var/www/modules/hiddenServices/templates/Crawler_auto.html
@@ -132,6 +132,40 @@
 					<div class="col-lg-6">
 						<div class="table-responsive mt-1 table-hover table-borderless table-striped">
 							<table class="table" id="myTable_2">
+								<thead class="thead-dark">
+										<tr>
+											<th>I2P Url</th>
+											<th></th>
+											<th>Next Check</th>
+											<th></th>
+											<th></th>
+										</tr>
+								</thead>
+								<tbody id="tbody_last_crawled">
+										{% for metadata_domain in auto_crawler_domain_i2p_metadata %}
+											<tr>
+												<td><a target="_blank" href="{{ url_for('crawler_splash.showDomain') }}?domain={{ metadata_domain['domain'] }}&port={{metadata_domain['port']}}&epoch={{metadata_domain['epoch']}}">{{ metadata_domain['url'] }}</a></td>
+												<td><a class="btn btn-outline-danger px-1 py-0" href="{{ url_for('hiddenServices.remove_auto_crawler') }}?url={{ metadata_domain['url'] }}&page={{page}}">
+													<i class="fas fa-trash-alt"></i></a>
+												</td>
+												<td>{{metadata_domain['epoch']}}</td>
+												<td><div style="color:{{metadata_domain['status_color']}}; display:inline-block">
+															<i class="fas {{metadata_domain['status_icon']}} "></i>
+															{{metadata_domain['status_text']}}
+														</div>
+												</td>
+												<td>
+													<button class="btn btn-outline-secondary px-1 py-0 disabled"><i class="fas fa-pencil-alt"></i></button>
+												</td>
+											</tr>
+										{% endfor %}
+								</tbody>
+							</table>
+						</div>
+					</div>
+					<div class="col-lg-6">
+						<div class="table-responsive mt-1 table-hover table-borderless table-striped">
+							<table class="table" id="myTable_3">
 								<thead class="thead-dark">
 										<tr>
 											<th>Regular Url</th>
@@ -235,6 +269,16 @@ $(document).ready(function(){
    		{ orderable: false, targets: [-1, -4] }
 		]
 	});
+
+	table3 = $('#myTable_3').DataTable(
+	{
+		//"aLengthMenu": [[5, 10, 15, 20, -1], [5, 10, 15, 20, "All"]],
+		//"iDisplayLength": 5,
+		//"order": [[ 0, "desc" ]]
+		columnDefs: [
+   		{ orderable: false, targets: [-1, -4] }
+		]
+	});
 });
 
 function toggle_sidebar(){