diff --git a/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf b/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf
index 2dfa15e5f..e8d4ac592 100644
--- a/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf
+++ b/.dev-tools/beta_conf_files/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2019.07.1768
-### Updated: Fri Jul 26 09:09:33 SAST 2019
+### Version: V3.2019.07.1769
+### Updated: Fri Jul 26 09:25:20 SAST 2019
 ### Bad Referrer Count: 6737
 ### Bad Bot Count: 556
 ###################################################
@@ -17993,8 +17993,6 @@ geo $ratelimited {
 # BAD BOT RATE LIMITING ZONE
 # Rate limiting will only take effect if on any User-Agents with a value of 2
 
-	#limit_conn_zone $bot_iplimit zone=bot2_connlimit:16m;
-	#limit_req_zone  $bot_iplimit zone=bot2_reqlimitip:16m  rate=30r/m;
 	limit_conn_zone $bot_iplimit zone=bot2_connlimit:16m;
 	limit_req_zone  $bot_iplimit zone=bot2_reqlimitip:16m  rate=2r/s;
 
diff --git a/.dev-tools/beta_conf_files_ip_whitelist/bots.d/blacklist-ips.conf b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
index 0fcb73d00..12f18b91b 100644
--- a/.dev-tools/beta_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
+++ b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.192.187.174	1;
+35.202.145.110	1;
 127.0.0.1	1;
diff --git a/.dev-tools/beta_conf_files_ip_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
index 3dac4f84e..c3c284efc 100644
--- a/.dev-tools/beta_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
+++ b/.dev-tools/beta_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.192.187.174	0;
+35.202.145.110	0;
 127.0.0.1	0;
diff --git a/.dev-tools/beta_conf_files_ip_whitelist/conf.d/globalblacklist.conf b/.dev-tools/beta_conf_files_ip_whitelist/conf.d/globalblacklist.conf
index 2dfa15e5f..e8d4ac592 100644
--- a/.dev-tools/beta_conf_files_ip_whitelist/conf.d/globalblacklist.conf
+++ b/.dev-tools/beta_conf_files_ip_whitelist/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2019.07.1768
-### Updated: Fri Jul 26 09:09:33 SAST 2019
+### Version: V3.2019.07.1769
+### Updated: Fri Jul 26 09:25:20 SAST 2019
 ### Bad Referrer Count: 6737
 ### Bad Bot Count: 556
 ###################################################
@@ -17993,8 +17993,6 @@ geo $ratelimited {
 # BAD BOT RATE LIMITING ZONE
 # Rate limiting will only take effect if on any User-Agents with a value of 2
 
-	#limit_conn_zone $bot_iplimit zone=bot2_connlimit:16m;
-	#limit_req_zone  $bot_iplimit zone=bot2_reqlimitip:16m  rate=30r/m;
 	limit_conn_zone $bot_iplimit zone=bot2_connlimit:16m;
 	limit_req_zone  $bot_iplimit zone=bot2_reqlimitip:16m  rate=2r/s;
 
diff --git a/.dev-tools/beta_conf_files_ratelimiting/bots.d/blacklist-ips.conf b/.dev-tools/beta_conf_files_ratelimiting/bots.d/blacklist-ips.conf
index 0fcb73d00..12f18b91b 100644
--- a/.dev-tools/beta_conf_files_ratelimiting/bots.d/blacklist-ips.conf
+++ b/.dev-tools/beta_conf_files_ratelimiting/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.192.187.174	1;
+35.202.145.110	1;
 127.0.0.1	1;
diff --git a/.dev-tools/beta_conf_files_ratelimiting/bots.d/whitelist-ips.conf b/.dev-tools/beta_conf_files_ratelimiting/bots.d/whitelist-ips.conf
index 3dac4f84e..c3c284efc 100644
--- a/.dev-tools/beta_conf_files_ratelimiting/bots.d/whitelist-ips.conf
+++ b/.dev-tools/beta_conf_files_ratelimiting/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.192.187.174	0;
+35.202.145.110	0;
 127.0.0.1	0;
diff --git a/.dev-tools/beta_conf_files_ratelimiting/conf.d/globalblacklist.conf b/.dev-tools/beta_conf_files_ratelimiting/conf.d/globalblacklist.conf
index 2dfa15e5f..e8d4ac592 100644
--- a/.dev-tools/beta_conf_files_ratelimiting/conf.d/globalblacklist.conf
+++ b/.dev-tools/beta_conf_files_ratelimiting/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2019.07.1768
-### Updated: Fri Jul 26 09:09:33 SAST 2019
+### Version: V3.2019.07.1769
+### Updated: Fri Jul 26 09:25:20 SAST 2019
 ### Bad Referrer Count: 6737
 ### Bad Bot Count: 556
 ###################################################
@@ -17993,8 +17993,6 @@ geo $ratelimited {
 # BAD BOT RATE LIMITING ZONE
 # Rate limiting will only take effect if on any User-Agents with a value of 2
 
-	#limit_conn_zone $bot_iplimit zone=bot2_connlimit:16m;
-	#limit_req_zone  $bot_iplimit zone=bot2_reqlimitip:16m  rate=30r/m;
 	limit_conn_zone $bot_iplimit zone=bot2_connlimit:16m;
 	limit_req_zone  $bot_iplimit zone=bot2_reqlimitip:16m  rate=2r/s;
 
diff --git a/.dev-tools/beta_conf_files_whitelist/bots.d/blacklist-ips.conf b/.dev-tools/beta_conf_files_whitelist/bots.d/blacklist-ips.conf
index 0fcb73d00..12f18b91b 100644
--- a/.dev-tools/beta_conf_files_whitelist/bots.d/blacklist-ips.conf
+++ b/.dev-tools/beta_conf_files_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.192.187.174	1;
+35.202.145.110	1;
 127.0.0.1	1;
diff --git a/.dev-tools/beta_conf_files_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/beta_conf_files_whitelist/bots.d/whitelist-ips.conf
index 3dac4f84e..c3c284efc 100644
--- a/.dev-tools/beta_conf_files_whitelist/bots.d/whitelist-ips.conf
+++ b/.dev-tools/beta_conf_files_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.192.187.174	0;
+35.202.145.110	0;
 127.0.0.1	0;
diff --git a/.dev-tools/beta_conf_files_whitelist/conf.d/globalblacklist.conf b/.dev-tools/beta_conf_files_whitelist/conf.d/globalblacklist.conf
index 2dfa15e5f..e8d4ac592 100644
--- a/.dev-tools/beta_conf_files_whitelist/conf.d/globalblacklist.conf
+++ b/.dev-tools/beta_conf_files_whitelist/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2019.07.1768
-### Updated: Fri Jul 26 09:09:33 SAST 2019
+### Version: V3.2019.07.1769
+### Updated: Fri Jul 26 09:25:20 SAST 2019
 ### Bad Referrer Count: 6737
 ### Bad Bot Count: 556
 ###################################################
@@ -17993,8 +17993,6 @@ geo $ratelimited {
 # BAD BOT RATE LIMITING ZONE
 # Rate limiting will only take effect if on any User-Agents with a value of 2
 
-	#limit_conn_zone $bot_iplimit zone=bot2_connlimit:16m;
-	#limit_req_zone  $bot_iplimit zone=bot2_reqlimitip:16m  rate=30r/m;
 	limit_conn_zone $bot_iplimit zone=bot2_connlimit:16m;
 	limit_req_zone  $bot_iplimit zone=bot2_reqlimitip:16m  rate=2r/s;
 
diff --git a/.dev-tools/globalblacklist-testing.template b/.dev-tools/globalblacklist-testing.template
index 2db9e9e5a..e8d4ac592 100644
--- a/.dev-tools/globalblacklist-testing.template
+++ b/.dev-tools/globalblacklist-testing.template
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2019.07.1768
-### Updated: Fri Jul 26 09:09:33 SAST 2019
+### Version: V3.2019.07.1769
+### Updated: Fri Jul 26 09:25:20 SAST 2019
 ### Bad Referrer Count: 6737
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/globalblacklist.template b/.dev-tools/globalblacklist.template
index c03ead319..8643f4428 100755
--- a/.dev-tools/globalblacklist.template
+++ b/.dev-tools/globalblacklist.template
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1768
-### Updated: Fri Jul 26 09:09:31 SAST 2019
+### Version: V4.2019.07.1769
+### Updated: Fri Jul 26 09:25:18 SAST 2019
 ### Bad Referrer Count: 6737
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/test1_conf_files/bots.d/whitelist-ips.conf b/.dev-tools/test1_conf_files/bots.d/whitelist-ips.conf
index c1d6c61cb..2fc596b5d 100644
--- a/.dev-tools/test1_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files/bots.d/whitelist-ips.conf
@@ -45,4 +45,4 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-35.188.73.34            0;
+35.184.226.236          0;
diff --git a/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf
index c03ead319..8643f4428 100644
--- a/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf
+++ b/.dev-tools/test1_conf_files/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1768
-### Updated: Fri Jul 26 09:09:31 SAST 2019
+### Version: V4.2019.07.1769
+### Updated: Fri Jul 26 09:25:18 SAST 2019
 ### Bad Referrer Count: 6737
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-ips.conf b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
index 4dddc08a6..12f18b91b 100644
--- a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
+++ b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.193.14.140	1;
+35.202.145.110	1;
 127.0.0.1	1;
diff --git a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
index 40cb4d7a8..c3c284efc 100644
--- a/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.193.14.140	0;
+35.202.145.110	0;
 127.0.0.1	0;
diff --git a/.dev-tools/test1_conf_files_ip_whitelist/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files_ip_whitelist/conf.d/globalblacklist.conf
index c03ead319..8643f4428 100644
--- a/.dev-tools/test1_conf_files_ip_whitelist/conf.d/globalblacklist.conf
+++ b/.dev-tools/test1_conf_files_ip_whitelist/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1768
-### Updated: Fri Jul 26 09:09:31 SAST 2019
+### Version: V4.2019.07.1769
+### Updated: Fri Jul 26 09:25:18 SAST 2019
 ### Bad Referrer Count: 6737
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf b/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf
index 4dddc08a6..12f18b91b 100644
--- a/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf
+++ b/.dev-tools/test1_conf_files_ratelimiting/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.193.14.140	1;
+35.202.145.110	1;
 127.0.0.1	1;
diff --git a/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf b/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf
index 40cb4d7a8..c3c284efc 100644
--- a/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files_ratelimiting/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.193.14.140	0;
+35.202.145.110	0;
 127.0.0.1	0;
diff --git a/.dev-tools/test1_conf_files_ratelimiting/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files_ratelimiting/conf.d/globalblacklist.conf
index c03ead319..8643f4428 100644
--- a/.dev-tools/test1_conf_files_ratelimiting/conf.d/globalblacklist.conf
+++ b/.dev-tools/test1_conf_files_ratelimiting/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1768
-### Updated: Fri Jul 26 09:09:31 SAST 2019
+### Version: V4.2019.07.1769
+### Updated: Fri Jul 26 09:25:18 SAST 2019
 ### Bad Referrer Count: 6737
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf b/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf
index 4dddc08a6..12f18b91b 100644
--- a/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf
+++ b/.dev-tools/test1_conf_files_whitelist/bots.d/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.193.14.140	1;
+35.202.145.110	1;
 127.0.0.1	1;
diff --git a/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf
index 40cb4d7a8..c3c284efc 100644
--- a/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test1_conf_files_whitelist/bots.d/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.193.14.140	0;
+35.202.145.110	0;
 127.0.0.1	0;
diff --git a/.dev-tools/test1_conf_files_whitelist/conf.d/globalblacklist.conf b/.dev-tools/test1_conf_files_whitelist/conf.d/globalblacklist.conf
index c03ead319..8643f4428 100644
--- a/.dev-tools/test1_conf_files_whitelist/conf.d/globalblacklist.conf
+++ b/.dev-tools/test1_conf_files_whitelist/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1768
-### Updated: Fri Jul 26 09:09:31 SAST 2019
+### Version: V4.2019.07.1769
+### Updated: Fri Jul 26 09:25:18 SAST 2019
 ### Bad Referrer Count: 6737
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf b/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf
index 002d11f26..1e63b10f6 100644
--- a/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test2_conf_files/bots.d/whitelist-ips.conf
@@ -45,5 +45,5 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-34.68.144.114           0;
-104.154.113.151         0;
+35.202.145.110          0;
+104.154.120.187         0;
diff --git a/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf
index 240c350d2..323f9b678 100644
--- a/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf
+++ b/.dev-tools/test2_conf_files/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1768
-### Updated: Fri Jul 26 09:09:31 SAST 2019
+### Version: V4.2019.07.1769
+### Updated: Fri Jul 26 09:25:18 SAST 2019
 ### Bad Referrer Count: 6737
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/test3_conf_files/bots.d/whitelist-ips.conf b/.dev-tools/test3_conf_files/bots.d/whitelist-ips.conf
index f0ec4e3ed..adf26e87b 100644
--- a/.dev-tools/test3_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test3_conf_files/bots.d/whitelist-ips.conf
@@ -45,5 +45,5 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-35.188.73.34            0;
-104.154.113.151         0;
+104.154.120.187         0;
+35.202.145.110          0;
diff --git a/.dev-tools/test3_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test3_conf_files/conf.d/globalblacklist.conf
index c193586d7..126e70835 100644
--- a/.dev-tools/test3_conf_files/conf.d/globalblacklist.conf
+++ b/.dev-tools/test3_conf_files/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1768
-### Updated: Fri Jul 26 09:09:31 SAST 2019
+### Version: V4.2019.07.1769
+### Updated: Fri Jul 26 09:25:18 SAST 2019
 ### Bad Referrer Count: 6737
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/test4_conf_files/bots.d/whitelist-ips.conf b/.dev-tools/test4_conf_files/bots.d/whitelist-ips.conf
index c5ee78394..39dcd6118 100644
--- a/.dev-tools/test4_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test4_conf_files/bots.d/whitelist-ips.conf
@@ -45,6 +45,6 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-34.66.178.120           0;
-35.192.187.174          0;
-35.188.73.34            0;
+35.184.226.236          0;
+35.192.85.2             0;
+35.202.145.110          0;
diff --git a/.dev-tools/test4_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test4_conf_files/conf.d/globalblacklist.conf
index c03ead319..8643f4428 100644
--- a/.dev-tools/test4_conf_files/conf.d/globalblacklist.conf
+++ b/.dev-tools/test4_conf_files/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1768
-### Updated: Fri Jul 26 09:09:31 SAST 2019
+### Version: V4.2019.07.1769
+### Updated: Fri Jul 26 09:25:18 SAST 2019
 ### Bad Referrer Count: 6737
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/test5_conf_files/bots.d/whitelist-ips.conf b/.dev-tools/test5_conf_files/bots.d/whitelist-ips.conf
index 6429431ce..bb69eef9e 100644
--- a/.dev-tools/test5_conf_files/bots.d/whitelist-ips.conf
+++ b/.dev-tools/test5_conf_files/bots.d/whitelist-ips.conf
@@ -45,5 +45,6 @@
 # - Whitelisting IP's and RANGES here ONLY affects the IP blocking functions. 
 # - This file will NOT allow your own IP to bypass bad User-Agent or Referrer String checks.
 # - To bypass everything for a certain IP see notes in blockbots.conf on SUPER WHITELIST
-35.193.14.140           0;
-34.68.144.114           0;
+35.184.96.71            0;
+104.154.120.187         0;
+35.188.1.99             0;
diff --git a/.dev-tools/test5_conf_files/conf.d/globalblacklist.conf b/.dev-tools/test5_conf_files/conf.d/globalblacklist.conf
index c03ead319..8643f4428 100644
--- a/.dev-tools/test5_conf_files/conf.d/globalblacklist.conf
+++ b/.dev-tools/test5_conf_files/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1768
-### Updated: Fri Jul 26 09:09:31 SAST 2019
+### Version: V4.2019.07.1769
+### Updated: Fri Jul 26 09:25:18 SAST 2019
 ### Bad Referrer Count: 6737
 ### Bad Bot Count: 556
 ###################################################
diff --git a/.dev-tools/test_units/blacklist-ips.conf b/.dev-tools/test_units/blacklist-ips.conf
index 0fcb73d00..12f18b91b 100644
--- a/.dev-tools/test_units/blacklist-ips.conf
+++ b/.dev-tools/test_units/blacklist-ips.conf
@@ -1,2 +1,2 @@
-35.192.187.174	1;
+35.202.145.110	1;
 127.0.0.1	1;
diff --git a/.dev-tools/test_units/random-bots-for-test-quick.list b/.dev-tools/test_units/random-bots-for-test-quick.list
index 7943668ab..86116f58f 100644
--- a/.dev-tools/test_units/random-bots-for-test-quick.list
+++ b/.dev-tools/test_units/random-bots-for-test-quick.list
@@ -1,10 +1,10 @@
-Craftbot
-LinqiaRSSBot
-Musobot
-RedesScrapy
-RepoMonkey
-SlySearch
-SmartDownload
-Spanner
-SurveyBot
-WebsiteQuester
+404checker
+EroCrawler
+Express WebPictures
+ips-agent
+Microsoft Data Access
+Navroad
+RebelMouse
+Screaming
+SemrushBot
+Snake
diff --git a/.dev-tools/test_units/random-bots-for-test.list b/.dev-tools/test_units/random-bots-for-test.list
index eec5efa90..cd4dc757e 100644
--- a/.dev-tools/test_units/random-bots-for-test.list
+++ b/.dev-tools/test_units/random-bots-for-test.list
@@ -1,250 +1,250 @@
+360Spider
 404checker
-Aboundex
-Aboundexbot
-ADmantX
-Aipbot
-AllSubmitter
+404enemy
+80legs
+Acunetix
+AfD-Verbotsverfahren
+AhrefsBot
 AlphaBot
 ASPSeek
 Asterias
-autoemailspider
-BackDoorBot
-Backlink-Ceck
 backlink-check
-BackStreet
-Badass
 Bandit
-BatchFTP
-Battleztar Bazinga
 BBBike
-BDCbot
-BetaBot
-Bigfoot
+BDFetch
 Bitacle
-Blackboard
 Black Hole
 Blow
 BlowFish
+Bolt
 Brandwatch
-BuiltBotTough
+BuiltWith
 Bullseye
 BunnySlippers
-CATExplorador
 CazoodleBot
-CCBot
-CheeseBot
+Cegbfeieh
 CherryPicker
 CheTeam
-Cliqzbot
-cognitiveseo
-com.plumanalytics
+Chlooe
 Copier
-Craftbot
+CopyRightCheck
+Copyscape
 crawler4j
-crawler.feedback
-CrunchBot
-Curious
-DBLBot
+CrazyWebCrawler
+Crescent
+Custo
 demandbase-bot
 Deusu
-Dirbuster
 Disco
+Discobot
 Discoverybot
 DittoSpyder
+DnyzBot
 DomainCrawler
-EasyDL
-Ebingbong
-EMail Wolf
-Evil
-Exabot
+Download Wonder
+Dragonfly
+DTS Agent
+eCatch
+Ecxi
+evc-batch
 Express WebPictures
 Extractor
-ExtractorPro
-Extreme Picture Finder
-FemtosearchBot
-FHscan
+Ezooms
+FDM
+Fimap
 FlashGet
 Foobot
 FrontPage
+FyberSpider
 Fyrebot
-Gigablast
-Gotit
-GrabNet
+Genieo
+GermCrawler
+GetRight
+GetWeb
+GoZilla
+Go!Zilla
 GrapeFX
 GrapeshotCrawler
 GridBot
 Haansoft
 HaosouSpider
 Harvest
-Havij
-HEADMasterSEO
-Heritrix
-HTMLparser
 HTTP::Lite
+Humanlinks
 HybridBot
+IDBot
 Id-search
-IlseBot
 Image Sucker
-IndeedBot
-InfoNaviRobot
 instabid
-internetVista monitor
+Internet Ninja
+InternetSeer
 Iria
-IRLbot
-Iskanie
-IstellaBot
-Jbrofuzz
-JennyBot
-JOC Web Spider
-Joomla
+JamesBOT
+JetCar
+Jorgee
 JustView
-Kenjin Spider
-LeechGet
-LexiBot
-Lftp
-Lightspeedsystems
-LinkextractorPro
+Keyword Density
+Kozmosbot
+Larbin
+LeechFTP
+Libwhisker
+LinkpadBot
 LinksManager
-LinqiaMetadataDownloaderBot
-Lipperhey
-Litemage_walker
+LinqiaRSSBot
+Lmspider
 lwp-request
 LWP::Simple
-lwp-trivial
-Mail.RU_Bot
-Majestic-SEO
+Majestic SEO
 MarkMonitor
 MarkWatch
-Masscan
 Mass Downloader
 Mata Hari
 MauiBot
-meanpathbot
 Meanpathbot
 MeanPath Bot
+Mediatoolkitbot
+mediawords
 Metauri
+Microsoft Data Access
 Microsoft URL Control
 MIDown tool
+MIIxpc
 Mister PiX
+MJ12bot
+Morfeus Fucking Scanner
 Mr.4x3
-muhstik-scan
-Musobot
+MSFrontPage
+MSIECrawler
+Msrabot
+MS Web Services Client Protocol
 Navroad
-NearSite
+NetAnts
+Netcraft
 netEstate NE Crawler
-NetLyzer
-NetMechanic
 NetSpider
 Nettrack
-Net Vampire
-Netvibes
-NetZIP
+NextGenSearchBot
+NICErsPRO
 Niki-bot
 Nikto
-Nimbostratus
+NimbleCrawler
 Ninja
 Nutch
-oBot
 Offline Explorer
 Offline Navigator
 OnCrawl
-Openfind
 OpenLinkProfiler
-Openvas
-OpenVAS
-OutclicksBot
-Page Analyzer
+OrangeBot
 PageScorer
 Pandalytics
 pcBrowser
-PeoplePal
+PECL::HTTP
 Picsearch
-PictureFinder
 Pimonster
 Pockey
-POE-Component-Client-HTTP
-ProPowerBot
-ProWebWalker
-PxBroker
-RankFlex
-RankingBot2
-RankurBot
-RebelMouse
+Probethenet
+Psbot
+Quick-Crawler
+RankActive
+Rankivabot
+RealDownload
 Recorder
 RedesScrapy
-Ripper
-RocketCrawler
-Rogerbot
+RepoMonkey
 s1z.ru
-scan.lol
-ScoutJet
+SalesIntelligent
+SBIder
+Scanbot
 Screaming
-ScreenerBot
 Searchestate
-Seomoz
-seoscanners
+SemrushBot
+SEOkicks
+SEOkicks-Robot
+SEOlyticsCrawler
+SEOprofiler
 SeoSiteCheckup
+SEOstats
 Shodan
+SISTRIX
 Sitebeam
+SiteExplorer
 Siteimprove
+SiteLockSpider
+SiteSnagger
 Site Sucker
 Sitevigil
-SlySearch
 SmartDownload
-SMTBot
 Snake
+Snapbot
 Snoopy
-Sogou web spider
-Sottopop
+Sosospider
 SpaceBison
-Spammen
 SpankBot
 sp_auditbot
-Spinn3r
+Spbot
 SputnikBot
-spyfu
-Stripper
+Sqlmap
+Sqlworm
+Sqworm
+Steeler
 Sucker
-Sucuri
-SurveyBot
-Suzuran
-Swiftbot
-Szukacz
+SuperBot
+SuperHTTP
+Surfbot
+sysscan
 T0PHackTeam
-The Intraformant
+T8Abot
+tAkeOut
+Telesphorep
 TheNomad
-Thumbor
-Titan
 Toata
-Trendictionbot
+Trendiction
+trendiction.com
+trendiction.de
+True_Robot
+Turingos
 Turnitin
-URLy Warning
+TurnitinBot
+Typhoeus
+UnisterBot
+Upflow
 URLy.Warning
 Vagabondo
-VCI
-WallpapersHD
-WebAuto
+VeriCiteCrawler
+Virusdie
+VoidEYE
+Voil
+Voltron
+Wallpapers/3.0
+WASALive-Bot
+WBSearchBot
+Web Auto
 WebCollage
 WebEnhancer
-WebFuck
+Web Fetch
 Web Fuck
 WebLeacher
 WebmasterWorldForumBot
-WebPix
+WebSauger
+Web Sauger
 WebsiteQuester
+Webster
 WebStripper
+WebWhacker
 WeSEE
-Whack
 Who.is Bot
+Widow
+WinHTTrack
 WISENutbot
-Wprecon
+Woobot
 WPScan
-WWW-Collector-E
-WWW-Mechanize
 WWW::Mechanize
-WWWOFFLE
+x22Mozilla
 Xaldon_WebSpider
+Xenu
+xpymep1.exe
+YoudaoBot
 Zauba
+Zermelo
+Zeus
 Zitebot
-ZumBot
-ZyBorg
diff --git a/.dev-tools/test_units/random-bots-for-whitelist-test.list b/.dev-tools/test_units/random-bots-for-whitelist-test.list
index a7da3733c..820655835 100644
--- a/.dev-tools/test_units/random-bots-for-whitelist-test.list
+++ b/.dev-tools/test_units/random-bots-for-whitelist-test.list
@@ -1,250 +1,250 @@
+404checker
 404enemy
-80legs
-Aboundex
+Aboundexbot
 Acunetix
 ADmantX
 AfD-Verbotsverfahren
-Alligator
-archive.org_bot
-Asterias
+AIBOT
+AiHitBot
+AlphaBot
+ASPSeek
 Attach
+autoemailspider
 Backlink-Ceck
-BacklinkCrawler
-BackStreet
-Bandit
+Badass
+Barkrowler
+BatchFTP
 BBBike
 BDCbot
-BetaBot
 Bigfoot
+Blackboard
+Black Hole
+Blow
 BlowFish
-Boardreader
 BotALot
 BuiltBotTough
 Bullseye
+BuzzSumo
 Calculon
-CazoodleBot
+CATExplorador
 CCBot
 Cegbfeieh
 CheTeam
+ChinaClaw
 Chlooe
-Cliqzbot
 Cloud mapping
 coccocbot-web
-Cogentbot
 com.plumanalytics
-CopyRightCheck
 Cosmos
 Craftbot
-Curious
-Demon
-Disco
+crawler4j
+crawl.sogou.com
+CrazyWebCrawler
+Crescent
+CSHttp
+DatabaseDriverMysqli
+DBLBot
+Devil
+DigitalPebble
+DIIbot
+Discobot
 Dispatch
-DittoSpyder
+DomainAppender
 DomainSigmaCrawler
 DomainStatsBot
-Dragonfly
-Drip
-DSearch
-eCatch
 ECCP/1.0
-Ecxi
 EMail Siphon
-EMail Wolf
-EroCrawler
 evc-batch
-Evil
-Exabot
+Express WebPictures
+ExtLinksBot
 Extractor
+Extreme Picture Finder
+EyeNetIE
 facebookscraper
 FDM
-FHscan
+Fimap
 Firefox/7.0
 FlashGet
 Foobot
+Fyrebot
+GalaxyBot
+Genieo
 GermCrawler
-Getintent
 GetRight
 GetWeb
 Gigabot
-Go-Ahead-Got-It
+G-i-g-a-b-o-t
 GoZilla
-Grabber
-GrapeFX
-GrapeshotCrawler
+GrabNet
 GridBot
+Haansoft
 HaosouSpider
-HEADMasterSEO
 Heritrix
-Hloader
 HMView
-HTMLparser
-HybridBot
+HTTP::Lite
 IDBot
-IlseBot
-Image Sucker
+Id-search
+Image Fetch
+IndeedBot
+Indy Library
+InfoNaviRobot
+InfoTekies
 instabid
-InterGET
 Internet Ninja
-InternetSeer
 internetVista monitor
+IRLbot
 Jbrofuzz
-JennyBot
-JetCar
-JOC Web Spider
-Jorgee
-Kenjin Spider
+Joomla
+JustView
+Kozmosbot
+Lanshanbot
 Larbin
-Lftp
+LeechGet
+LexiBot
+Libwhisker
 Lightspeedsystems
+Likse
+LinkextractorPro
 LinkScan
+LinkWalker
 LinqiaMetadataDownloaderBot
 LinqiaRSSBot
 LinqiaScrapeBot
-Lipperhey
 Lipperhey Spider
-LNSpiderguy
-Ltx71
-lwp-trivial
-Magnet
-magpie-crawler
+LWP::Simple
 Mail.RU_Bot
+Majestic12
+Majestic SEO
 Majestic-SEO
 MarkMonitor
-MarkWatch
 Mass Downloader
-Mata Hari
-Meanpathbot
 MeanPath Bot
+MegaIndex.ru
 Metauri
-MFC_Tear_Sample
+Microsoft Data Access
+MIDown tool
 MIIxpc
-Mister PiX
 MJ12bot
-Morfeus Fucking Scanner
-MSFrontPage
+Mojeek
+Mr.4x3
 MSIECrawler
-Msrabot
-Name Intelligence
+muhstik-scan
 Nameprotect
-Nessus
-NetAnts
+Navroad
+NearSite
 Netcraft
-NetLyzer
+NetSpider
 Nettrack
 Net Vampire
-Netvibes
+NextGenSearchBot
+Nibbler
 NICErsPRO
-Niki-bot
-Nikto
-NimbleCrawler
+Nimbostratus
 Ninja
+Nmap
 NPbot
 Octopus
-Offline Explorer
-Openvas
+OnCrawl
+Openfind
+OpenLinkProfiler
 OrangeBot
 OrangeSpider
-OutclicksBot
-PageGrabber
+Page Analyzer
+page scorer
 PageScorer
-Panscient
+Pavuk
+PeoplePal
 PHPCrawl
-Picscout
-Picsearch
-PictureFinder
+Pimonster
 PleaseCrawl
-plumanalytics
 Pockey
-POE-Component-Client-HTTP
 Probethenet
-QueryN Metasearch
+PxBroker
+PyCurl
+Quick-Crawler
 RankActiveLinkBot
-RankingBot
+RankFlex
+RankurBot
 RealDownload
 Recorder
-RedesScrapy
 ReGet
 RepoMonkey
-Ripper
-Rogerbot
-SBIder
-scan.lol
-ScoutJet
-Scrapy
-Screaming
+RocketCrawler
+s1z.ru
+SalesIntelligent
 Searchestate
-SearchmetricsBot
-SemrushBot
 SEOkicks
-SEOkicks-Robot
-SEOlyticsCrawler
-Seomoz
-serpstatbot
+seoscanners
 sexsearcher
-SISTRIX
-SiteSnagger
-SiteSucker
+Sitebeam
+SiteExplorer
+SiteLockSpider
 Site Sucker
-Sitevigil
-Snoopy
+Snake
 Sociscraper
-Sosospider
 Sottopop
-sp_auditbot
-Spbot
-SputnikBot
+SpaceBison
+SpankBot
+Spanner
+Spinn3r
 spyfu
+Sqlmap
 Sqworm
+Stripper
 Sucker
-Sucuri
-SuperBot
-Surfbot
-Suzuran
+SurveyBot
 sysscan
-T0PHackTeam
 tAkeOut
-Teleport
-TheNomad
+Telesphoreo
+The Intraformant
 Thumbor
-Titan
+Tracemyfile
+Trendiction
+trendiction.com
 True_Robot
 Turingos
 TwengaBot
-Upflow
+Twice
+UnisterBot
+URLy Warning
 URLy.Warning
-Vagabondo
+Vacuum
+VB Project
+VCI
+VidibleScraper
 Virusdie
-VoidEYE
 Wallpapers/3.0
+WallpapersHD
 WASALive-Bot
-WBSearchBot
-WebAuto
-Web Auto
 WebBandit
 Web Collage
+WEBDAV
+WebEnhancer
+WebFetch
 Web Fetch
-webmeup-crawler
+WebFuck
+Web Fuck
+WebLeacher
 WebPix
-WebSauger
+WebReaper
 Web Sauger
 Webshag
-WebsiteExtractor
-Whacker
-Who.is Bot
-WinHTTrack
-WiseGuys Robot
-Wonderbot
-Woobot
-Wotbox
+Webster
+WebSucker
+Web Sucker
+WebWhacker
+Whack
+Widow
 Wprecon
-WPScan
+WWW-Mechanize
 WWW::Mechanize
+WWWOFFLE
 x09Mozilla
-Xaldon WebSpider
+x22Mozilla
 Xenu
-YoudaoBot
+Zauba
 zauba.io
-Zeus
+Zermelo
+zgrab
 Zitebot
-ZmEu
 ZyBorg
diff --git a/.dev-tools/test_units/random-referrers-for-test-quick.list b/.dev-tools/test_units/random-referrers-for-test-quick.list
index 4596bafa7..724b87917 100644
--- a/.dev-tools/test_units/random-referrers-for-test-quick.list
+++ b/.dev-tools/test_units/random-referrers-for-test-quick.list
@@ -1,10 +1,10 @@
-dealwifi.com
-freecamdollars.com
-gsasearchenginerankerhelp.com
-i-service.kz
-kinoflux.net
-offer.wpsecurity.website
-perosan.com
-pushdata.sendpulse.com
-sladkoevideo.com
-tizanidinepain.blogspot.com
+4senses.co
+apidiamondatanet-a.akamaihd.net
+beauby.ru
+cardul.ru
+figuringmoneyout.com
+llastbuy.ru
+mir-business-24.ru
+mobioffertrck.com
+okayimage.com
+sexyali.com
diff --git a/.dev-tools/test_units/random-referrers-for-test.list b/.dev-tools/test_units/random-referrers-for-test.list
index e43228d2c..a9827f12b 100644
--- a/.dev-tools/test_units/random-referrers-for-test.list
+++ b/.dev-tools/test_units/random-referrers-for-test.list
@@ -1,500 +1,500 @@
-0c47f8422d3f.com
-100searchengines.com
-123any.com
-123locker.com
+123kuma.com
+14b.info
 178evakuator178.ru
-1j7740kd.website
-24-ak.ru
-34.gs
-3xforum.ro
-5u.com
-6hopping.com
-777-club.ru
-888.com
-8lufu.com
-adbetclickin.pink
-adconscious.com
-admanaerofoil.com
-adnotbad.com
-adserver-e7.com
-airlandsea.info
-alienwheels.de
-alldezservice.kz
-allknow.info
-alt-servis.ru
-amehdaily.com
-ampower.me
-animali.deagostinipassion.it
-anmysite.com
-anticrawler.org
-apidigidocketnet-a.akamaihd.net
-apper.de
-appleid-verification.com
-apptester.tk
-ap.senai.br
-arabsexxxtube.com
-arabseyes.com
-arendakvartir.kz
-arendatora.ru
-arkartex.ru
-asrv-a.akamaihd.net
-autobudpostach.club
-avtolombard-krasnodar.ru
-azbukafree.com
+1webmaster.ml
+2daytrendingnews.com
+2rich4bitches.com
+2x2fan.ru
+3rbseyes.com
+4ureyesonly.com
+8kisses.eu
+a96527gi.beget.tech
+aa9d046aab36af4ff182f097f840430d51.com
+aasoldes.fr
+abctoppictures.net
+absolute-s.ru
+addbin.men
+adsref.men
+adultmeetonline.info
+akita.kz
+alfabot.xyz
+allkrim.com
+allproblog.com
+allwidewallpapers.com
+altamayoztourism.com
+alta-realestate.com
+ample-awards-today.us
+anabolics.shop
+anaksma.info
+analytics-ads.xyz
+anti-virus-removal.info
+apelsinnik.website
+approvedlocal.co.za
+appsecurityr.com
+artefakct.com
+asrvrep-a.akamaihd.net
+aussie-prizes.com
+autoblogger24.info
+autobrennero.it
+avtoarenda.by
+avtolombard-krasnodar.com
+babyguns.ru
 backgroundpictures.net
-baksman.com
+balkanfarma.ru
+bambi.ck.ua
+bankcrediti.ru
 barbourjackets.online
-bard-real.com.ua
+battlecarnival.su
 battle.net
-bazaronline24.ru
-bedcapdealers.com
-bestchoice.cf
-bestdooz.com
-bestimagecoollibrary.com
+beauty-clinic.ru
+best-businessman.ru
 best-mam.ru
-bestwebsiteawards.com
-bigpictures.club
-bioca.org
-biographiya.com
-bio-market.kz
-bitcoinremote.com
-bitporno.sx
-bizcheapjerseyswholesalechina.com
-blagovest-med.ru
-blogrankers.com
-blogsfunky672.weebly.com
-bluerobot.info
-bombla.org
-boole.onlinewebshop.net
-bouda.kvalitne.cz
-brainzpod.win
-brandehk.dk
-brewdom.ru
-bronzeaid-a.akamaihd.net
-bryansk.zrus.org
-buttons-for-website.com
-buyantiviralwp.com
-buy-cheap-online.info
-buydissertation.net
-bvlgariring.xyz
-callawaygolfstore.online
-candcstuccoandstone.com
-cartechnic.ru
-cartierlovebraceletreplica.xyz
+bestofupload.info
+besttorrentknifta.weebly.com
+binaryoptionscops.info
+bin-brokers.com
+binomo.com
+bioscorp.ru
+blackhatworth.com
+bmsco.co
+bolitgorlo.net
+bonanza-fortune.men
+bonzbuddy.com
+boo-arts.com
+bookmaker-bet.com
+brandedleadgeneration.com
+bristolhostel.com
+btc4u.ru
+bugof.gq
+buyessayonline19.blogspot.ru
+buy-meds24.com
+cactussoft.biz
+capture-room.com
+cardsdumps.com
+cardsharp1.ru
+carrauterie.be
+carstrends2015.com
+cartierjusteunclou.xyz
+cartierlove2u.xyz
+cartierreplica.top
+cartierreplica.win
 cartierreplica.xyz
-casinos4dummies.co.uk
-cdncash.org
-celejihad.info
-cenoval.ru
-cheapmoncler.pw
-cheap-trusted-backlinks.com
-chinaelitecheapjerseys.com
-chocoslim.pro
-cialiswithoutadoctor.net
-clayvasedesigns.tk
-cleansearch.net
-coderstate.com
-communisave.co.za
-compliance-brian.top
-concordexoticrentals.com
-coop-gamers.ru
-covetnica.com
-cowlmash.com
-custom-electric-guitar.com
-cxpromote.com
-damasarenai.info
-darkbooks.org
+cashkitten-a.akamaihd.net
+cdnanalytics.xyz
+centre-indigo.org.ua
+centrumcoachingu.com
+cfsrating.sonicwall.com
+c-gainsbourg.com
+chastnoeporno.com
+checkhit.com
+chelyabinsk.xrus.org
+chidporn.com
+christianlouboutinreplica.pw
+cinemaflix.website
+cityadspix.com
+clean-start.net
+clickbank.net
+clickpapa.com
+clickzzs.nl
+colehaanoutlet.store
+compliance-barak.top
+compliance-jessica.top
+concealthyself.com
+conocer-sanabria.com
+cranly.net
+crd.clan.su
+creams.makeforum.eu
+crest3d.ru
+customboxes4less.com
+customergrowthsystems.com
+dafatiri.com
+dalavia.ru
+dating-time-now.com
+dealitright.click
 deanmoore.ie
-deda-moroza-zakaz.ru
-demenageur.com
-derevesendeco.com
-descargar-musica-gratis.net
-detki-opt.ru
-detskie-zabavi.ru
-devochki.top
-dgfitness.co
-diegolopezcastan.com
-divatraffic.com
-donna7753191.ru
-downloaddy.net
-dprtb.com
-earthmagic.info
-ecxtracking.com
-eladkarako.github.io
-eldiariodeguadalajara.com
-elektrischeziga.livejournal.com
-elektrischezigarette1.onsugar.com
+defenderxtactical.com
+degerlund.net
+destinationrealestate.com
+discovertreasure-a.akamaihd.net
+divku.ru
+dominateforex.ml
+downloadmefiranaratb1972.xpg.com.br
+drpornogratisx.xxx
+dvd-famille.com
+earn-from-articles.com
+e-buyeasy.com
+edge.sharethis.com
+ednorxmed.com
+ee77ee.com
+elektrischezigarette1.blog.pl
 elektrischezigarette2.onsugar.com
+elektronischezigarettekaufen1.beeplog.com
+elektrozigaretten1.tumblr.com
 elmifarhangi.com
-eloconcream.blogspot.com
-eluxer.net
-emediate.eu
-energydiet-info.ru
+enge-fotzen.info
+englate.com
 englishgamer.com
-erotikchat-24.com
-erotik-kostenlos.net
-evening-dating-club.info
-everypony.ru
-evidencecleanergold.com
-expresstoplivo.ru
-eyessurgery.ru
-face.hostingx.eu
-fashion.stellaconstance.co
-fdzone.org
-fetishinside.com
-fickenbumsen.net
-fickkontakte.org
-fickluder69.com
-filerockstar298.weebly.com
-findacheaplawyers.com
-findpik.com
+eonpal.com
+european-torches.ru
+eurosamodelki.ru
+executehosting.com
+eywords-monitoring-your-success.com
+ezigarettenkaufen1.pagina.gr
+fanoboi.com
+fastfixing.tech
+fbdownloader.com
+felizporno.com
+ferieboligkbh.dk
+fikasound.tk
+filesmonster.porn
+filmbokep69.com
+filunika.com.ru
+financepoints.eu
+finansov.info
+findpics.pw
+findsexguide.com
 finuse.com
-fishingwholesale.us
-flauntyoursite.com
-f-loaded.de
-forum.poker4life.ru
-foto-weinberger.at
-fr-bearings.ru
-free-fb-traffic.com
-free-floating-buttons.com
-freegamesplay.online
-freelifetimefuckbook.com
-freeuploader.ml
-freewhatsappload.com
-frequiry.com
-funcrushgames.com
-futbolkisales.ru
-fyl.com.ru
-g33.org
-game300.ru
-gamesprite.me
-gamewrath.com
-geileweiber.tk
-gelezki.com
-genericlowlatencyasiodriverhq.aircus.com
-getoutofdebtfree.org
-gettpromos.com
-ghernnqr.skyrock.com
-ghostvisitor.com
-gigablast.com
-girlgamerdaily.com
+firesub.pl
+fix-website-errors.com
+forodvd.com
+freecamdollars.com
+free-laptop-reward.com
+freesitetest.com
+fuel-gas.com
+funponsel.com
+gamebackyard.com
+gembird.com
+getdot.ru
+gfaq.ru
+glall.ru
 globalsurfari.com
-gne8.com
-go2jump.org
-goatse.ru
-goldandcard.ru
-golmau.host.sk
+gok-kasten.net
+gombita.info
+googlefeud.com
 gosreg.amchs.ru
-gotomontenegro.net
-gribkovye-zabolevaniya.com
-growboxbl.ru
-gsasearchengineranker.space
-gtopstats.com
-guge.io
-hdpixent.com
-help.tpu.ru
+gratis-sexkontakte.com
+grtyi.com
+gsmlab.pl
+guiadeserraazul.com
+guod.me
+gwebtools.com
+hahashka.ru
+hamptonoaks.ca
+handicapvansarea.com
+hawaiielectriclight.com
+hd-film.pl
+headpress.ru
+helicalpile.us
+hexpilot.com
 highspeed5.net
-hit-men.men
-hitmuzik.ru
-homedecorpicture.us
-housediz.com
-housekuba.org
-ideashome.id
-ifirestarter.ru
-igithab.com
-iklysha.ml
-impisr.edunsk.ru
-incolors.club
-indiakino.net
-indianmedicaltourismshop.com
-instabid.tech
-interfucks.net
-intermesh.net
-intervsem.ru
-invitefashion.com
-invivo.hu
+hildinghr.se
+home-task.com
+hostnow.men
+houston-vikings.com
+hundejo.com
+hustoon.over-blog.com
+hvd-store.com
+hyhj.info
+iboss.com
+imagefinder.site
+images-graphics-pics.com
+immobiliaremassaro.com
+increasewwwtraffic.info
+insomniagamingfestival.com
+internetproviderstucson.com
+invest-pamm.ru
+investsuccess.org
 iomoio.net
-itbc.kiev.ua
-itservicesthatworkforyou.com
-iusstf.org
-jacago.com
-jagg.info
-janavibekken.no
-japan-bearings.ru
-jav-fetish.com
-je7.us
-jeremyeaton.co
-jestr.org
-justucalling32211123456789.tk
-kalb.ru
-kanimage.com
-kazan.xrus.org
-kaz.kz
-keki.info
-kiinomaniak.pl
-kinosed.net
+ipchicken.com
+iplogger.org
+iplusbit.blogspot.co.za
+iqbazar.ru
+iqupdatetmz.win
+itch.io
+itis4you.com
+jamiembrown.com
+jennyfire.ru
+job.icivil.ir
+jongose.ninja
+justkillingti.me
+kartiniresto.com
+kashubadesign.ru
+kenaba.su
+keyhantercume.com
+keywordsuggest.org
+kinopolet.net
 kit-opt.ru
-knigonosha.net
+klin3952.ru
+kochanelli.com
 komp-pomosch.ru
-krasivye-devushki.net
-kung-fu-ru.com
-lacave.ntic.fr
-law-check-nine.xyz
-law-check-seven.xyz
-ledis.top
-linkwithin.com
-littlecity.ch
-llastbuy.ru
-lombardfinder.ru
+komputernaya-pomosh-moscow.ru
+krasnodar.ru
+kredit-pod-zalog-krasnodar.ru
+kuzinsp.ru
+kw21.org
+labvis.host.sk
+lafriore.ru
+landreferat.ru
+lasvegaslockandsafe.com
+lechenie-gemorroya.com
+likrot.com
+lion.snapmap.us
+live-sexcam.tk
+louboutinreplica.xyz
+lovelycraftyhome.com
 low-format.ru
-luciddiagnostics.in
-luckyshop.net.ua
-lutherstable.org
-m292.info
-machicon-ueno.info
-mahnwachen-helfen.info
-mailemedicinals.com
-manipulyator-peterburg.ru
-manyresultshub-a.akamaihd.net
-marketland.ml
-markjaybeefractal.com
-master-muznachas.ru
-masthopehomes.com
-mathgym.com.au
-mazda-roadsters.com
-medanestesia.ru
-meet-flirt-dating.com
-megahdporno.net
-me-ke.com
-mhi-systems.ru
-missclub.info
-misterjtbarbers.com
-mitrasound.ru
-mlf.hordo.win
+m3gadownload.pl
+magento-crew.net
+maladot.com
+malls.com
+manuscript.su
+marmitaco.cat
+masturbate.co.uk
+matpre.top
+meduza-consult.ru
+mexicotravelnet.com
+michaelkorssaleoutletonline.net
+mikozstop.com
+millionare.com
+mindbox.co.za
+minecraft-rus.org
+mnogabukaff.net
+mobsfun.net
 mockupui.com
-mokrayakiska.com
-monsterdivx.com
-montazhnic.ru
-montredemarque.nl
-moonci.ru
-moroccosurfadventures.com
-mostantikor.ru
-mountainstream.ms
-moviemail-online.co.uk
-mp3ritm.top
-musicas.baixar-musicas-gratis.com
-music.utrolive.ru
-muznachas-service.ru
-mymobilemoneypages.com
+mojaocena.com
+moncleronline.xyz
+monclervests.xyz
+moscow.online-podarki.com
+moscow.xrus.org
+mowser.com
+moxo.com
+mozello.ru
+mustat.com
+muycerdas.xxx
+mydearest.co
+mydownlodablefiles.com
+myfreecams.com
+myshopmatemac.com
+na15.ru
 naj-filmy24.pl
-narco24.me
-narkologiya-voronezh.ru
-netcheckcdn.xyz
-netpics.org
-new-post.tk
-newtechspb.ru
-nottyu.xyz
-o00.in
-o333o.com
+narutonaruto.ru
+nastroyke.net
+nationalbreakdown.com
+naval.jislaaik.com
+negociosdasha.com
+networkcheck.xyz
+newstraveller.ru
+newyorkhotelsmotels.info
+next-dentists.tk
+noscrapleftbehind.co
+novosibirsk.xrus.org
+oddamzadarmo.eu
+ohmyrings.com
 okayimage.com
-olgacvetmet.com
-onlineku.com
-onlythegames.com
-onthemarch.co
-openmediasoft.com
-optibuymac.com
+okeinfo.online
+oklogistic.ru
+onlinadverts.com
+online-sbank.ru
+orgasmus-virtual.com
 ossmalta.com
-ostrovtaxi.ru
-oz-offers.com
-panouri-solare-acoperis.com
-parajumpersstore.online
-partner-host.men
-partnersafe.men
-partners-ship.pro
-pawli.eu
-pestomou.info
-picscout.com
-picturesfrom.com
-pio.polytopesexempt.com
-pizdeishn.com
-pizza-imperia.com
-poems.com.ua
-pogodnyyeavarii.gq
-popup-hgd.xyz
-pornophoto.xyz
-pornoplen.com
-posible.net
-powenlite24.ru
-preparevideosafesystem4unow.site
-pretty-mart.com
-pricheskaonline.ru
-pricheski-video.com
-printie.com
+ozas.net
+partnerads.men
+partnerworkroom.men
+pdns.cz
+pensplan.com
+perm.xrus.org
+petsblogroll.com
+photosaga.info
+pills24h.com
+pinwallpaper.xyz
+pisanieprac.info
+pizza-tycoon.com
+pk-services.ru
+platezhka.net
+playboyfiles.xblog.in
+play-movie.pl
+playtap.us
+pooleroadmedicalcentre.co.uk
+pornofiljmi.com
+pornotubs.com
+pornzone.tv
 privatefx-in.ru
-prokotov.com
-prombudpostach.com.ua
-proxyradar.com
-psoriasis-file.trade
-pssucai.info
-psvita.ru
-qitt.ru
-quangcaons.com
-quizzitch.net
-rankingchart.de
-rankscanner.com
-realting-moscow.ru
-registratciya-v-moskve.ru
-registrationdomainsite.com
-remontgruzovik.ru
-remont-ustanovka-tehniki.ru
-remontvsamare.su
-renecaovilla.online
-responsive-test.net
-rezeptiblud.ru
-rockprogblog.com
-ruclicks.com
-ruspdd.com
-sabaapress.com
-satellite.maps.ilovevitaly.com
-savememoney.co.za
-sbprabooks.com
-sbt-aqua.ru
-scanner-john.top
-scanner-walt.top
-searchimpression.com
-seasonvar.ru
-sendearnings.com
-seo-prof1.xyz
-service.adtech.us
-sexkontakteao.info
-sexspornotub.com
-sexytrend.ru
-sharebutton.net
-shlyahten.ru
-shoplvlv.us
-shopvilleroyboch.com.ua
-sibdevice.ru
-sibvitr.ru
-signal03.ru
-sim-service.net
-sinestesia.host.sk
-sisiynas.ru
-site3.free-share-buttons.com
-sitopreferito.it
-skanninge.se
-skatestick.bid
-sky-mine.ru
-smallseotools.com
-smartadserver.com
-snsdeainavi.info
-socas.pluto.ro
-soc-econom-problems.ru
+privat-girl.net
+prlog.ru
+producm.ru
+prom23.ru
+pro-okis.ru
+psa48.ru
+push-ad.com
+putevka24.ru
+quickcashlimited.com
+qwarckoine.com
+rabotaetvse.ru
+rankia.com
+ranksays.com
+razamicroelectronics.com
+razleton.com
+realizmobi.com
+redirect.trafficreceiver.club
+relax.ru
+remmling.de
+replicaclub.ru
+replicalouboutin.xyz
+rialp.getenjoyment.net
+ricorsogiustizia.org
+ringtonepartner.com
+romhacking.ru
+ros-ctm.ru
+rossmark.ru
+royalcar-ufa.ru
+royalvegascasino.com
+rozalli.com
+ruscoininvest.company
+rusprostitute.com
+sadaholding.com
+sale-japan.com
+saneyes.com
+sarafangel.ru
+sarf3omlat.com
+sbtdesign.co.uk
+scanner-jack.top
+scenicmissouri.us
+scrapinghub.com
+securityallianceservices.com
+selectads.men
+seminarykansas904.ml
+seofied.com
+seo-smm.kz
+service.adtech.fr
+serw.clicksor.com
+sex.hotblog.top
+sexpartygirls.net
+sexsearch.com
+share-buttons-for-free.com
+shisha-swag.de
+shohanb.com
+shopsellcardsdumps.com
+sibecoprom.ru
+sientalyric.co
+simply.net
+sims-sims.ru
+sirpornogratis.xxx
+skachat-besplatno-obrazcy.ru
+skladvaz.ru
+snworks.com
 socialbutton.xyz
 sockshare.net
-softomix.com
-softwaretrend.net
-soheavyblog.com
-sortthemesitesby.com
-sotechco.co
-spabali.org
-spinnerco.ca
-spy-app.info
-spywareit.com
-ssconstruction.co
-stard.shop
-startwp.org
-statistici.ro
-statoutlook.info
-superiends.org
-surfbuyermac.com
-swimpool.ca
-takeflyte.com
-tamada69.com
-tandvardshuset.net
-tanieaukcje.com.pl
-tarad.com
-tgtclick.com
-tizanidine4mgprice.blogspot.com
-tizanidineandgabapentin.blogspot.com
-tizanidineformigraines.blogspot.com
-tizanidinesideeffects.blogspot.com
-tizanidinevssoma.blogspot.com
-topads.men
-topclickguru.com
-topdownloads.ru
-topvidos.ru
-torture.ml
-tracfone.com
-truck-rece.life
-trudogolik.net
-trustedmaccleaner.com
-tt-ipd.info
-tube8.com
-tula.howotorg.ru
-tv-spoty.info
-tvteleport.ru
-twittrading.com
-ua.tc
-ultimateclassicrock.com
+softomix.net
+sovinsteel.ru
+sprttrack.com
+sps-shop.com
+spyfu.com
+steebook.com
+stickers-market.ru
+stillmiracle.com
+stoki.ru
+strangeduckfilms.com
+streetfooduncovered.com
+stroymonolit.su
+surcentro.com
+surgut.zrus.org
+svensk-poesi.com
+swinger-mobil.net
+telesvoboda.ru
+templates.franklinfire.co
+testingads.pro
+thefds.net
+thegamerznetwork.com
+theplacetoupdating.pw
+thewomenlife.com
+thexart.club
+time-japan.ru
+timer4web.com
+titan-cloud.life
+tizanidinehcl2mg.blogspot.com
+tizanidinerestlesslegsyndrome.blogspot.com
+tizanidineusedfor.blogspot.com
+toon-families.com
+top10-online-games.com
+torrent-to-magnet.com
+touchmods.fr
+tourismvictoria.com
+tour-line.net
+toy-shop.top
+track112.site
+traderzplanet.in
+trafaret74.ru
+traffic-club.info
+trafficmp.com
+trafficnetzwerk.de
+traffpartners.com
+trucri.me
+tupper-shop.ru
+twincitiescarservice.com
+twodollarshows.com
+twu.com.ua
+tx41tclega.ru
+ukrobstep.com
 ultramart.biz
-uptimebot.net
-urccvfmc.bloger.index.hr
-vacuumscleaner.com
-validdomain.xyz
-vasileostrovsky-rayon.ru
+umityangin.net
+unitygame3d.com
+univerfiles.com
+unlimitdocs.net
+unmaroll.ya.ru
+urll.eu
+urlopener.com
+us-america.ru
+utiblog.fr
 v-doc.co
-viagengrarx.com
-video-chat.in
+vektorpress.ru
+ventelnos.com
+vereo.eu
+veselokloun.ru
+viandpet.com
 videochat.mx
-videochat.world
-villacoloniale.com
-visionwell.com.cn
-voprosotvet24.ru
-vseigru.one
-vsexkontakte.net
-vykup-avto-krasnodar.ru
-vzlomfb.com
-wareseeker.com
-webinstantservice.com
-webix.me
-websiteaccountant.de
-website-speed-up.site
-weekes.biz.tc
+video-production.com
+videotuber.ru
+vinsit.ru
+vip2ch.com
+vipsiterip.org
+voltrknc1.com
+vseuznaem.com
+walkme.com
+wdfdocando.com
+webjam.com
+webmonetizer.net
+weprik.ru
+wesharepics.com
 wfb.hatedriveapart.com
-while.cheapwebsitehoster.com
-whipme.yopoint.in
-witherrom55.eklablog.fr
-withstandingheartwarming.com
-wleuaprpxuvr.ga
-womensplay.net
-woodyguthrie.se
-wordpress-crew.net
-worldlovers.ru
-woweb.com.ua
-www.event-tracking.com
-xboxster.ru
-xmlinde.com
-xn------7cdbapdecfd4ak1bn0amjffj7afu3y.xn--p1ai
-xn--80adaggc5bdhlfamsfdij4p7b.xn--p1ai
-xn--b1ag5cfn.xn--p1ai
-xportvusbdriver8i.snack.ws
-xpresscare.ru
-xwatt.ru
-xxxtubesafari.com
-yaaknaa.info
-yellowstonesafaritours.com
-yoopsie.com
-youbloodyripper.com
-youdesigner.kz
-youtubedownload.org
-youtuhe.com
-zapatosenventa.info
-zarabotat-na-sajte.ru
-zhorapankratov7.blogspot.com
-zhuravlev.info
-zigarettenonlinekaufen2.drupalgardens.com
-z-master.ru
-znaniyapolza.ru
-zoompegs.com
-zophim.me
+wholesalecheapjerseysfree.com
+winterclassichockeyjerseys.com
+worldis.me
+worldmusicfests.com
+wormix-cheats.ru
+wowas31.ucoz.ru
+writingservices17.blogspot.ru
+wurr.voila.net
+ww1943.ru
+www.888.com
+www.timer4web.com
+wygraj-skiny.win
+xbaboon.com
+xerox-douglas.cf
+xfluro.com
+xlovecam.com
+xtremeeagles.net
+xuki.us
+xxlargepop.com
+yatrk.xyz
+yebocasino.com
+yhit.press
+yogamatsexpert.com
+youghbould.wordpress.com
+youporn-ru.com
+zajm-pod-zalog-nedvizhimosti.ru
+zakazfutbolki.com
+zakon-ob-obrazovanii.ru
+zeleznobeton.ru
+zeroredirect9.com
+zixizop.net.ru
 zvezdagedon.ru
diff --git a/.dev-tools/test_units/random-referrers-for-whitelist-test.list b/.dev-tools/test_units/random-referrers-for-whitelist-test.list
index d6bf5f9d1..0d5c0ab84 100644
--- a/.dev-tools/test_units/random-referrers-for-whitelist-test.list
+++ b/.dev-tools/test_units/random-referrers-for-whitelist-test.list
@@ -1,250 +1,250 @@
-0daymusic.org
-123any.com
-21h2o.com
-40cg.com
-7xc4n.com
-9icmzvn6.website
-aaronabel.com
-abctoppictures.net
-adtology.com
-advancedmassagebysara.com
-ahmedabadwebs.com
-air-edem.ru
-akita.kz
+007angels.com
+01apple.com
+101billion.com
+1kdailyprofit.me
+1pamm.ru
+3rbseyes.com
+9med.net
+a1security.com.ua
+aa9bd78f328a6a41279d0fad0a88df1901.com
+abcdefh.xyz
+adult-shop.com.ua
+advokateg.ru
+ad-words.ru
+akusherok.ru
+alekseevec.ru
 alfa9.com
-allnews24.in
-allnews.md
-alloysteel.ru
-antons-transporte.de
+all4invest.info
+amehdaily.com
+android4fun.org
+anlimebel.kiev.ua
+anmysite.com
 apiluckyleapnet-a.akamaihd.net
-appiq.mobi
-aramaicmedia.org
-arclk.net
-asia-forum.ru
-atmovs.com
-atout-energie-69.com
-ausergrubhof.info
-autoloans.com
-automatic-seo.com
-avirasecureserver.com
-avtolombard-krasnodar.ru
-awency.com
-azazaporn.com
-bazaronline24.ru
-bbsoldes.fr
-berrymall.ru
-bestcurs.org
-bestdraws.com
-bestsexyblog.com
-bestssaker.com
-beyan.host.sk
-bio.trade-jp.net
-bookmark4you.com.biz
-brainxs.us
-btnativenav.com
-buntube.net
-bytimedance.ru
-cartierbraceletsreplica.pw
-ceotrk.com
-cercacamion.it
-cerev.info
-cgi2.nintendo.co.jp
+apiwebwebgetcom-a.akamaihd.net
+apple.com-cleaner.systems
+baixar-musicas-gratis.com
+bannerpower.com
+bcmp.org
+belinvestdom.by
+bestdooz.com
+bigames.online
+bioca.org
+bobinoz.com
+boc.kz
+bombla.org
+burger-imperia.com
+burn-fat.ga
+business-made-fun.com
+cablecar.us
+cam-kontakte.org
+capacitacionyaprendizaje.com
 chiblackhawks-jerseys.com
-cjs.com.ru
-clevernt.com
-clickcash.com
-clicksor.com
-clothesforcash.com
-compliance-alex.top
-compliance-andrew.xyz
-compliance-mark.top
-compliance-willy.top
-cs-passion.pl
-cypernhuset.se
-czeshop.info
-damasarenai.info
-dbmkfhqk.bloger.index.hr
-delitime.info
-discountbarbour.online
-ec-file.info
+children-learningreading.info
+cialgenisrx.com
+cicaki.net
+cindymatches.com
+citizenclsdriveri7.pen.io
+ci.ua
+clippingphotoindia.com
+cmd.kz
+compliance-alex.xyz
+copypaste.traderzplanet.in
+cordstrap.cc
+creatives.adbetclickin.pink
+culmimg.pw
+dailyfinancefix.com
+dcj-nn.ru
+dikqlyremy.info
+distver.ru
+domain-submit.info
+donna7753191.ru
+downvids.net
+drupa.com
+druzhbany.ru
+dtnlyss.com
+duplicashapp.com
+elektrozigarette1.dreamwidth.org
+elektrozigaretten1.webs.com
+elmacho.xyz
 embedle.com
-f00kclan.de
-feorina.ru
-fetishinside.com
-findpik.com
-fortunejack.com
-fotopop.club
-fr-bearings.ru
-freakycheats.com
-fz139.ttk.ru
-gamblingnerd.com
-gay-file.com
-gidonline.one
-gojiberriess.apishops.ru
-gpirate.com
-graphics8.info
-handicapbathtubarea.com
+epngo.bz
+errorfixing.space
+eyemagination.com
+ezb.elvenmachine.com
+ezigaretteshop2.mywapblog.com
+fanoboi.com
+fast-wordpress-start.com
+fbdownloader.com
+fickblock18.com
+flowersbazar.com
+foxinsocks.ru
+frbizlist.com
+froggytube.com
+gdebestkupit.ru
+gearsadspromo.club
+getyourimage.club
+ghernnqr.skyrock.com
+girlporn.ru
+guiadeserraazul.com
+gwhwpxbw.bloger.index.hr
 hao123.com
-happy.new.yeartwit.com
-hauleddes.com
-hesteel.pl
-hetmanship.xyz
-highstairs-a.akamaihd.net
-hotenergy.ru
-hspline.com
-humbmosquina.tk
-hyiphunter.org
-i4track.net
-iamsport.org
-iboss.com
-idealtits.net
-ikritikimou.gr
-infokonkurs.ru
-integritylandscapeservices.com
-investmac.com
-inzn.ru
-iqoption.com
-iron-age.info
-jav-fetish.site
-jeremyeaton.co
-jerseyswholesalechinalimited.com
-jestr.org
-jolic2.com
-kino-fun.ru
-klin3952.ru
-komputers-best.ru
-kongruan.com
-krassh.ru
-lazymanyoga.com
-liffa.ru
-lirunet.ru
-lmrauction.com
-lomza.info
-lookingglassemb.com
-lunamedia.co
-lyrics.home-task.com
-m0r0zk0-krava.ru
-manuscript.su
-masterseek.com
-medictube.ru
-mejoresfotos.eu
-mir-limuzinov.ru
-morf.snn.gr
-moscow.online-podarki.com
-mosrif.ru
-mrpornogratis.xxx
-mustwineblog.com
-muztops.ru
-myblogregistercm.tk
-na15.ru
-naj-filmy24.pl
+hard-porn.mobi
+hasfun.com
+hayate.biz
+headpress.ru
+heartofpayne.xyz
+hentai-manga.porn
+heygidday.biz
+host-tracker.com
+humanorightswatch.org
+hyipmanager.in
+iminent.com
+imperia31.ru
+incest-ru.com
+incomekey.net
+infazavr.ru
+instakink.com
+istizanidineacontrolledsubstance.blogspot.com
+iwantmyfreecash.com
+izismile.com
+jamiembrown.com
+japfm.com
+je7.us
+jjbabskoe.ru
+juliaworld.net
+justbcause.com
+katushka.net
+keenoutlet.online
+keywesthideaways.co
+keywordhut.com
+kino-ecran.ru
+kinoflux.net
+kreativperlen.ch
+kriokomora.info
+kung-fu-ru.com
+kw21.org
+lacave.ntic.fr
+larose.jb2c.me
+ledis.top
+letsrepair.in
+lezbiyanki.net
+lflash.ru
+lifebyleese.com
+lollypopgaming.com
+mackeeper-land-672695126.us-east-1.elb.amazonaws.com
+mailemedicinals.com
+mainlinehobby.net
+maximilitary.ru
+mebel-alait.ru
+mebeldekor.com.ua
+medicovi.com
+michaelkorsoutlet.store
+monsterdivx.tv
+mp3ringtone.info
+muz-shoes.ru
+myfreetutorials.com
+nac-bearings.ru
 narkologiya-penza.ru
-nbsproject.ru
-netcheckcdn.xyz
-nevansk.ru
-nfljerseyscheapchinabiz.com
-nikkiewart.ru
-nuup.info
-offf.info
-oneclickfiles.com
-ordernorxx.com
-orel-reshka.net
-orgasmatrix.com
+narutonaruto.ru
+negociosdasha.com
+next-dentists.tk
+nextrent-crimea.ru
+ningessaybe.me
+nrv.co.za
+nudepatch.net
+obesidadealgarve.com
+offtime.ru
+okeinfo.online
+olgacvetmet.com
+orion-v.com
+ostroike.org
+ostrovtaxi.ru
 otbelivanie-zubov.com
-parajumpersjakkesalgnorge.info
-partnerads.men
-pcgroup.com.uy
-pinwallpaper.xyz
-pizda.lol
-podshipniki-ntn.ru
-pokemongooo.ml
-popcash.net
-popmarker.com
-popugauka.ru
-pornhubforum.tk
-pornoelita.info
-pornzone.tv
-portside.cc
+pammik.ru
+pepperstyle.ru
+percin.biz.ly
+petsblogroll.com
+phuketscreen.com
+plastgranar.nu
+pontiacsolstice.info
+poquoson.org
+pornowarp.info
 powitania.pl
-praisong.net
-promoforum.ru
-propranolol40mg.blogspot.com
-prostitutki-astana.org
-prostitutki-kiev.org
-purplesphere.in
-rapidsites.pro
-razorweb-a.akamaihd.net
-refads.pro
-refudiatethissarah.info
-rent2spb.ru
-rustic-quiver.win
-rvzr-a.akamaihd.net
-saneitconsulting.com
-santasgift.ml
-satellite.maps.ilovevitaly.com
-scanner-andrew.top
-seansonline24.pl
-service.adtech.fr
-sex-foto.pw
-sharebutton.net
-site5.com
-smallseotools.com
-spravka130.ru
-sprttrack.com
-squidoo.com
-sstroy44.ru
-stathat.com
-stauga.altervista.org
-stickers-market.ru
-stoki.ru
-strangeduckfilms.com
-taqplayer.info
-telegraf.by
-telegramdownload10.com
-templates.radiodigital.co
-tfxiq.com
-thejournal.ru
-titan-cloud.life
-tizanidinemusclerelaxant.blogspot.com
-tizanidinevscyclobenzaprine.blogspot.com
-tobeyouday.win
-toon-families.com
-torrentgamer.net
-torrent-to-magnet.com
-tuckpointingmasonrysystems.com
-typer.one
-udsgame.online
-umnovocaminho.com
-underthesite.com
-unitexindia.com
-vacances-voyages.info
-videochat.life
-videochat.ph
-videojam.tv
-videositename.com
-vinsit.ru
-vkonche.com
+presleycollectibles.com
+printingpeach.com
+privacyassistant.net
+puserving.com
+qexyfu.bugs3.com
+raschtextil.com.ua
+realitykings.com
+redhotfreebies.co.uk
+restorator-msk.ru
+rightenergysolutions.com.au
+rniaeba.ga
+rucrypt.com
+running-line.ru
+sabaapress.com
+sandhillsonline.com
+scanner-jess.top
+seorussian.ru
+sfj-ror.no
+shariki-zuma-lines.ru
+shoesonlinebuy.xyz
+sinel.info
+sitevaluation.com
+slavia.info
+slomm.ru
+smartbalanceworld.com
+softxaker.ru
+startufa.ru
+stats-collector.org
+streetfooduncovered.com
+stroiminsk.org
+stroy-portal22.ru
+superinterstitial.com
+thebestphotos.eu
+thedownloadfromwarez.blogspot.com
+timeallnews.ru
+tjkckpytpnje.com
+tomck.com
+top10-online-games.com
+top-deal.com.pl
+topkarkas.com
+tozup.com
+trahvid.com
+trudogolik.net
+tuberkuleznik.ru
+turbo-suslik.org
+ugogo.info
+unmaroll.ya.ru
+uptime.com
+varikoz24.com
+vasileostrovsky-rayon.ru
+vod.com.ua
 vonradio.com
-vvpg.ru
-w7s.ru
-wcb.su
-wesharepics.com
-whiteelephantwellington.com
-wholesalejerseyscheapjerseys.us.com
+vozbujdenie.com
+vrnelectro.ru
+vykupavto-krasnodar.ru
+websiteexplorer.info
+website-speed-up.top
+wedding-salon.net
 wikes.20fr.com
-windowssearch-exp.com
-woman-orgasm.ru
-workle.website
-worldoffiles.ru
-writersgroup580.web.fc2.com
-wttavern.com
-www.event-tracking.com
-xchat26.myfreecams.com
-xn----7sbho2agebbhlivy.xn--p1ai
-xn----itbkqkfiq.xn--p1ai
-x-rates.ru
-yaminecraft.ru
-yellowstonevisitortours.com
-yourothersite.com
-zoomovies.org
-zscalertwo.net
+win-spy.com
+xjrul.com
+xn----7sbifcamovvfggw9d.xn--p1ai
+xn--80adaggc5bdhlfamsfdij4p7b.xn--p1ai
+xn--80aikhbrhr.net
+xn----8sblgmbj1a1bk8l.xn----161-4vemb6cjl7anbaea3afninj.xn--p1ai
+xn--oogle-wmc.com
+yeartwit.com
+yourdesires.ru
+yoursite.com
+yun56.co
+zakon-ob-obrazovanii.ru
+zero1.it
+zeroredirect2.com
+zhuravlev.info
+zigarettenonlinekaufen2.bloog.pl
+zigarettenonlinekaufen2.drupalgardens.com
+zojirushi-products.ru
+zverokruh-shop.cz
diff --git a/.dev-tools/test_units/ratelimittest-master.txt b/.dev-tools/test_units/ratelimittest-master.txt
index f371d9e5f..a7215fb74 100644
--- a/.dev-tools/test_units/ratelimittest-master.txt
+++ b/.dev-tools/test_units/ratelimittest-master.txt
@@ -1,21 +1,11 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>Welcome to NginX</title>
-</head>
-<body>
-<div align=center>
-<h1>Welcome to the NginX Ultimate Bad Bot Blocker</h1>
-<p>This is merely used for testing !!!</p>
-</body>
-</html><html>
+<html>
 <head><title>503 Service Temporarily Unavailable</title></head>
 <body bgcolor="white">
 <center><h1>503 Service Temporarily Unavailable</h1></center>
 <hr><center>nginx/1.14.2</center>
 </body>
 </html>
-<html>
+l>
 <head><title>503 Service Temporarily Unavailable</title></head>
 <body bgcolor="white">
 <center><h1>503 Service Temporarily Unavailable</h1></center>
@@ -126,4 +116,14 @@
 <h1>Welcome to the NginX Ultimate Bad Bot Blocker</h1>
 <p>This is merely used for testing !!!</p>
 </body>
+</html><!DOCTYPE html>
+<html>
+<head>
+<title>Welcome to NginX</title>
+</head>
+<body>
+<div align=center>
+<h1>Welcome to the NginX Ultimate Bad Bot Blocker</h1>
+<p>This is merely used for testing !!!</p>
+</body>
 </html>
\ No newline at end of file
diff --git a/.dev-tools/test_units/whitelist-ips.conf b/.dev-tools/test_units/whitelist-ips.conf
index 3dac4f84e..c3c284efc 100644
--- a/.dev-tools/test_units/whitelist-ips.conf
+++ b/.dev-tools/test_units/whitelist-ips.conf
@@ -1,2 +1,2 @@
-35.192.187.174	0;
+35.202.145.110	0;
 127.0.0.1	0;
diff --git a/.latest_release/bots.d.tar.gz b/.latest_release/bots.d.tar.gz
index 1acc0b3b2..5149d1e81 100644
Binary files a/.latest_release/bots.d.tar.gz and b/.latest_release/bots.d.tar.gz differ
diff --git a/.latest_release/conf.d.tar.gz b/.latest_release/conf.d.tar.gz
index c42d9d2a6..8ef82692a 100644
Binary files a/.latest_release/conf.d.tar.gz and b/.latest_release/conf.d.tar.gz differ
diff --git a/AUTO-CONFIGURATION.md b/AUTO-CONFIGURATION.md
index cade44b6c..d4a1b9d70 100755
--- a/AUTO-CONFIGURATION.md
+++ b/AUTO-CONFIGURATION.md
@@ -4,7 +4,7 @@
 ### PLEASE READ CONFIGURATION INSTRUCTIONS BELOW THOROUGHLY :exclamation:
 
 _______________
-#### Version: V4.2019.07.1768
+#### Version: V4.2019.07.1769
 #### Bad Referrer Count: 6737
 #### Bad Bot Count: 556
 ____________________
diff --git a/MANUAL-CONFIGURATION.md b/MANUAL-CONFIGURATION.md
index 471df6c83..866704c8d 100755
--- a/MANUAL-CONFIGURATION.md
+++ b/MANUAL-CONFIGURATION.md
@@ -4,7 +4,7 @@
 ### PLEASE READ CONFIGURATION INSTRUCTIONS BELOW THOROUGHLY :exclamation:
 
 _______________
-#### Version: V4.2019.07.1768
+#### Version: V4.2019.07.1769
 #### Bad Referrer Count: 6737
 #### Bad Bot Count: 556
 ____________________
diff --git a/README.md b/README.md
index 8d70a9f3e..5b0f0ff81 100755
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
 ##### The Ultimate Nginx Bad Bot, User-Agent, Spam Referrer Blocker, Adware, Malware and Ransomware Blocker, Clickjacking Blocker, Click Re-Directing Blocker, SEO Companies and Bad IP Blocker with Anti DDOS System, Nginx Rate Limiting and Wordpress Theme Detector Blocking. Stop and Block all kinds of bad internet traffic from ever reaching your web sites. [PLEASE SEE: Definition of Bad Bots](#define-bad-bots)
 
 _______________
-#### Version: V4.2019.07.1768
+#### Version: V4.2019.07.1769
 #### Bad Referrer Count: [6737](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/bad-referrers.list)
 #### Bad Bot Count: [556](https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/bad-user-agents.list)
 ____________________
diff --git a/_google_analytics_ghost_spam/README.md b/_google_analytics_ghost_spam/README.md
index 1e9ce983a..ee6a96718 100644
--- a/_google_analytics_ghost_spam/README.md
+++ b/_google_analytics_ghost_spam/README.md
@@ -3,7 +3,7 @@
 # EASY CONFIGURATION INSTRUCTIONS FOR STOPPING GOOGLE ANALYTICS "GHOST" SPAM
 
 _______________
-#### Version: V4.2019.07.1768
+#### Version: V4.2019.07.1769
 #### Bad Referrer Count: 6737
 #### Bad Bot Count: 556
 ____________________
diff --git a/_sample_config_files/Engintron_for_cPanel_WHM_Configuration_Example/etc/nginx/conf.d/globalblacklist.conf b/_sample_config_files/Engintron_for_cPanel_WHM_Configuration_Example/etc/nginx/conf.d/globalblacklist.conf
index c03ead319..8643f4428 100755
--- a/_sample_config_files/Engintron_for_cPanel_WHM_Configuration_Example/etc/nginx/conf.d/globalblacklist.conf
+++ b/_sample_config_files/Engintron_for_cPanel_WHM_Configuration_Example/etc/nginx/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1768
-### Updated: Fri Jul 26 09:09:31 SAST 2019
+### Version: V4.2019.07.1769
+### Updated: Fri Jul 26 09:25:18 SAST 2019
 ### Bad Referrer Count: 6737
 ### Bad Bot Count: 556
 ###################################################
diff --git a/conf.d/globalblacklist-testing-version.conf b/conf.d/globalblacklist-testing-version.conf
index 2dfa15e5f..e8d4ac592 100644
--- a/conf.d/globalblacklist-testing-version.conf
+++ b/conf.d/globalblacklist-testing-version.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V3.2019.07.1768
-### Updated: Fri Jul 26 09:09:33 SAST 2019
+### Version: V3.2019.07.1769
+### Updated: Fri Jul 26 09:25:20 SAST 2019
 ### Bad Referrer Count: 6737
 ### Bad Bot Count: 556
 ###################################################
@@ -17993,8 +17993,6 @@ geo $ratelimited {
 # BAD BOT RATE LIMITING ZONE
 # Rate limiting will only take effect if on any User-Agents with a value of 2
 
-	#limit_conn_zone $bot_iplimit zone=bot2_connlimit:16m;
-	#limit_req_zone  $bot_iplimit zone=bot2_reqlimitip:16m  rate=30r/m;
 	limit_conn_zone $bot_iplimit zone=bot2_connlimit:16m;
 	limit_req_zone  $bot_iplimit zone=bot2_reqlimitip:16m  rate=2r/s;
 
diff --git a/conf.d/globalblacklist.conf b/conf.d/globalblacklist.conf
index c03ead319..8643f4428 100644
--- a/conf.d/globalblacklist.conf
+++ b/conf.d/globalblacklist.conf
@@ -4,8 +4,8 @@
 
 ### VERSION INFORMATION #
 ###################################################
-### Version: V4.2019.07.1768
-### Updated: Fri Jul 26 09:09:31 SAST 2019
+### Version: V4.2019.07.1769
+### Updated: Fri Jul 26 09:25:18 SAST 2019
 ### Bad Referrer Count: 6737
 ### Bad Bot Count: 556
 ###################################################
diff --git a/robots.txt/robots.txt b/robots.txt/robots.txt
index a534bd85b..2bd7728cc 100644
--- a/robots.txt/robots.txt
+++ b/robots.txt/robots.txt
@@ -6,8 +6,8 @@
 
 ### Version Information #
 ###################################################
-### Version: V4.2019.07.1768
-### Updated: Fri Jul 26 09:09:34 SAST 2019
+### Version: V4.2019.07.1769
+### Updated: Fri Jul 26 09:25:21 SAST 2019
 ### Bad Bot Count: 556
 ###################################################
 ### Version Information ##